| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | | | | | | | | | | | | Have the Filtering API return Deferreds, so we can do the Datastore implement... | Paul "LeoNerd" Evans | 2015-01-27 | 3 | -7/+22 |
| * | | | | | | | | | | | | | | Initial trivial unittest of Filtering object | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+67 |
| * | | | | | | | | | | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ... | Paul "LeoNerd" Evans | 2015-01-27 | 3 | -13/+58 |
| * | | | | | | | | | | | | | | Use new V2AlphaRestTestCase | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -38/+2 |
| * | | | | | | | | | | | | | | Merge branch 'develop' into client_v2_filter | Paul "LeoNerd" Evans | 2015-01-27 | 8 | -21/+90 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | Minor changes to v2_alpha filter REST test to allow the setUp method to be sh... | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -5/+7 |
| * | | | | | | | | | | | | | | | Initial trivial REST test of v2_alpha filter API | Paul "LeoNerd" Evans | 2015-01-26 | 1 | -0/+74 |
| * | | | | | | | | | | | | | | | Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no ... | Paul "LeoNerd" Evans | 2015-01-26 | 2 | -1/+109 |
* | | | | | | | | | | | | | | | | Add room member count condition and default rule to make a noise on rooms of ... | David Baker | 2015-01-30 | 3 | -6/+63 |
* | | | | | | | | | | | | | | | | Merge pull request #38 from matrix-org/new_state_resolution | Mark Haines | 2015-01-30 | 2 | -121/+441 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | Add a slightly more helpful comment | Erik Johnston | 2015-01-30 | 1 | -1/+2 |
| | | | | | * | | | | | | | | | | | Be more specific in naming columns in selects. | Erik Johnston | 2015-01-30 | 1 | -1/+1 |
| | | | | | * | | | | | | | | | | | Put CREATE rejections into seperate .sql | Erik Johnston | 2015-01-30 | 2 | -7/+21 |
| | | | | | | |_|_|/ / / / / / /
| | | | | | |/| | | | | | | | | |
|
| | | | | | * | | | | | | | | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej... | Erik Johnston | 2015-01-30 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|/ / / / / / / / / /
| |/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolu... | Erik Johnston | 2015-01-30 | 125 | -2084/+3048 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | |
|
| | | | | | * | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage | Erik Johnston | 2015-01-30 | 125 | -2083/+3034 |
| | | | | | |\ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | We do need Twisted 14, not 15: we use internal Twisted things that have been ... | David Baker | 2015-01-30 | 2 | -2/+2 |
| |_|_|_|_|_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | Include content in notification pokes | David Baker | 2015-01-29 | 1 | -0/+2 |
* | | | | | | | | | | | | | | | Change 'from' in notification pokes to 'sender' to match client API v2. Send ... | David Baker | 2015-01-29 | 2 | -5/+14 |
* | | | | | | | | | | | | | | | Add default push rules including setting a sound for messages mentioning your... | David Baker | 2015-01-29 | 2 | -8/+74 |
* | | | | | | | | | | | | | | | Renumber priority classes so we can use 0 for defaults. | David Baker | 2015-01-29 | 1 | -5/+5 |
* | | | | | | | | | | | | | | | Allow kind to be set to null to delete a pusher. | David Baker | 2015-01-29 | 1 | -1/+10 |
| |_|_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | Code style fixes. | Mark Haines | 2015-01-29 | 8 | -26/+42 |
* | | | | | | | | | | | | | | Only send a badge-reset if the user actually has unread notifications. | David Baker | 2015-01-29 | 1 | -2/+7 |
| |_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | SYN-252: Supply the stream and topological parts in the correct order to the ... | Mark Haines | 2015-01-29 | 1 | -3/+3 |
* | | | | | | | | | | | | | Allow the push rule delete method to take more specifiers. | David Baker | 2015-01-28 | 1 | -8/+11 |
* | | | | | | | | | | | | | Change uses of get_user_by_req because it returns a tuple now. | David Baker | 2015-01-28 | 2 | -4/+4 |
| |_|_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | | |
|
* | | | | | | | | | | | | Merge pull request #36 from matrix-org/device_id_from_access_token | Mark Haines | 2015-01-28 | 19 | -50/+97 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Rename ClientID to ClientInfo since it is a pair of IDs rather than a single ... | Mark Haines | 2015-01-28 | 2 | -3/+3 |
| * | | | | | | | | | | | | Add a : to the doc string after the type of the return value | Mark Haines | 2015-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | Extract the id token of the token when authing users, include the token and d... | Mark Haines | 2015-01-28 | 18 | -48/+92 |
| * | | | | | | | | | | | | Return the device_id from get_auth_by_req | Mark Haines | 2015-01-28 | 13 | -31/+34 |
| | |_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | |
|
* | | | | | | | | | | | | Merge branch 'master' into develop | David Baker | 2015-01-28 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | |
|
| * | | | | | | | | | | | Add matrix.org as a trusted ID server because it's now passed through on port... | David Baker | 2015-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse v0.6.1b | Erik Johnston | 2015-01-13 | 3 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | Move pushers delta to v12 and bump schema version | David Baker | 2015-01-28 | 2 | -1/+1 |
* | | | | | | | | | | | | | Merge pull request #35 from matrix-org/pushers2 | David Baker | 2015-01-28 | 21 | -248/+1948 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|/ / / / / / /
|/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | Use %s instead of + | David Baker | 2015-01-28 | 1 | -2/+2 |
| * | | | | | | | | | | | | Newline | David Baker | 2015-01-28 | 1 | -0/+1 |
| * | | | | | | | | | | | | Redundant parens | David Baker | 2015-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | unnecessary newlines | David Baker | 2015-01-28 | 1 | -2/+0 |
| * | | | | | | | | | | | | More magic commas (including the place I copied it from...) | David Baker | 2015-01-28 | 1 | -4/+4 |
| * | | | | | | | | | | | | Google doc style | David Baker | 2015-01-28 | 1 | -4/+5 |
| * | | | | | | | | | | | | spaces | David Baker | 2015-01-28 | 1 | -2/+2 |
| * | | | | | | | | | | | | Unnecessary newlines. | David Baker | 2015-01-28 | 1 | -5/+0 |
| * | | | | | | | | | | | | Unnecessary newline. | David Baker | 2015-01-28 | 1 | -1/+0 |
| * | | | | | | | | | | | | Better style | David Baker | 2015-01-28 | 1 | -2/+5 |
| * | | | | | | | | | | | | Another superfluous newline | David Baker | 2015-01-28 | 1 | -1/+0 |
| * | | | | | | | | | | | | Ah, the comma of doom. | David Baker | 2015-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | Brackets are nicer | David Baker | 2015-01-28 | 1 | -2/+2 |
| * | | | | | | | | | | | | Unnecessary new line | David Baker | 2015-01-28 | 1 | -1/+0 |
| * | | | | | | | | | | | | Easy on the newlines | David Baker | 2015-01-28 | 1 | -1/+0 |
| * | | | | | | | | | | | | 2015 | David Baker | 2015-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | doc style fix | David Baker | 2015-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | It is 2015 | David Baker | 2015-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | Oops, bad merge: needed to change the base class of the rest servlets too. | David Baker | 2015-01-28 | 3 | -6/+7 |
| * | | | | | | | | | | | | More code style things | David Baker | 2015-01-28 | 1 | -3/+4 |
| * | | | | | | | | | | | | Brackets rather than slashes at end | David Baker | 2015-01-28 | 1 | -3/+3 |
| * | | | | | | | | | | | | Redundant bracketing & missed space | David Baker | 2015-01-28 | 1 | -2/+2 |
| * | | | | | | | | | | | | Update copyright | David Baker | 2015-01-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | Unused import | David Baker | 2015-01-28 | 1 | -1/+0 |
| * | | | | | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-28 | 51 | -299/+527 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / /
|/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | Initial cut of a shared base class for REST unit tests | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+45 |
| |_|_|/ / / / / / / / /
|/| | | | | | | | | | | |
|
* | | | | | | | | | | | | Merge pull request #34 from matrix-org/remove_serialize_event_from_hs | Mark Haines | 2015-01-26 | 7 | -21/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|/ / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Remove unused import from server.py | Mark Haines | 2015-01-26 | 1 | -1/+0 |
| * | | | | | | | | | | | Pass the current time to serialize event, rather than passing an | Mark Haines | 2015-01-26 | 7 | -20/+45 |
| | |_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | |
|
* / | | | | | | | | | | Create (empty) v2_alpha REST tests directory | Paul "LeoNerd" Evans | 2015-01-26 | 1 | -0/+15 |
|/ / / / / / / / / / |
|
* | | | | | | | | | | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 6 | -1/+132 |
* | | | | | | | | | | Stop complaining about Synapse Angular SDK 0.6.1 | Paul "LeoNerd" Evans | 2015-01-23 | 1 | -1/+1 |
| |_|_|_|_|_|_|/ /
|/| | | | | | | | |
|
* | | | | | | | | | Update .gitignore | Erik Johnston | 2015-01-23 | 1 | -0/+6 |
| |_|_|_|_|_|_|/
|/| | | | | | | |
|
* | | | | | | | | Merge pull request #33 from matrix-org/extract_rest_servlet_from_client_v1 | Mark Haines | 2015-01-23 | 12 | -72/+100 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Add RestServlet base class in synapse/http/servlet.py | Mark Haines | 2015-01-23 | 1 | -0/+56 |
| * | | | | | | | | Extract the client v1 base RestServlet to a separate class | Mark Haines | 2015-01-23 | 11 | -72/+44 |
|/ / / / / / / / |
|
* | | | | | | | | Merge pull request #32 from matrix-org/remove_parse_id_from_hs | Mark Haines | 2015-01-23 | 35 | -179/+168 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Remove hs.parse_eventid | Mark Haines | 2015-01-23 | 1 | -9/+0 |
| * | | | | | | | | Replace hs.parse_roomalias with RoomAlias.from_string | Mark Haines | 2015-01-23 | 8 | -26/+18 |
| * | | | | | | | | Replace hs.parse_roomid with RoomID.from_string | Mark Haines | 2015-01-23 | 8 | -21/+15 |
| * | | | | | | | | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 31 | -133/+145 |
|/ / / / / / / / |
|
* | | | | | | | | Merge pull request #31 from matrix-org/client_api_resource | Mark Haines | 2015-01-23 | 5 | -28/+18 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Merge rest servlets into the client json resource object | Mark Haines | 2015-01-23 | 5 | -28/+18 |
| | * | | | | | | | Reset badge count to zero when last active time is bumped | David Baker | 2015-01-28 | 4 | -3/+76 |
| | * | | | | | | | Oops, remove debugging | David Baker | 2015-01-27 | 1 | -1/+0 |
| | * | | | | | | | or of course we could just return the deferred | David Baker | 2015-01-27 | 1 | -2/+1 |
| | * | | | | | | | Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in the... | David Baker | 2015-01-27 | 1 | -0/+1 |
| | * | | | | | | | Unbreak bad presence merge - don't add these blocks together with an and: the... | David Baker | 2015-01-27 | 1 | -12/+14 |
| | * | | | | | | | Support membership events and more camelcase/underscores | David Baker | 2015-01-26 | 2 | -4/+8 |
| | * | | | | | | | Add brackets to make get room name / alias work | David Baker | 2015-01-26 | 1 | -2/+2 |
| | * | | | | | | | Pushers should only try & look for rejected devices in something that's a lis... | David Baker | 2015-01-26 | 1 | -1/+1 |
| | * | | | | | | | Add API to delete push rules. | David Baker | 2015-01-23 | 2 | -1/+49 |
| | * | | | | | | | Use push settings! | David Baker | 2015-01-23 | 3 | -26/+117 |
| | * | | | | | | | more pep8 suggestions | David Baker | 2015-01-23 | 1 | -2/+1 |
| | * | | | | | | | more pep8 | David Baker | 2015-01-23 | 1 | -2/+4 |
| | * | | | | | | | Make string format tuple an actual tuple | David Baker | 2015-01-23 | 1 | -1/+1 |
| | * | | | | | | | redundant parens | David Baker | 2015-01-23 | 1 | -1/+1 |
| | * | | | | | | | stray space | David Baker | 2015-01-23 | 1 | -1/+1 |
| | * | | | | | | | make per-device rules work | David Baker | 2015-01-23 | 1 | -5/+15 |
| | * | | | | | | | Add slightly pedantic trailing slash error. | David Baker | 2015-01-23 | 2 | -3/+19 |
| | * | | | | | | | right super() param | David Baker | 2015-01-23 | 1 | -1/+1 |
| | * | | | | | | | Fix adding rules without before/after & add the rule that we couldn't find to... | David Baker | 2015-01-23 | 2 | -5/+7 |
| | * | | | | | | | This really serves me right for ever making a map called 'map'. | David Baker | 2015-01-23 | 1 | -1/+1 |
| | * | | | | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-23 | 1 | -273/+193 |
| | |\ \ \ \ \ \ \
| |_|/ / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it is... | Paul "LeoNerd" Evans | 2015-01-22 | 1 | -3/+3 |
* | | | | | | | | | Much merging of test case setUp() methods to make them much more | Paul "LeoNerd" Evans | 2015-01-22 | 1 | -273/+193 |
|/ / / / / / / / |
|
| * | | | | | | | As yet fairly untested GET API for push rules | David Baker | 2015-01-22 | 3 | -15/+145 |
| * | | | | | | | oops, this is not its own schema file | David Baker | 2015-01-22 | 1 | -1/+0 |
| * | | | | | | | Insufficient newlines | David Baker | 2015-01-22 | 1 | -0/+1 |
| * | | | | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-22 | 91 | -1712/+645 |
| |\ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
* | | | | | | | | Merge pull request #30 from matrix-org/client_api_restructure | Mark Haines | 2015-01-22 | 37 | -62/+118 |
|\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | Move client rest tests back under rest | Mark Haines | 2015-01-22 | 9 | -5/+19 |
| * | | | | | | | | Move rest APIs back under the rest directory | Mark Haines | 2015-01-22 | 31 | -19/+33 |
| * | | | | | | | | Move client v1 api rest servlets into a "client/v1" directory | Mark Haines | 2015-01-22 | 23 | -24/+52 |
|/ / / / / / / / |
|
* | | | | | | | | Fix manifest. Ignore contrib and docs directories when checking manifest agai... | Mark Haines | 2015-01-22 | 3 | -5/+9 |
* | | | | | | | | Add demo and scripts to python manifest | Mark Haines | 2015-01-22 | 1 | -2/+11 |
* | | | | | | | | update .gitignore, set media-store-path in demo | Mark Haines | 2015-01-22 | 2 | -9/+5 |
* | | | | | | | | Move experiments, graph and cmdclient into contrib | Mark Haines | 2015-01-22 | 6 | -0/+0 |
* | | | | | | | | Remove jsfiddles | Mark Haines | 2015-01-22 | 16 | -1079/+0 |
* | | | | | | | | Move scripts into scripts | Mark Haines | 2015-01-22 | 6 | -2/+2 |
* | | | | | | | | Abstract out the room ID from presence tests, so it's stored in self | Paul "LeoNerd" Evans | 2015-01-21 | 1 | -8/+10 |
* | | | | | | | | Use common base class for two Presence unit-tests, avoiding boilerplate copyp... | Paul "LeoNerd" Evans | 2015-01-21 | 1 | -54/+25 |
| * | | | | | | | Oops: second part of commit dc938606 | David Baker | 2015-01-22 | 6 | -7/+45 |
| * | | | | | | | Add rest API & store for creating push rules | David Baker | 2015-01-22 | 2 | -0/+391 |
| * | | | | | | | use underscores everywhere, not camelcase. | David Baker | 2015-01-20 | 1 | -3/+3 |
| * | | | | | | | add instance_handles to pushers so we have a way to refer to them even if the... | David Baker | 2015-01-20 | 7 | -27/+39 |
| * | | | | | | | Require device language when adding a pusher. | David Baker | 2015-01-16 | 5 | -5/+11 |
| * | | | | | | | Send room name and first alias in notification poke. | David Baker | 2015-01-15 | 3 | -3/+61 |
| * | | | | | | | Don't make the pushers' event streams cause people to appear online | David Baker | 2015-01-15 | 2 | -22/+25 |
| * | | | | | | | Honour the 'rejected' return from push gateways | David Baker | 2015-01-13 | 6 | -19/+81 |
| * | | | | | | | Merge branch 'develop' into pushers | David Baker | 2015-01-13 | 150 | -438/+1097 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | Split out function to decide whether to notify or a given event | David Baker | 2015-01-13 | 1 | -2/+17 |
| * | | | | | | | | If we didn't get any events, advance the token or we'll just keep not getting... | David Baker | 2014-12-18 | 1 | -0/+1 |
| * | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2014-12-18 | 99 | -2160/+4634 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | schema version is now 10 | David Baker | 2014-12-18 | 2 | -1/+1 |
| * | | | | | | | | | Merge branch 'master' into pushers | David Baker | 2014-12-18 | 13 | -12/+63 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Thank you, pyflakes | David Baker | 2014-12-18 | 1 | -1/+0 |
| * | | | | | | | | | | ...and bump SCHEMA_VERSION | David Baker | 2014-12-18 | 1 | -1/+1 |
| * | | | | | | | | | | Rename the pusher SQL delta to v9 which the next free one | David Baker | 2014-12-18 | 1 | -0/+0 |
| * | | | | | | | | | | after a few rethinks, a working implementation of pushers. | David Baker | 2014-12-18 | 8 | -73/+158 |
| * | | | | | | | | | | Update to app_id / app_instance_id (partially) and mangle to be PEP8 compliant. | David Baker | 2014-12-03 | 7 | -130/+213 |
| * | | | | | | | | | | convert to spaces before I start a holy war | David Baker | 2014-12-02 | 1 | -205/+205 |
| * | | | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2014-12-02 | 44 | -248/+6663 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP p... | David Baker | 2014-11-21 | 7 | -20/+150 |
| * | | | | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 8 | -342/+373 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into pushers | David Baker | 2014-11-20 | 35 | -140/+193 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'http_client_refactor' into pushers | David Baker | 2014-11-20 | 11 | -93/+170 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | remove random half-line | David Baker | 2014-11-19 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | Start creating a module to do generic notifications (just prints them to stdo... | David Baker | 2014-11-19 | 12 | -3/+449 |
| | | | | | | | | | | | * | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej... | Erik Johnston | 2015-01-30 | 1 | -8/+6 |
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | |/ / /
| | | | | | | | | | | |/| / /
| | | | | | | | | | | | |/ / |
|
| | | | | | | | | | | * | | | Remove commented line | Erik Johnston | 2015-01-30 | 1 | -1/+0 |
| | | | | | | | | | | * | | | Style changes. | Erik Johnston | 2015-01-30 | 1 | -6/+5 |
| | | | | | | | | | | | |/
| | | | | | | | | | | |/| |
|
| | | | | | | | | | | * | | fix pyflakes | Erik Johnston | 2015-01-22 | 1 | -1/+1 |
| | | | | | | | | | | | * | Add support for storing rejected events in EventContext and data stores | Erik Johnston | 2015-01-22 | 6 | -11/+83 |
| | | | | | | | | | | |/ |
|
| | | | | | | | | | | * | Remove unused function. Add comment. | Erik Johnston | 2015-01-21 | 1 | -16/+12 |
| | | | | | | | | | | * | Implement new state resolution algorithm | Erik Johnston | 2015-01-21 | 2 | -103/+428 |
| |_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Only start the notifier timeout once we've had a chance to check for updates.... | Mark Haines | 2015-01-19 | 1 | -2/+2 |
* | | | | | | | | | | | Fix pyflakes errors | Mark Haines | 2015-01-19 | 1 | -1/+1 |
* | | | | | | | | | | | Fix syntax | Mark Haines | 2015-01-19 | 1 | -2/+3 |
* | | | | | | | | | | | Allow ':memory:' as the database path for sqlite3 | Mark Haines | 2015-01-19 | 2 | -2/+11 |
* | | | | | | | | | | | Finish renaming "context" to "room_id" in federation codebase | Mark Haines | 2015-01-16 | 7 | -99/+62 |
* | | | | | | | | | | | Fold _do_request_for_transaction into the methods that called it since it was... | Mark Haines | 2015-01-16 | 1 | -44/+11 |
* | | | | | | | | | | | Split transport layer into client and server parts | Mark Haines | 2015-01-16 | 3 | -272/+321 |
* | | | | | | | | | | | Remove temporary debug logging that was accidentally committed | Mark Haines | 2015-01-16 | 1 | -2/+0 |
* | | | | | | | | | | | Have /join/:room_id return the room ID in response anyway, for consistency of... | Paul "LeoNerd" Evans | 2015-01-13 | 1 | -1/+1 |
* | | | | | | | | | | | Have MockClock detect attempts to cancel expired timers, to prevent a repeat ... | Paul "LeoNerd" Evans | 2015-01-13 | 1 | -4/+16 |
* | | | | | | | | | | | Don't try to cancel already-expired timers - SYN-230 | Paul "LeoNerd" Evans | 2015-01-13 | 1 | -2/+8 |
* | | | | | | | | | | | Remove unused functions | Mark Haines | 2015-01-13 | 4 | -30/+0 |
* | | | | | | | | | | | get_room_events isn't called anywhere | Mark Haines | 2015-01-13 | 1 | -30/+0 |
* | | | | | | | | | | | Fix stream token ordering | Mark Haines | 2015-01-13 | 1 | -72/+101 |
| |_|_|_|_|_|_|/ / /
|/| | | | | | | | | |
|
* | | | | | | | | | | Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-01-13 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|/
| |/| | | | | | | | |
|
| * | | | | | | | | | Bump version | Erik Johnston | 2015-01-13 | 2 | -2/+2 |
| * | | | | | | | | | Insert 'age' into top level when returning events to clients | Erik Johnston | 2015-01-13 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
* | | | | | | | | | Use float rather than integer divisions to turn msec into sec - so timeouts u... | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -1/+1 |
* | | | | | | | | | Check that setting typing notification still works after explicit timeout at ... | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -1/+50 |
* | | | | | | | | | Make typing notification timeouts print a (debug) logging message | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -1/+7 |
* | | | | | | | | | Don't make @unittest.DEBUG print the huge amount of verbosity generated by th... | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -0/+2 |
* | | | | | | | | | Check that setting typing notification still works after explicit timeout - S... | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -0/+26 |
* | | | | | | | | | SYN-178: Fix off by one. | Kegan Dougal | 2015-01-12 | 1 | -2/+6 |
* | | | | | | | | | Add copyrighter script for sql | Mark Haines | 2015-01-12 | 1 | -0/+33 |
* | | | | | | | | | don't clobber pythonpath | Matthew Hodgson | 2015-01-09 | 1 | -2/+2 |
* | | | | | | | | | oops | Matthew Hodgson | 2015-01-08 | 1 | -1/+1 |
* | | | | | | | | | spell out that local libs may need to be explicitly given priority | Matthew Hodgson | 2015-01-08 | 1 | -0/+9 |
* | | | | | | | | | Check the existance and versions of necessary modules when starting synapse, ... | Mark Haines | 2015-01-08 | 2 | -0/+85 |
* | | | | | | | | | SYN-142: Rotate logs if logging to file. Fixed to a 4 file rotate with 100MB/... | Kegan Dougal | 2015-01-08 | 1 | -1/+4 |
* | | | | | | | | | make our JPEG thumbnail quality less horrifically ugly | Matthew Hodgson | 2015-01-08 | 1 | -1/+1 |
* | | | | | | | | | Add raw query param for scrollback. | Kegan Dougal | 2015-01-08 | 2 | -3/+9 |
* | | | | | | | | | Add better help message for --server-name config option. | Erik Johnston | 2015-01-08 | 1 | -2/+6 |
* | | | | | | | | | Return the raw federation event rather than adding extra keys for federation ... | Kegan Dougal | 2015-01-08 | 6 | -19/+27 |
* | | | | | | | | | Add missing continuation indent. | Erik Johnston | 2015-01-08 | 1 | -1/+2 |
* | | | | | | | | | Add 'raw' query parameter to expose the event graph and signatures to savvy c... | Kegan Dougal | 2015-01-08 | 6 | -16/+28 |
* | | | | | | | | | Add optional limit to graph script | Erik Johnston | 2015-01-08 | 1 | -6/+24 |
* | | | | | | | | | Merge branch 'master' into develop | Mark Haines | 2015-01-08 | 3 | -5/+5 |
|\| | | | | | | | |
|
| * | | | | | | | | Merge branch 'hotfixes-v0.6.1' v0.6.1a | Mark Haines | 2015-01-08 | 3 | -5/+5 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Bump version | Mark Haines | 2015-01-08 | 2 | -2/+2 |
| | * | | | | | | | | SYN-231: User agent header broken | Mark Haines | 2015-01-08 | 1 | -3/+3 |
| |/ / / / / / / / |
|
| * | | | | | | | | Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse v0.6.1 | Erik Johnston | 2015-01-07 | 137 | -310/+601 |
| |\ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | Log server version on startup | Erik Johnston | 2015-01-07 | 1 | -0/+3 |
* | | | | | | | | | | Change error message for missing pillow libs. | Kegan Dougal | 2015-01-07 | 1 | -2/+4 |
* | | | | | | | | | | PEP8 and pyflakes warnings | Kegan Dougal | 2015-01-07 | 2 | -2/+4 |
* | | | | | | | | | | Update tests | Kegan Dougal | 2015-01-07 | 1 | -1/+1 |
* | | | | | | | | | | SYN-154: Tweak how the m.room.create check is done. | Kegan Dougal | 2015-01-07 | 2 | -12/+12 |
* | | | | | | | | | | SYN-154: Better error messages when joining an unknown room by ID. | Kegan Dougal | 2015-01-07 | 3 | -6/+17 |
* | | | | | | | | | | *cough* | Matthew Hodgson | 2015-01-07 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'release-v0.6.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-01-07 | 3 | -2/+10 |
|\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Improve change log | Erik Johnston | 2015-01-07 | 1 | -2/+2 |
| * | | | | | | | | | Bump version and changelog | Erik Johnston | 2015-01-07 | 3 | -2/+10 |
|/ / / / / / / / / |
|
* | | | | | | | | | Remove unused import | Erik Johnston | 2015-01-07 | 1 | -2/+0 |
* | | | | | | | | | Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-01-07 | 2 | -9/+16 |
|\ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2015-01-07 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| | | | | | | | | |
|
* | | | | | | | | | | Merge branch 'master' into develop | Mark Haines | 2015-01-06 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Merge branch 'hotfixes-v0.6.0a' v0.6.0b | Mark Haines | 2014-12-29 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Return the argument passed to the callback in a deferred callback, otherwise ... | Mark Haines | 2014-12-29 | 1 | -0/+1 |
| * | | | | | | | | | | improve error msg | Matthew Hodgson | 2014-12-24 | 1 | -1/+1 |
| |/ / / / / / / / / |
|
| | * / / / / / / / | Optimize FrozenEvent creation | Erik Johnston | 2015-01-06 | 2 | -9/+16 |
| |/ / / / / / / /
|/| | | | | | | | |
|
* | | | | | | | | | Use time.time() instead of time.clock() | Erik Johnston | 2015-01-06 | 1 | -4/+4 |
* | | | | | | | | | Fix typo where we used wrong var. | Erik Johnston | 2015-01-06 | 1 | -2/+2 |
* | | | | | | | | | Only fetch the columns we need. | Erik Johnston | 2015-01-06 | 1 | -1/+1 |
* | | | | | | | | | RoomsForUser now has sender instead of user_id | Erik Johnston | 2015-01-06 | 1 | -1/+1 |
* | | | | | | | | | Add delta and bump DB version | Erik Johnston | 2015-01-06 | 2 | -1/+17 |
* | | | | | | | | | Add index on transaction_id to sent_transcations | Erik Johnston | 2015-01-06 | 2 | -4/+1 |
* | | | | | | | | | Actually time that function | Erik Johnston | 2015-01-06 | 1 | -0/+1 |
* | | | | | | | | | Time how long calls to _get_destination_retry_timings take | Erik Johnston | 2015-01-06 | 2 | -12/+64 |
* | | | | | | | | | Don't include None's in _get_events_txn | Erik Johnston | 2015-01-06 | 1 | -1/+3 |
* | | | | | | | | | Merge branch 'erikj-perf' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-01-06 | 2 | -26/+54 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Name 'user_rooms_intersect' transaction | Erik Johnston | 2015-01-06 | 1 | -16/+18 |
| * | | | | | | | | | We don't need the full events for get_rooms_for_user_where_membership_is | Erik Johnston | 2015-01-06 | 2 | -10/+36 |
* | | | | | | | | | | SYN-32 Use the ANTIALIAS resize method for thumbnailing images | Mark Haines | 2015-01-06 | 1 | -3/+3 |
* | | | | | | | | | | Add some logging for when we are sending transactions. | Matrix | 2015-01-06 | 1 | -0/+6 |
* | | | | | | | | | | Increase default maximum attachment size to 10M | Mark Haines | 2015-01-06 | 1 | -1/+1 |
* | | | | | | | | | | Merge pull request #28 from matrix-org/erikj-perf | Mark Haines | 2015-01-06 | 5 | -111/+118 |
|\| | | | | | | | | |
|
| * | | | | | | | | | PEP8 | Erik Johnston | 2015-01-06 | 2 | -3/+4 |
| * | | | | | | | | | Remove debug lines | Erik Johnston | 2015-01-06 | 1 | -7/+0 |
| * | | | | | | | | | Don't do batching when getting events. | Erik Johnston | 2015-01-06 | 1 | -35/+4 |
| * | | | | | | | | | Only fetch prev_content when a client is streaming/paginating. Use transactio... | Erik Johnston | 2015-01-06 | 2 | -86/+92 |
| * | | | | | | | | | Temporarily turn off 'redacted_because' and 'prev_content' keys | Erik Johnston | 2015-01-06 | 1 | -0/+2 |
| * | | | | | | | | | More debug logging | Erik Johnston | 2015-01-06 | 1 | -0/+4 |
| * | | | | | | | | | Add some debug logging | Erik Johnston | 2015-01-06 | 1 | -0/+12 |
| * | | | | | | | | | Reformat | Erik Johnston | 2015-01-06 | 1 | -13/+14 |
| * | | | | | | | | | Add RoomMemberStore.get_users_in_room, so that we can get the list of joined ... | Erik Johnston | 2015-01-06 | 2 | -8/+18 |
| * | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2015-01-06 | 6 | -7/+46 |
| |\ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2014-12-21 | 4 | -6/+26 |
| |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / /
| | |/| | | | | | | | |
|
| * | | | | | | | | | | Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2014-12-19 | 8 | -15/+72 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf | Erik Johnston | 2014-12-18 | 5 | -44/+79 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Test some ideas that might help performance a bit | Erik Johnston | 2014-12-17 | 4 | -23/+32 |
* | | | | | | | | | | | | | Update copyright notices | Mark Haines | 2015-01-06 | 132 | -128/+212 |
* | | | | | | | | | | | | | Set a content-length for JSON responses | Mark Haines | 2015-01-06 | 1 | -0/+1 |
* | | | | | | | | | | | | | SYN-208/SYN-228: Add runtime checks on startup to enforce that JPEG/PNG suppo... | Kegan Dougal | 2015-01-06 | 1 | -0/+29 |
* | | | | | | | | | | | | | SYN-229: Include Content-Length when downloading files | Mark Haines | 2015-01-06 | 3 | -7/+23 |
| |_|_|_|/ / / / / / / /
|/| | | | | | | | | | | |
|
* | | | | | | | | | | | | spell out that VoIP needs TURN | Matthew Hodgson | 2014-12-24 | 1 | -0/+3 |
* | | | | | | | | | | | | clarify these instructions a media-repo specific | Matthew Hodgson | 2014-12-24 | 1 | -1/+3 |
* | | | | | | | | | | | | spell out that upgrading is just installing over the top | Matthew Hodgson | 2014-12-24 | 1 | -0/+5 |
* | | | | | | | | | | | | Include version in User-Agent and Server headers | Mark Haines | 2014-12-22 | 4 | -6/+35 |
| |_|_|/ / / / / / / /
|/| | | | | | | | | | |
|