| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-22 | 8 | -27/+329 |
| |\ | |||||
| | * | Merge pull request #320 from matrix-org/appservice-retry-cap | Erik Johnston | 2015-10-22 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Cap the time to retry txns to appservices to 8.5 minutes | Kegan Dougal | 2015-10-21 | 1 | -2/+2 |
| | * | | Merge pull request #314 from matrix-org/paul/event-redaction | Mark Haines | 2015-10-22 | 2 | -0/+115 |
| | |\ \ | |||||
| | | * | | Add some unit tests of prune_events() | Paul "LeoNerd" Evans | 2015-10-16 | 2 | -0/+115 |
| | * | | | Don't keep appending report_stats to demo config | Erik Johnston | 2015-10-22 | 1 | -2/+6 |
| | * | | | Merge pull request #321 from matrix-org/markjh/v2_sync_typing | Mark Haines | 2015-10-21 | 1 | -14/+41 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'develop' into markjh/v2_sync_typing | Mark Haines | 2015-10-21 | 27 | -214/+1027 |
| | | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge pull request #316 from matrix-org/markjh/v2_sync_archived | Mark Haines | 2015-10-21 | 3 | -9/+163 |
| | |\ \ \ \ | |||||
| | | * | | | | Include banned rooms in the archived section of v2 sync | Mark Haines | 2015-10-21 | 2 | -8/+11 |
| | | * | | | | Fix pep8 | Mark Haines | 2015-10-19 | 1 | -1/+0 |
| | | * | | | | Add rooms that the user has left under archived in v2 sync. | Mark Haines | 2015-10-19 | 3 | -9/+161 |
| | * | | | | | Merge pull request #318 from matrix-org/syn-502-login-bad-emails | Kegsay | 2015-10-21 | 1 | -0/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Use 403 and message to match handlers/auth | Kegan Dougal | 2015-10-21 | 1 | -3/+1 |
| | | * | | | | | Don't 500 when the email doesn't map to a valid user ID. | Kegan Dougal | 2015-10-20 | 1 | -0/+4 |
| | | | |_|_|/ | | |/| | | | |||||
| | | | | * | | Doc string for the SyncHandler.typing_by_room method | Mark Haines | 2015-10-21 | 1 | -0/+12 |
| | | | | * | | Include typing events in initial v2 sync | Mark Haines | 2015-10-20 | 1 | -14/+29 |
| | | | |/ / | |||||
| * | | | | | PEP8 | Erik Johnston | 2015-10-22 | 1 | -1/+2 |
| * | | | | | Move FTS to delta 25 | Erik Johnston | 2015-10-22 | 2 | -3/+3 |
| * | | | | | Filter room ids before hitting the database | Erik Johnston | 2015-10-21 | 2 | -1/+21 |
| * | | | | | Filter search results | Erik Johnston | 2015-10-21 | 1 | -2/+7 |
| * | | | | | Merge branch 'erikj/filter_refactor' into erikj/search | Erik Johnston | 2015-10-20 | 19 | -329/+597 |
| |\ \ \ \ \ | |||||
| | * | | | | | Docstring | Erik Johnston | 2015-10-20 | 1 | -0/+5 |
| | * | | | | | Refactor api.filtering to have a Filter API | Erik Johnston | 2015-10-20 | 3 | -126/+88 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Daniel Wagner-Hall | 2015-10-20 | 2 | -0/+129 |
| | |\| | | | |||||
| | | * | | | Merge pull request #315 from matrix-org/paul/test-vectors | Paul Evans | 2015-10-19 | 2 | -0/+129 |
| | | |\ \ \ | |||||
| | | | * | | | Invoke EventBuilder directly instead of going via the EventBuilderFactory | Paul "LeoNerd" Evans | 2015-10-19 | 1 | -35/+3 |
| | | | * | | | Capture __init__.py | Paul "LeoNerd" Evans | 2015-10-19 | 1 | -0/+15 |
| | | | * | | | Use assertIn() instead of assertTrue on the 'in' operator | Paul "LeoNerd" Evans | 2015-10-19 | 1 | -6/+6 |
| | | | * | | | Another signing test vector using an 'm.room.message' with content, so that t... | Paul "LeoNerd" Evans | 2015-10-19 | 1 | -1/+49 |
| | | | * | | | Initial minimial hack at a test of event hashing and signing | Paul "LeoNerd" Evans | 2015-10-19 | 1 | -0/+98 |
| | | | | |/ | | | |/| | |||||
| | * | / | | Allow rejecting invites | Daniel Wagner-Hall | 2015-10-20 | 8 | -93/+353 |
| | |/ / / | |||||
| | * | | | Merge pull request #312 from matrix-org/daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-19 | 2 | -8/+15 |
| | |\ \ \ | |||||
| | | * | | | Stuff signed data in a standalone object | Daniel Wagner-Hall | 2015-10-16 | 2 | -8/+15 |
| | * | | | | Merge pull request #307 from matrix-org/erikj/search | Erik Johnston | 2015-10-19 | 10 | -2/+365 |
| | |\ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | | Explicitly check for Sqlite3Engine | Erik Johnston | 2015-10-16 | 1 | -2/+5 |
| * | | | | Typing | Erik Johnston | 2015-10-16 | 1 | -2/+2 |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 13 | -25/+393 |
| |\ \ \ \ | |||||
| * | | | | | Remove unused import | Erik Johnston | 2015-10-16 | 1 | -3/+1 |
| * | | | | | Remove duplicate _filter_events_for_client | Erik Johnston | 2015-10-16 | 1 | -46/+0 |
| * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 3 | -97/+51 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Explicitly check for Sqlite3Engine | Erik Johnston | 2015-10-16 | 1 | -2/+5 |
| * | | | | | | | docstring | Erik Johnston | 2015-10-16 | 1 | -0/+10 |
| * | | | | | | | Add docstring | Erik Johnston | 2015-10-16 | 1 | -0/+11 |
| * | | | | | | | Comment on the LIMIT 500 | Erik Johnston | 2015-10-16 | 1 | -0/+2 |
| * | | | | | | | Split up run_upgrade | Erik Johnston | 2015-10-16 | 1 | -5/+11 |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-15 | 7 | -171/+294 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove unused constatns | Erik Johnston | 2015-10-14 | 1 | -19/+0 |
| * | | | | | | | | Make 'keys' optional | Erik Johnston | 2015-10-14 | 1 | -1/+3 |
| * | | | | | | | | Fix to work with SQLite | Erik Johnston | 2015-10-14 | 1 | -4/+11 |
| * | | | | | | | | More TODO markers | Erik Johnston | 2015-10-14 | 1 | -0/+3 |
| * | | | | | | | | Add TODO markers | Erik Johnston | 2015-10-14 | 1 | -1/+4 |
| * | | | | | | | | Add paranoia limit | Erik Johnston | 2015-10-13 | 1 | -1/+1 |
| * | | | | | | | | Remove constraints in preperation of using filters | Erik Johnston | 2015-10-13 | 2 | -71/+20 |
| * | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-13 | 2 | -24/+50 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'erikj/store_engine' into erikj/search | Erik Johnston | 2015-10-13 | 6 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add SQLite support | Erik Johnston | 2015-10-13 | 1 | -5/+12 |
| * | | | | | | | | | | Merge branch 'erikj/store_engine' into erikj/search | Erik Johnston | 2015-10-13 | 9 | -409/+464 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Search left rooms too | Erik Johnston | 2015-10-13 | 1 | -5/+2 |
| * | | | | | | | | | | | Add sqlite schema | Erik Johnston | 2015-10-13 | 1 | -5/+64 |
| * | | | | | | | | | | | Filter events to only thsoe that the user is allowed to see | Erik Johnston | 2015-10-12 | 2 | -13/+17 |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/develop' into erikj/search | Erik Johnston | 2015-10-12 | 11 | -65/+258 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Remove unused room_id parameter | Erik Johnston | 2015-10-12 | 5 | -14/+61 |
| * | | | | | | | | | | | | PEP8 | Erik Johnston | 2015-10-12 | 1 | -2/+9 |
| * | | | | | | | | | | | | Keep FTS indexes up to date. Only search through rooms currently joined | Erik Johnston | 2015-10-12 | 6 | -12/+55 |
| * | | | | | | | | | | | | Add basic full text search impl. | Erik Johnston | 2015-10-09 | 8 | -1/+268 |
| | | | | | | | | | * | | | Merge pull request #313 from matrix-org/paul/tiny-fixes | Paul Evans | 2015-10-16 | 1 | -1/+0 |
| | | | | | | | | | |\ \ \ | |||||
| | | | | | | | | | | * | | | Surely we don't need to preserve 'events_default' twice | Paul "LeoNerd" Evans | 2015-10-16 | 1 | -1/+0 |
| | | | | | | | | | |/ / / | |||||
| | | | | | | | | | * | | | Merge pull request #306 from matrix-org/markjh/unused_methods | Mark Haines | 2015-10-16 | 2 | -101/+0 |
| | | | | | | | | | |\ \ \ | | | | | | | | | | |_|/ | | | | | | | | | |/| | | |||||
| | | | | | | | | | | * | | synapse.client.v1.login.LoginFallbackRestServlet and synapse.client.v1.login.... | Mark Haines | 2015-10-15 | 1 | -30/+0 |
| | | | | | | | | | | * | | synapse.util.emailutils was unused | Mark Haines | 2015-10-15 | 1 | -71/+0 |
| | | | | | | |_|_|_|/ / | | | | | |/| | | | | | |||||
| | | | | | | | | | * | | Merge pull request #310 from matrix-org/markjh/bcrypt_rounds | Mark Haines | 2015-10-16 | 2 | -1/+8 |
| | | | | | | | | |/| | | |||||
| | | | | | | | | | * | | Add config for how many bcrypt rounds to use for password hashes | Mark Haines | 2015-10-16 | 2 | -1/+8 |
| | | | | | | |_|_|/ / | | | | | |/| | | | | |||||
| | | | | | | | | * | | Merge pull request #311 from matrix-org/markjh/postgres_fixes | Erik Johnston | 2015-10-16 | 1 | -1/+1 |
| | | | | | | | | |\ \ | |||||
| | | | | | | | | | * | | Fix FilteringStore.get_user_filter to work with postgres | Mark Haines | 2015-10-16 | 1 | -1/+1 |
| | | | | | | | | |/ / | |||||
| | | | | | | | | * / | Merge pull request #302 from matrix-org/daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-16 | 12 | -24/+392 |
| | | | | | | | |/| | | | | | | | | | |/ | |||||
| | | | | | | | | * | Add signing host and keyname to signatures | Daniel Wagner-Hall | 2015-10-16 | 2 | -6/+10 |
| | | | | | | | | * | Verify third party ID server certificates | Daniel Wagner-Hall | 2015-10-16 | 4 | -9/+43 |
| | | | | | | | | * | Use non-placeholder name for endpoint | Daniel Wagner-Hall | 2015-10-15 | 1 | -1/+1 |
| | | | | | | | | * | Look for keys on the right objects | Daniel Wagner-Hall | 2015-10-15 | 3 | -4/+6 |
| | | | | | | | | * | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-15 | 17 | -588/+758 |
| | | | | | | | | |\ | | | | | | |_|_|/ | | | | | |/| | | | |||||
| | | | | | | | | * | Use more descriptive error code | Daniel Wagner-Hall | 2015-10-13 | 1 | -1/+1 |
| | | | | | | | | * | Remove unnecessary class-wrapping | Daniel Wagner-Hall | 2015-10-13 | 8 | -91/+94 |
| | | | | | | | | * | Move logic into handler | Daniel Wagner-Hall | 2015-10-13 | 2 | -115/+150 |
| | | | | | | | | * | Add logging | Daniel Wagner-Hall | 2015-10-13 | 1 | -2/+2 |
| | | | | | | | | * | Re-add accidentally removed code | Daniel Wagner-Hall | 2015-10-13 | 1 | -1/+1 |
| | | | | | | | | * | Add some docstring | Daniel Wagner-Hall | 2015-10-13 | 1 | -0/+15 |
| | | | | | | | | * | Move event contents into third_party_layout field | Daniel Wagner-Hall | 2015-10-13 | 7 | -21/+35 |
| | | | | | | | | * | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-13 | 11 | -65/+292 |
| | | | | | | | | |\ | |||||
| | | | | | | | | * \ | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+0 |
| | | | | | | | | |\ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| | | | | | | | | * | | Remove merge thinko | Daniel Wagner-Hall | 2015-10-06 | 1 | -4/+0 |
| | | | | | | | | * | | Add third party invites to auth_events for joins | Daniel Wagner-Hall | 2015-10-06 | 1 | -0/+5 |
| | | | | | | | | * | | Fix lint errors | Daniel Wagner-Hall | 2015-10-06 | 2 | -4/+4 |
| | | | | | | | | * | | Revert "Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_fed... | Daniel Wagner-Hall | 2015-10-06 | 1 | -76/+131 |
| | | | | | | | | * | | Merge branch 'daniel/useragent' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+1 |
| | | | | | | | | |\ \ | |||||
| | | | | | | | | * \ \ | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+2 |
| | | | | | | | | |\ \ \ | |||||
| | | | | | | | | * \ \ \ | Merge branch 'daniel/useragent' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-05 | 2 | -6/+10 |
| | | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | * | | | | | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation" | Daniel Wagner-Hall | 2015-10-05 | 1 | -131/+76 |
| | | | | | | | | * | | | | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-05 | 10 | -83/+218 |
| | | | | | | | | |\ \ \ \ \ | |||||
| | | | | | | | | * | | | | | | Implement third party identifier invites | Daniel Wagner-Hall | 2015-10-01 | 11 | -19/+275 |
| | | | | | | | * | | | | | | | Merge pull request #309 from matrix-org/erikj/_filter_events_for_client | Erik Johnston | 2015-10-16 | 3 | -97/+51 |
| | | | | | | |/| | | | | | | | |||||
| | | | | | | | * | | | | | | | Amalgamate _filter_events_for_client | Erik Johnston | 2015-10-16 | 3 | -97/+51 |
| | | | | | | |/ / / / / / / | |||||
| | | | | | | * | | | | | | | Merge pull request #308 from matrix-org/markjh/v2_filter_encoding | Mark Haines | 2015-10-16 | 1 | -2/+2 |
| | | | | | |/| | | | | | | | |||||
| | | | | | | * | | | | | | | Encode the filter JSON as UTF-8 before storing in the database. | Mark Haines | 2015-10-16 | 1 | -2/+2 |
| | | | | | |/ / / / / / / | |||||
| | | | | | * | | | | | | | Merge pull request #305 from matrix-org/markjh/v2_sync_api | Mark Haines | 2015-10-14 | 3 | -170/+211 |
| | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | Fix v2 sync polling | Mark Haines | 2015-10-14 | 1 | -3/+3 |
| | | | | | | * | | | | | | | Merge branch 'develop' into markjh/v2_sync_api | Mark Haines | 2015-10-14 | 9 | -382/+485 |
| | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | | Add a get_invites_for_user method to the storage to find out the rooms a user... | Mark Haines | 2015-10-13 | 2 | -6/+16 |
| | | | | | | * | | | | | | | | Include invites in incremental sync | Mark Haines | 2015-10-13 | 2 | -7/+26 |
| | | | | | | * | | | | | | | | Include invited rooms in the initial sync | Mark Haines | 2015-10-13 | 2 | -11/+26 |
| | | | | | | * | | | | | | | | Merge branch 'develop' into markjh/v2_sync_api | Mark Haines | 2015-10-13 | 11 | -34/+242 |
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|/ | | | | | | | |/| | | | | | | |||||
| | | | | | | * | | | | | | | | Start spliting out the rooms into joined and invited in v2 sync | Mark Haines | 2015-10-13 | 2 | -27/+49 |
| | | | | | | * | | | | | | | | Update the filters to match the latest spec. | Mark Haines | 2015-10-12 | 4 | -42/+55 |
| | | | | | | * | | | | | | | | Merge branch 'markjh/presence_races' into markjh/v2_sync_api | Mark Haines | 2015-10-09 | 1 | -3/+8 |
| | | | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | | | Set the user as online if they start polling the v2 sync | Mark Haines | 2015-10-09 | 1 | -3/+11 |
| | | | | | | * | | | | | | | | | Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api | Mark Haines | 2015-10-09 | 11 | -123/+272 |
| | | | | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | | | | Format the presence events correctly for v2 | Mark Haines | 2015-10-09 | 1 | -3/+9 |
| | | | | | | * | | | | | | | | | | Update the v2 room sync format to match the current v2 spec | Mark Haines | 2015-10-08 | 2 | -21/+18 |
| | | | | | | * | | | | | | | | | | Update the sync response to match the latest spec | Mark Haines | 2015-10-07 | 1 | -24/+22 |
| | | | | | | * | | | | | | | | | | Move the rooms out into a room_map mapping from room_id to room. | Mark Haines | 2015-10-05 | 3 | -32/+47 |
| | | | | | | * | | | | | | | | | | Start updating the sync API to match the specification | Mark Haines | 2015-10-01 | 3 | -90/+54 |
| | | | | | | | |_|_|_|/ / / / / | | | | | | |/| | | | | | | | | |||||
| | | | | | * | | | | | | | | | | Merge pull request #304 from matrix-org/erikj/remove_unused_arg | Erik Johnston | 2015-10-14 | 4 | -12/+12 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / | | | | | |/| | | | | | | | | | |||||
| | | | | | | * | | | | | | | | | Remove unused room_id arg | Erik Johnston | 2015-10-14 | 4 | -12/+12 |
| | | | | | |/ / / / / / / / / | |||||
| | | | | | * | | | | | | | | | Merge pull request #303 from matrix-org/markjh/twisted_debugging | Mark Haines | 2015-10-13 | 4 | -1/+83 |
| | | | | |/| | | | | | | | | | |||||
| | | | | | * | | | | | | | | | Enable stack traces for the demo scripts | Mark Haines | 2015-10-13 | 1 | -0/+3 |
| | | | | | * | | | | | | | | | Only turn on the twisted deferred debugging if full_twisted_stacktraces is se... | Mark Haines | 2015-10-13 | 2 | -3/+8 |
| | | | | | * | | | | | | | | | Fix pep8 warnings. | Mark Haines | 2015-10-13 | 1 | -8/+12 |
| | | | | | * | | | | | | | | | Bounce all deferreds through the reactor to make debugging easier. | Mark Haines | 2015-10-13 | 2 | -0/+70 |
| | | | | * | | | | | | | | | | Merge pull request #301 from matrix-org/markjh/v2_filtering | Erik Johnston | 2015-10-13 | 2 | -24/+50 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | | | |||||
| | | | | | * | | | | | | | | | update filtering tests | Mark Haines | 2015-10-13 | 1 | -6/+6 |
| | | | | | * | | | | | | | | | Update the v2 filters to support filtering presence and remove support for pu... | Mark Haines | 2015-10-13 | 1 | -18/+44 |
| | | | | |/ / / / / / / / / | |||||
| | | | | * | | | | | | | | | Merge pull request #300 from matrix-org/erikj/store_engine | Erik Johnston | 2015-10-13 | 6 | -381/+402 |
| | | | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | / / / / / | | | | | |_|_|/ / / / / | | | | |/| | | | | | | | |||||
| | | | * / | | | | | | | | rename schema_prepare to prepare_database | Erik Johnston | 2015-10-13 | 5 | -4/+4 |
| | | |/ / / / / / / / / | |||||
| | | * | | | | | | | | | Expose error more nicely | Erik Johnston | 2015-10-13 | 6 | -9/+5 |
| | | * | | | | | | | | | Split out the schema preparation and update logic into its own module | Erik Johnston | 2015-10-13 | 4 | -377/+402 |
| | | |/ / / / / / / / | |||||
| | | * | | | | | | | | Merge pull request #299 from stevenhammerton/sh-cas-required-attribute | Erik Johnston | 2015-10-12 | 2 | -27/+61 |
| | |/| | | | | | | | | |||||
| | | * | | | | | | | | Add a comment to clarify why we split on closing curly brace when reading CAS... | Steven Hammerton | 2015-10-12 | 1 | -0/+5 |
| | | * | | | | | | | | Unpack dictionary in for loop for nicer syntax | Steven Hammerton | 2015-10-12 | 1 | -4/+4 |
| | | * | | | | | | | | Default cas_required_attributes to empty dictionary | Steven Hammerton | 2015-10-12 | 1 | -1/+1 |
| | | * | | | | | | | | Remove not required parenthesis | Steven Hammerton | 2015-10-12 | 1 | -1/+1 |
| | | * | | | | | | | | Support multiple required attributes in CAS response, and in a nicer config f... | Steven Hammerton | 2015-10-12 | 2 | -22/+10 |
| | | * | | | | | | | | Allow optional config params for a required attribute and it's value, if spec... | Steven Hammerton | 2015-10-12 | 2 | -1/+30 |
| | | * | | | | | | | | Parse both user and attributes from CAS response | Steven Hammerton | 2015-10-12 | 1 | -26/+38 |
| | * | | | | | | | | | Merge pull request #296 from matrix-org/markjh/eventstream_presence | Mark Haines | 2015-10-12 | 1 | -35/+52 |
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | | * | | | | | | | | Split the sections of EventStreamHandler.get_stream that handle presence | Mark Haines | 2015-10-09 | 1 | -35/+52 |
| | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| | * | | | | | | | | Merge pull request #297 from matrix-org/markjh/presence_races | Mark Haines | 2015-10-12 | 1 | -3/+8 |
| | |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | / / / / | | | |_|/ / / / | | |/| | | | | | |||||
| | | * | | | | | | Fix some races in the synapse presence handler caused by not yielding on defe... | Mark Haines | 2015-10-09 | 1 | -3/+8 |
| | | |/ / / / / | |||||
| | * | | | | | | add steve to authors | Matthew Hodgson | 2015-10-10 | 1 | -1/+4 |
| | * | | | | | | Fix previous merge to s/version_string/user_agent/ | Erik Johnston | 2015-10-10 | 1 | -2/+2 |
| | * | | | | | | Merge pull request #295 from stevenhammerton/sh-cas-auth | Erik Johnston | 2015-10-10 | 5 | -21/+184 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Raise LoginError if CasResponse doensn't contain user | Steven Hammerton | 2015-10-10 | 1 | -1/+1 |
| | | * | | | | | | Fix my broken line splitting | Steven Hammerton | 2015-10-10 | 1 | -4/+6 |
| | | * | | | | | | Use UserId to create FQ user id | Steven Hammerton | 2015-10-10 | 1 | -1/+1 |
| | | * | | | | | | Add get_raw method to SimpleHttpClient, use this in CAS auth rather than requ... | Steven Hammerton | 2015-10-10 | 2 | -24/+44 |
| | | * | | | | | | Formatting changes | Steven Hammerton | 2015-10-10 | 2 | -6/+14 |
| | | * | | | | | | Provide ability to login using CAS | Steven Hammerton | 2015-10-10 | 4 | -2/+135 |
| | |/ / / / / / | |||||
| | * | | | | | | Merge pull request #294 from matrix-org/markjh/initial_sync_archived_flag | Mark Haines | 2015-10-09 | 2 | -6/+11 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Use 'true' rather than '1' for archived flag | Mark Haines | 2015-10-08 | 1 | -1/+1 |
| | | * | | | | | | Add a flag to initial sync to indicate we want rooms that the user has left | Mark Haines | 2015-10-08 | 2 | -6/+11 |
| | | |/ / / / / | |||||
| | * / / / / / | Use raw string for regex here, otherwise \b is the backspace character. Fixes... | David Baker | 2015-10-08 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #292 from matrix-org/daniel/useragent | Daniel Wagner-Hall | 2015-10-06 | 2 | -6/+10 |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | | Use space not dash as delimiter | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+1 |
| | * | | | | | Use space not dash as delimiter | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+1 |
| | * | | | | | Merge branch 'develop' into daniel/useragent | Daniel Wagner-Hall | 2015-10-06 | 10 | -88/+220 |
| | |\| | | | | | |_|_|/ | |/| | | | |||||
| | * | | | | Preserve version string in user agent | Daniel Wagner-Hall | 2015-10-05 | 2 | -4/+4 |
| | * | | | | Allow synapse's useragent to be customized | Daniel Wagner-Hall | 2015-10-02 | 2 | -6/+10 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #293 from matrix-org/markjh/remove_spamy_error_logging | Mark Haines | 2015-10-06 | 1 | -1/+0 |
| |\ \ \ \ | |_|/ / |/| | | | |||||
| | * | | | Remove log line that was generated whenever an error was created. We are now ... | Mark Haines | 2015-10-06 | 1 | -1/+0 |
| |/ / / | |||||
| * | / | Explicitly add Create event as auth event | Erik Johnston | 2015-10-02 | 1 | -2/+3 |
| | |/ |/| | |||||
| * | | Add 'trusted_private_chat' to room creation presets | Erik Johnston | 2015-10-02 | 2 | -0/+6 |
| * | | Merge pull request #275 from matrix-org/erikj/invite_state | Erik Johnston | 2015-10-02 | 3 | -5/+34 |
| |\ \ | |||||
| | * | | Also bundle in sender | Erik Johnston | 2015-10-02 | 1 | -0/+1 |
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state | Erik Johnston | 2015-09-25 | 52 | -266/+1142 |
| | |\ \ | |||||
| | * | | | Bundle in some room state in the unsigned bit of the invite when sending to i... | Erik Johnston | 2015-09-10 | 4 | -7/+35 |
| * | | | | Merge pull request #279 from matrix-org/erikj/unfederatable | Erik Johnston | 2015-10-02 | 3 | -4/+32 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable | Erik Johnston | 2015-10-02 | 62 | -947/+1423 |
| | |\ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | | Merge pull request #283 from matrix-org/erikj/atomic_join_federation | Erik Johnston | 2015-10-02 | 1 | -76/+131 |
| |\ \ \ \ \ | |||||
| | * | | | | | Comment | Erik Johnston | 2015-09-30 | 1 | -0/+8 |
| | * | | | | | Rename var | Erik Johnston | 2015-09-30 | 1 | -3/+3 |
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/atomic_joi... | Erik Johnston | 2015-09-17 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Revert change of scripts/check_auth.py | Erik Johnston | 2015-09-17 | 1 | -1/+1 |
| | * | | | | | | Fix getting an event for a room the server forgot it was in | Erik Johnston | 2015-09-17 | 1 | -47/+59 |
| | * | | | | | | Also persist state | Erik Johnston | 2015-09-17 | 1 | -1/+1 |
| | * | | | | | | Capture err | Erik Johnston | 2015-09-17 | 1 | -2/+2 |
| | * | | | | | | Also handle state | Erik Johnston | 2015-09-17 | 1 | -3/+3 |
| | * | | | | | | Don't bail out of joining if we encounter a rejected event | Erik Johnston | 2015-09-17 | 2 | -14/+21 |
| | * | | | | | | Refactor do_invite_join | Erik Johnston | 2015-09-17 | 2 | -31/+56 |
| * | | | | | | | Merge pull request #291 from matrix-org/receipt-validation | Kegsay | 2015-10-01 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Validate the receipt type before passing it on to the receipt handler | Kegan Dougal | 2015-10-01 | 1 | -0/+4 |
| |/ / / / / / / | |||||
| * | | | | | | | Don't change cwd in synctl | Erik Johnston | 2015-10-01 | 1 | -2/+2 |
| * | | | | | | | Merge pull request #287 from matrix-org/erikj/canonical_alias | Erik Johnston | 2015-09-30 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| | * | | | | | | Remove double indentation | Erik Johnston | 2015-09-30 | 1 | -7/+6 |
| | * | | | | | | Set m.room.canonical_alias on room creation. | Erik Johnston | 2015-09-23 | 1 | -1/+11 |
| * | | | | | | | Merge pull request #288 from matrix-org/markjh/unused_definitions | Mark Haines | 2015-09-28 | 18 | -588/+162 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix scripts-dev/definitions.py argparse options | Mark Haines | 2015-09-23 | 1 | -1/+1 |
| | * | | | | | | | Remove unused _execute_and_decode from scripts/synapse_port_db | Mark Haines | 2015-09-23 | 1 | -2/+0 |
| | * | | | | | | | synapse/storage/state.py: _make_group_id was unused | Mark Haines | 2015-09-23 | 1 | -6/+0 |
| | * | | | | | | | Remove unused functions from synapse/storage/signatures.py | Mark Haines | 2015-09-23 | 1 | -112/+0 |
| | * | | | | | | | synapse/storage/roommember.py:_get_members_query was unused | Mark Haines | 2015-09-23 | 1 | -6/+0 |
| | * | | | | | | | Remove unused functions from synapse/storage/events.py | Mark Haines | 2015-09-23 | 1 | -11/+0 |
| | * | | | | | | | Remove unused functions from synapse/storage/event_federation.py | Mark Haines | 2015-09-23 | 1 | -71/+0 |
| | * | | | | | | | synapse/storage/_base.py:_simple_max_id was unused | Mark Haines | 2015-09-23 | 1 | -18/+0 |
| | * | | | | | | | synapse/storage/_base.py:_simple_delete was unused | Mark Haines | 2015-09-23 | 1 | -10/+0 |
| | * | | | | | | | synapse/storage/_base.py:_simple_selectupdate_one was unused | Mark Haines | 2015-09-23 | 2 | -51/+0 |
| | * | | | | | | | synapse/state.py:_get_state_key_from_event was unused | Mark Haines | 2015-09-23 | 1 | -4/+0 |
| | * | | | | | | | synapse/handlers/room.py:_should_invite_join was unused | Mark Haines | 2015-09-23 | 1 | -26/+0 |
| | * | | | | | | | synapse/handlers/federation.py:_handle_auth_events was unused | Mark Haines | 2015-09-23 | 1 | -49/+0 |
| | * | | | | | | | Use argparse for definition finder | Mark Haines | 2015-09-23 | 1 | -26/+38 |
| | * | | | | | | | synapse/storage/event_federation.py:_get_auth_events is unused | Mark Haines | 2015-09-22 | 1 | -21/+0 |
| | * | | | | | | | synapse/storage/_base.py:_execute_and_decode was unused | Mark Haines | 2015-09-22 | 1 | -3/+0 |
| | * | | | | | | | Move NullSource out of synapse and into tests since it is only used by the tests | Mark Haines | 2015-09-22 | 2 | -17/+17 |
| | * | | | | | | | Note that GzipFile was removed in comment that referenced it | Mark Haines | 2015-09-22 | 1 | -0/+1 |
| | * | | | | | | | synapse/app/homeserver.py:GzipFile was unused | Mark Haines | 2015-09-22 | 1 | -6/+0 |
| | * | | | | | | | synapse/streams/events.py:StreamSource was unused | Mark Haines | 2015-09-22 | 1 | -12/+0 |
| | * | | | | | | | synapse/api/errors.py:RoomError was unused | Mark Haines | 2015-09-22 | 1 | -5/+0 |
| | * | | | | | | | synapse/util/__init__.py:unwrap_deferred was unused | Mark Haines | 2015-09-22 | 1 | -28/+0 |
| | * | | | | | | | synapse/storage/_base.py:Table was unused | Mark Haines | 2015-09-22 | 2 | -130/+2 |
| | * | | | | | | | Add dev script for finding where functions are called from, and finding funct... | Mark Haines | 2015-09-22 | 1 | -0/+130 |
| * | | | | | | | | Merge pull request #290 from matrix-org/daniel/synctl | Daniel Wagner-Hall | 2015-09-28 | 1 | -26/+28 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| | * | | | | | | | Fix restart | Daniel Wagner-Hall | 2015-09-24 | 1 | -2/+2 |
| | * | | | | | | | Allow config file path to be configurable in in synctl | Daniel Wagner-Hall | 2015-09-24 | 1 | -24/+26 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #289 from matrix-org/markjh/fix_sql | Erik Johnston | 2015-09-24 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| | * | | | | | | Fix order of ON constraints in _get_rooms_for_user_where_membership_is_txn | Mark Haines | 2015-09-24 | 1 | -6/+6 |
| | |/ / / / / | |||||
| * | | | | | | Fix demo/start.sh to work with --report-stats | Erik Johnston | 2015-09-23 | 1 | -0/+1 |
| * | | | | | | Merge pull request #282 from matrix-org/erikj/missing_keys | Erik Johnston | 2015-09-23 | 1 | -4/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix bug where we sometimes didn't fetch all the keys requested for a | Erik Johnston | 2015-09-17 | 1 | -4/+3 |
| | | |/ / / / | |/| | | | | |||||
| * | | | | | | Merge pull request #271 from matrix-org/erikj/default_history | Erik Johnston | 2015-09-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| | * | | | | | Change default history visibility for private rooms | Erik Johnston | 2015-09-09 | 1 | -1/+1 |
| * | | | | | | Merge pull request #286 from matrix-org/markjh/stream_config_repr | Mark Haines | 2015-09-22 | 1 | -3/+8 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Define __repr__ methods for StreamConfig and PaginationConfig | Mark Haines | 2015-09-22 | 1 | -3/+8 |
| * | | | | | | | Merge pull request #285 from matrix-org/daniel/metrics-2 | Daniel Wagner-Hall | 2015-09-22 | 24 | -78/+438 |
| |\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| | * | | | | | | Add some docstrings | Daniel Wagner-Hall | 2015-09-22 | 2 | -0/+4 |
| | * | | | | | | Catch stats-reporting errors | Daniel Wagner-Hall | 2015-09-22 | 1 | -4/+7 |
| | * | | | | | | Add docstring | Daniel Wagner-Hall | 2015-09-22 | 1 | -0/+6 |
| | * | | | | | | Front-load spaces | Daniel Wagner-Hall | 2015-09-22 | 1 | -7/+7 |
| | * | | | | | | Implement configurable stats reporting | Daniel Wagner-Hall | 2015-09-22 | 24 | -78/+425 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be... | Mark Haines | 2015-09-21 | 9 | -122/+267 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Clarify that room_initial_sync returns a python dict | Mark Haines | 2015-09-21 | 1 | -1/+1 |
| | * | | | | | | Fix doc string to point at the right class | Mark Haines | 2015-09-21 | 1 | -2/+3 |
| | * | | | | | | Add explicit "elif event.membership == Membership.LEAVE" for clarity | Mark Haines | 2015-09-21 | 1 | -1/+2 |
| | * | | | | | | Clamp the "to" token for /rooms/{roomId}/messages to when the user left | Mark Haines | 2015-09-21 | 1 | -0/+4 |
| | * | | | | | | Clarify which event is returned by check_user_was_in_room | Mark Haines | 2015-09-21 | 1 | -2/+3 |
| | * | | | | | | Allow users to GET individual state events for rooms that they have left | Mark Haines | 2015-09-10 | 2 | -12/+18 |
| | * | | | | | | Allow users that have left a room to get the messages that happend in the roo... | Mark Haines | 2015-09-09 | 2 | -5/+45 |
| | * | | | | | | Remove undocumented and unimplemented 'feedback' parameter from the Client-Se... | Mark Haines | 2015-09-09 | 6 | -42/+5 |
| | * | | | | | | Allow users that have left the room to view the member list from the point th... | Mark Haines | 2015-09-09 | 3 | -43/+15 |
| | * | | | | | | Allow rooms/{roomId}/state for a room that has been left | Mark Haines | 2015-09-09 | 2 | -6/+15 |
| | * | | | | | | Allow room initialSync for users that have left the room, returning a snapsho... | Mark Haines | 2015-09-09 | 3 | -9/+140 |
| | * | | | | | | Include rooms that a user has left in an initialSync. Include the state and m... | Mark Haines | 2015-09-08 | 1 | -6/+21 |
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |