| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix bug where accepting invite over federation didn't work. Add logging. | Erik Johnston | 2015-01-30 | 1 | -8/+49 |
* | Merge pull request #43 from matrix-org/rejections | Erik Johnston | 2015-01-30 | 15 | -172/+706 |
|\ |
|
| * | Briefly doc structure of query_auth API. | Erik Johnston | 2015-01-30 | 1 | -0/+18 |
| * | Only auth_events with event if event in event.auth_events | Erik Johnston | 2015-01-30 | 1 | -1/+3 |
| * | Remove debug logging | Erik Johnston | 2015-01-30 | 1 | -9/+0 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 16 | -22/+552 |
| |\ |
|
| * \ | Merge branch 'replication_split' of github.com:matrix-org/synapse into reject... | Erik Johnston | 2015-01-30 | 3 | -9/+6 |
| |\ \ |
|
| * | | | Fix bug where we superfluously asked for current state. Change API of /query_... | Erik Johnston | 2015-01-30 | 5 | -49/+43 |
| * | | | Fix bad merge fo python_dependencies.py | Erik Johnston | 2015-01-30 | 1 | -1/+0 |
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 43 | -115/+2105 |
| |\ \ \ |
|
| * | | | | Update the current state of an event if we update auth events. | Erik Johnston | 2015-01-30 | 1 | -1/+3 |
| * | | | | Fix bug in timeout handling in keyclient | Erik Johnston | 2015-01-30 | 1 | -3/+4 |
| * | | | | Fix regression where we no longer correctly handled the case of gaps in our e... | Erik Johnston | 2015-01-30 | 2 | -2/+9 |
| * | | | | Fix bug where we changes in outlier in metadata dict propogated to other events | Erik Johnston | 2015-01-30 | 3 | -4/+8 |
| * | | | | Initial implementation of auth conflict resolution | Erik Johnston | 2015-01-29 | 7 | -81/+208 |
| * | | | | Make post_json(...) actually send data. | Erik Johnston | 2015-01-29 | 1 | -1/+1 |
| * | | | | Add post_json(...) method to federation client | Erik Johnston | 2015-01-29 | 1 | -0/+37 |
| * | | | | Start implementing auth conflict res | Erik Johnston | 2015-01-28 | 6 | -52/+253 |
| * | | | | Make it the responsibility of the replication layer to check signature and ha... | Erik Johnston | 2015-01-26 | 3 | -26/+173 |
* | | | | | Spit out server default rules too. | David Baker | 2015-01-30 | 2 | -10/+17 |
* | | | | | Merge pull request #41 from matrix-org/client_v2_sync | Mark Haines | 2015-01-30 | 7 | -46/+794 |
|\ \ \ \ \
| |_|_|_|/
|/| | | | |
|
| * | | | | Add doc string for __nonzero__ overrides for sync results, raise not implemen... | Mark Haines | 2015-01-30 | 1 | -1/+8 |
| * | | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-30 | 2 | -10/+2 |
| |\ \ \ \ |
|
| * | | | | | Check if the user has joined the room between incremental syncs | Mark Haines | 2015-01-30 | 1 | -4/+27 |
| * | | | | | Pass client info to the sync_config | Mark Haines | 2015-01-30 | 2 | -3/+4 |
| * | | | | | Fix token formatting | Mark Haines | 2015-01-30 | 2 | -5/+5 |
| * | | | | | Filter the recent events before applying the limit when doing an initial sync | Mark Haines | 2015-01-30 | 1 | -11/+10 |
| * | | | | | Filter the recent events before applying the limit when doing an incremental ... | Mark Haines | 2015-01-30 | 4 | -24/+54 |
| * | | | | | Update todo for the filtering on sync | Mark Haines | 2015-01-29 | 1 | -1/+2 |
| * | | | | | Add basic filtering support | Mark Haines | 2015-01-29 | 1 | -5/+14 |
| * | | | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 2 | -113/+109 |
| |\ \ \ \ \ |
|
| * | | | | | | Fix indent | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| * | | | | | | Move typing notifs to an "emphermal" event list on the room object | Mark Haines | 2015-01-29 | 2 | -7/+9 |
| * | | | | | | Fix check for empty room update | Mark Haines | 2015-01-29 | 1 | -1/+1 |
| * | | | | | | Fix v2 initial sync | Mark Haines | 2015-01-29 | 1 | -1/+2 |
| * | | | | | | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 9 | -40/+54 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge branch 'client_v2_filter' into client_v2_sync | Mark Haines | 2015-01-29 | 12 | -17/+493 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Use get_room_events_stream to get changes to the rooms if the number of chang... | Mark Haines | 2015-01-29 | 2 | -11/+52 |
| * | | | | | | | | | Remove typing TODO | Mark Haines | 2015-01-29 | 1 | -1/+0 |
| * | | | | | | | | | Add typing notifications to sync | Mark Haines | 2015-01-29 | 2 | -19/+29 |
| * | | | | | | | | | Include transaction ids in unsigned section of events in the sync results for... | Mark Haines | 2015-01-29 | 2 | -12/+22 |
| * | | | | | | | | | Add support for formatting events in the way a v2 client expects | Mark Haines | 2015-01-29 | 1 | -39/+52 |
| * | | | | | | | | | Add ports back to demo/start.sh | Mark Haines | 2015-01-28 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-28 | 35 | -91/+1822 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Fix Formatting | Mark Haines | 2015-01-27 | 4 | -14/+9 |
| * | | | | | | | | | | Wait for events if the incremental sync is empty and a timeout is given | Mark Haines | 2015-01-27 | 2 | -7/+60 |
| * | | | | | | | | | | Start implementing incremental initial sync | Mark Haines | 2015-01-27 | 3 | -34/+241 |
| * | | | | | | | | | | Start implementing the non-incremental sync portion of the v2 /sync API | Mark Haines | 2015-01-26 | 4 | -54/+146 |
| * | | | | | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 7 | -21/+45 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | Add handler for /sync API | Mark Haines | 2015-01-26 | 1 | -0/+110 |
| * | | | | | | | | | | | Merge branch 'develop' into client_v2_sync | Mark Haines | 2015-01-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Add client v2_alpha resource to synapse server resource tree | Mark Haines | 2015-01-23 | 2 | -1/+7 |
| * | | | | | | | | | | | | Start implementing the v2_alpha sync API | Mark Haines | 2015-01-23 | 5 | -0/+272 |
* | | | | | | | | | | | | | Merge pull request #42 from matrix-org/replication_split | Mark Haines | 2015-01-30 | 5 | -886/+993 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | |
|
| * | | | | | | | | | | | | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into repli... | Erik Johnston | 2015-01-30 | 44 | -123/+2104 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|_|/ /
| |/| | | | | | | | | | | |
|
| * | | | | | | | | | | | | Split up replication_layer module into client, server and transaction queue | Erik Johnston | 2015-01-26 | 5 | -603/+654 |
| * | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-23 | 40 | -199/+229 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / /
| | |/| | | | | | | | | | |
|
| * | | | | | | | | | | | | Add storage method have_events | Erik Johnston | 2015-01-23 | 1 | -0/+29 |
| * | | | | | | | | | | | | Split out TransactionQueue from replication layer | Erik Johnston | 2015-01-22 | 2 | -289/+316 |
| * | | | | | | | | | | | | Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rej... | Erik Johnston | 2015-01-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | | Add glob asterisks when running rules. | David Baker | 2015-01-30 | 2 | -4/+6 |
* | | | | | | | | | | | | | | Remove merge conflict | Erik Johnston | 2015-01-30 | 1 | -3/+0 |
* | | | | | | | | | | | | | | Remember to add schema file to list | Erik Johnston | 2015-01-30 | 1 | -0/+1 |
* | | | | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storage | Erik Johnston | 2015-01-30 | 11 | -8/+526 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #37 from matrix-org/client_v2_filter | Erik Johnston | 2015-01-30 | 8 | -2/+458 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | Use 'in' to test if the key exists, remove unused _filters_for_user | Mark Haines | 2015-01-30 | 2 | -10/+2 |
| | * | | | | | | | | | | | | | Unused import | Mark Haines | 2015-01-30 | 1 | -2/+0 |
| | | |_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | Create a separate filter object to do the actual filtering, so that we can | Mark Haines | 2015-01-29 | 2 | -113/+109 |
| | | |_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge branch 'develop' into client_v2_filter | Mark Haines | 2015-01-29 | 8 | -27/+48 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | Fix code-style | Mark Haines | 2015-01-29 | 1 | -13/+6 |
| | | |_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | Merge in auth changes from develop | Mark Haines | 2015-01-29 | 1 | -2/+2 |
| | | |_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | Merge changes from develop | Mark Haines | 2015-01-29 | 36 | -93/+1827 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | Move bump schema delta | Mark Haines | 2015-01-29 | 1 | -0/+0 |
| | * | | | | | | | | | | | Add basic filtering public API unit tests. Use defers in the right places. | Kegan Dougal | 2015-01-29 | 1 | -4/+7 |
| | * | | | | | | | | | | | Implement filter algorithm. Add basic event type unit tests to assert it works. | Kegan Dougal | 2015-01-29 | 1 | -0/+49 |
| | * | | | | | | | | | | | Add filtering public API; outline filtering algorithm. | Kegan Dougal | 2015-01-29 | 1 | -8/+52 |
| | * | | | | | | | | | | | Add filtering.filter_events function, with stub passes_filter function. | Kegan Dougal | 2015-01-29 | 1 | -0/+15 |
| | * | | | | | | | | | | | Also edit the filter column on the delta SQL | Kegan Dougal | 2015-01-29 | 1 | -1/+1 |
| | * | | | | | | | | | | | s/definition/filter_json/ since definition is now used to mean a component of... | Kegan Dougal | 2015-01-28 | 2 | -3/+3 |
| | * | | | | | | | | | | | Add filter JSON sanity checks. | Kegan Dougal | 2015-01-28 | 3 | -7/+108 |
| | * | | | | | | | | | | | Created schema delta | Paul "LeoNerd" Evans | 2015-01-27 | 2 | -1/+25 |
| | * | | | | | | | | | | | Initial stab at real SQL storage implementation of user filter definitions | Paul "LeoNerd" Evans | 2015-01-27 | 3 | -14/+60 |
| | * | | | | | | | | | | | Move storage of user filters into real datastore layer; now have to mock it o... | Paul "LeoNerd" Evans | 2015-01-27 | 3 | -24/+52 |
| | * | | | | | | | | | | | Have the Filtering API return Deferreds, so we can do the Datastore implement... | Paul "LeoNerd" Evans | 2015-01-27 | 2 | -5/+19 |
| | * | | | | | | | | | | | Initial trivial implementation of an actual 'Filtering' object; move storage ... | Paul "LeoNerd" Evans | 2015-01-27 | 3 | -13/+58 |
| | * | | | | | | | | | | | Merge branch 'develop' into client_v2_filter | Paul "LeoNerd" Evans | 2015-01-27 | 7 | -21/+45 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|/ / /
| | | |/| | | | | | | | | |
|
| | * | | | | | | | | | | | 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 |
| * | | | | | | | | | | | Add a slightly more helpful comment | Erik Johnston | 2015-01-30 | 1 | -1/+2 |
| * | | | | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolu... | Erik Johnston | 2015-01-30 | 65 | -368/+2394 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
* | | | | | | | | | | | | | 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 'develop' of github.com:matrix-org/synapse into rejections_storage | Erik Johnston | 2015-01-30 | 65 | -367/+2380 |
|\ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / /
| |/| | | | | | | | | | |
|
| * | | | | | | | | | | | We do need Twisted 14, not 15: we use internal Twisted things that have been ... | David Baker | 2015-01-30 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | |
|
| * | | | | | | | | | | 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 | 14 | -46/+77 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | 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 | 14 | -46/+74 |
| | * | | | | | | | Return the device_id from get_auth_by_req | Mark Haines | 2015-01-28 | 11 | -29/+32 |
| | | |_|/ / / /
| | |/| | | | | |
|
| * | | | | | | | 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 |
| * | | | | | | | | Move pushers delta to v12 and bump schema version | David Baker | 2015-01-28 | 2 | -1/+1 |
| * | | | | | | | | 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 | 31 | -207/+364 |
| |\ \ \ \ \ \ \ \
| | | |/ / / / / /
| | |/| | | | | | |
|
| | * | | | | | | | 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 |
| | | |_|/ / / /
| | |/| | | | | |
|
| | * | | | | | | 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 |
| | | |_|_|_|/
| | |/| | | | |
|
| | * | | | | | 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 |
| | * | | | | | 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 | 4 | -13/+10 |
| | * | | | | | Replace hs.parse_roomid with RoomID.from_string | Mark Haines | 2015-01-23 | 3 | -10/+3 |
| | * | | | | | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 15 | -63/+71 |
| | * | | | | | Merge rest servlets into the client json resource object | Mark Haines | 2015-01-23 | 3 | -24/+9 |
| * | | | | | | 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 |
| * | | | | | | 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 | 45 | -513/+514 |
| |\| | | | | |
|
| | * | | | | | Move rest APIs back under the rest directory | Mark Haines | 2015-01-22 | 28 | -3/+17 |
| | * | | | | | Move client v1 api rest servlets into a "client/v1" directory | Mark Haines | 2015-01-22 | 15 | -3/+17 |
| * | | | | | | 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 | 133 | -413/+882 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | 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 | 70 | -1511/+3135 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | schema version is now 10 | David Baker | 2014-12-18 | 2 | -1/+1 |
| * | | | | | | | | Merge branch 'master' into pushers | David Baker | 2014-12-18 | 10 | -11/+41 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | 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 |
| * | | | | | | | | | Merge branch 'develop' into pushers | David Baker | 2014-12-02 | 20 | -225/+541 |
| |\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | 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 | 6 | -88/+84 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | 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 | 1 | -32/+71 |
| |_|_|_|_|_|_|_|/ /
|/| | | | | | | | | |
|
* | | | | | | | | | | 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 | 6 | -97/+60 |
* | | | | | | | | | | 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 |
* | | | | | | | | | | 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 | 3 | -19/+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 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
| * | | | | | | | | Bump version | Erik Johnston | 2015-01-13 | 1 | -1/+1 |
| * | | | | | | | | 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 |
* | | | | | | | | | Make typing notification timeouts print a (debug) logging message | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -1/+7 |
* | | | | | | | | | SYN-178: Fix off by one. | Kegan Dougal | 2015-01-12 | 1 | -2/+6 |
* | | | | | | | | | 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 |
* | | | | | | | | | Merge branch 'master' into develop | Mark Haines | 2015-01-08 | 2 | -4/+4 |
|\| | | | | | | | |
|
| * | | | | | | | | Bump version | Mark Haines | 2015-01-08 | 1 | -1/+1 |
| * | | | | | | | | SYN-231: User agent header broken | Mark Haines | 2015-01-08 | 1 | -3/+3 |
* | | | | | | | | | 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 |
* | | | | | | | | | 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 |
|/ / / / / / / / |
|
* | | | | | | | | Bump version and changelog | Erik Johnston | 2015-01-07 | 1 | -1/+1 |
* | | | | | | | | Remove unused import | Erik Johnston | 2015-01-07 | 1 | -2/+0 |
* | | | | | | | | 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 |