Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Include room tags in v2 /sync | Mark Haines | 2015-11-02 | 1 | -11/+58 |
| | |||||
* | Store room tag content and return the content in the m.tag event | Mark Haines | 2015-11-02 | 1 | -4/+2 |
| | |||||
* | Merge branch 'develop' into markjh/room_tags | Mark Haines | 2015-11-02 | 4 | -23/+152 |
|\ | |||||
| * | Update the other place check_joined_room is called | Mark Haines | 2015-10-30 | 1 | -1/+1 |
| | | |||||
| * | Don't mark newly joined room timelines as limited in an incremental sync | Mark Haines | 2015-10-29 | 1 | -3/+5 |
| | | |||||
| * | Make search API honour limit set in filter | Erik Johnston | 2015-10-29 | 1 | -0/+3 |
| | | |||||
| * | Merge pull request #336 from matrix-org/erikj/search | Erik Johnston | 2015-10-28 | 1 | -1/+52 |
| |\ | | | | | | | Optionally return event contexts with search results | ||||
| | * | Optionally return event contexts with search results | Erik Johnston | 2015-10-28 | 1 | -1/+52 |
| | | | |||||
| * | | Merge pull request #334 from matrix-org/erikj/context_api | Erik Johnston | 2015-10-28 | 2 | -1/+57 |
| |\| | | | | | | | Add room context api | ||||
| | * | Docs | Erik Johnston | 2015-10-28 | 1 | -0/+13 |
| | | | |||||
| | * | Add room context api | Erik Johnston | 2015-10-28 | 2 | -1/+44 |
| | | | |||||
| * | | Implement full_state incremental sync | Richard van der Hoff | 2015-10-26 | 1 | -17/+34 |
| |/ | | | | | | | | | | | | | | | A hopefully-complete implementation of the full_state incremental sync, as specced at https://github.com/matrix-org/matrix-doc/pull/133. This actually turns out to be a relatively simple modification to the initial sync implementation. | ||||
* | | Include tags in v1 room initial sync | Mark Haines | 2015-10-30 | 1 | -0/+11 |
| | | |||||
* | | Include room tags v1 /initialSync | Mark Haines | 2015-10-30 | 1 | -0/+12 |
| | | |||||
* | | Inform the client of new room tags using v1 /events | Mark Haines | 2015-10-29 | 1 | -0/+46 |
|/ | |||||
* | Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-10-23 | 1 | -7/+1 |
|\ | |||||
| * | Fix receipts for room initial sync | Erik Johnston | 2015-10-22 | 1 | -7/+1 |
| | | |||||
* | | Rename | Erik Johnston | 2015-10-22 | 1 | -3/+3 |
| | | |||||
* | | Use namedtuple as return value | Erik Johnston | 2015-10-22 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-22 | 1 | -17/+168 |
|\ \ | |||||
| * \ | Merge branch 'develop' into markjh/v2_sync_typing | Mark Haines | 2015-10-21 | 5 | -85/+451 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/sync.py | ||||
| | * \ | Merge pull request #316 from matrix-org/markjh/v2_sync_archived | Mark Haines | 2015-10-21 | 1 | -3/+127 |
| | |\ \ | | | | | | | | | | | Add rooms that the user has left under archived in v2 sync. | ||||
| | | * | | Include banned rooms in the archived section of v2 sync | Mark Haines | 2015-10-21 | 1 | -6/+9 |
| | | | | | |||||
| | | * | | 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 | 1 | -3/+125 |
| | | | | | |||||
| * | | | | 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 |
| | |/ / | |/| | | |||||
* | | | | Filter room ids before hitting the database | Erik Johnston | 2015-10-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Filter search results | Erik Johnston | 2015-10-21 | 1 | -2/+7 |
| |/ / |/| | | |||||
* | | | Allow rejecting invites | Daniel Wagner-Hall | 2015-10-20 | 2 | -82/+229 |
| | | | | | | | | | | | | | | | This is done by using the same /leave flow as you would use if you had already accepted the invite and wanted to leave. | ||||
* | | | Merge pull request #307 from matrix-org/erikj/search | Erik Johnston | 2015-10-19 | 2 | -0/+95 |
|\ \ \ | |/ / |/| | | Add basic search API | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-16 | 3 | -5/+192 |
| |\ \ | |||||
| * | | | 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 |
| |\ \ \ | |||||
| * | | | | docstring | Erik Johnston | 2015-10-16 | 1 | -0/+10 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-10-15 | 1 | -92/+105 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Make 'keys' optional | Erik Johnston | 2015-10-14 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | More TODO markers | Erik Johnston | 2015-10-14 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Add TODO markers | Erik Johnston | 2015-10-14 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Remove constraints in preperation of using filters | Erik Johnston | 2015-10-13 | 1 | -51/+10 |
| | | | | | |||||
| * | | | | Search left rooms too | Erik Johnston | 2015-10-13 | 1 | -5/+2 |
| | | | | | |||||
| * | | | | Filter events to only thsoe that the user is allowed to see | Erik Johnston | 2015-10-12 | 1 | -6/+10 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/develop' into erikj/search | Erik Johnston | 2015-10-12 | 4 | -43/+100 |
| |\ \ \ \ | |||||
| * | | | | | Remove unused room_id parameter | Erik Johnston | 2015-10-12 | 4 | -8/+56 |
| | | | | | | |||||
| * | | | | | 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 | 1 | -9/+22 |
| | | | | | | |||||
| * | | | | | Add basic full text search impl. | Erik Johnston | 2015-10-09 | 2 | -0/+97 |
| | | | | | | |||||
* | | | | | | Merge pull request #310 from matrix-org/markjh/bcrypt_rounds | Mark Haines | 2015-10-16 | 1 | -1/+2 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Add config for how many bcrypt rounds to use for password hashes | ||||
| * | | | | | Add config for how many bcrypt rounds to use for password hashes | Mark Haines | 2015-10-16 | 1 | -1/+2 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | By default we leave it at the default value of 12. But now we can reduce it for preparing users for loadtests or running integration tests. | ||||
* | | | | | Merge pull request #302 from matrix-org/daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-16 | 3 | -5/+192 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Implement third party identifier invites | ||||
| * | | | | Verify third party ID server certificates | Daniel Wagner-Hall | 2015-10-16 | 1 | -2/+29 |
| | | | | | |||||
| * | | | | 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 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-15 | 3 | -99/+112 |
| |\| | | | |||||
| * | | | | Remove unnecessary class-wrapping | Daniel Wagner-Hall | 2015-10-13 | 2 | -9/+10 |
| | | | | | |||||
| * | | | | Move logic into handler | Daniel Wagner-Hall | 2015-10-13 | 1 | -0/+132 |
| | | | | | |||||
| * | | | | Re-add accidentally removed code | Daniel Wagner-Hall | 2015-10-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Move event contents into third_party_layout field | Daniel Wagner-Hall | 2015-10-13 | 3 | -7/+11 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-13 | 4 | -43/+100 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Remove merge thinko | Daniel Wagner-Hall | 2015-10-06 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Revert "Revert "Merge pull request #283 from ↵ | Daniel Wagner-Hall | 2015-10-06 | 1 | -76/+131 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | matrix-org/erikj/atomic_join_federation"" This reverts commit 34d26d36874ab0bc7fa4dab0db08bd37ba4936ae. | ||||
| * | | | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-06 | 1 | -1/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Revert "Merge pull request #283 from matrix-org/erikj/atomic_join_federation" | Daniel Wagner-Hall | 2015-10-05 | 1 | -131/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5879edbb097d19c2b5f5e064841909e67d6018fe, reversing changes made to b43930d4c9479973fb7225818e2e51bec022c4e6. | ||||
| * | | | | Merge branch 'develop' into daniel/3pidinvites | Daniel Wagner-Hall | 2015-10-05 | 4 | -78/+182 |
| |\ \ \ \ | |||||
| * | | | | | Implement third party identifier invites | Daniel Wagner-Hall | 2015-10-01 | 3 | -4/+27 |
| | | | | | | |||||
* | | | | | | Amalgamate _filter_events_for_client | Erik Johnston | 2015-10-16 | 3 | -97/+51 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #305 from matrix-org/markjh/v2_sync_api | Mark Haines | 2015-10-14 | 1 | -92/+105 |
|\ \ \ \ \ | | | | | | | | | | | | | Update the v2 sync API to work as specified in the current spec. | ||||
| * | | | | | Fix v2 sync polling | Mark Haines | 2015-10-14 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | Add a get_invites_for_user method to the storage to find out the rooms a ↵ | Mark Haines | 2015-10-13 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | user is invited to | ||||
| * | | | | | Include invites in incremental sync | Mark Haines | 2015-10-13 | 1 | -6/+25 |
| | | | | | | |||||
| * | | | | | Include invited rooms in the initial sync | Mark Haines | 2015-10-13 | 1 | -10/+6 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop' into markjh/v2_sync_api | Mark Haines | 2015-10-13 | 2 | -5/+40 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Start spliting out the rooms into joined and invited in v2 sync | Mark Haines | 2015-10-13 | 1 | -18/+40 |
| | | | | | | |||||
| * | | | | | Update the filters to match the latest spec. | Mark Haines | 2015-10-12 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the filter the 'timeline' and 'ephemeral' keys of rooms. Apply the filter to the 'presence' key of a sync response. | ||||
| * | | | | | Merge branch 'markjh/presence_races' into markjh/v2_sync_api | Mark Haines | 2015-10-09 | 1 | -3/+8 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'markjh/eventstream_presence' into markjh/v2_sync_api | Mark Haines | 2015-10-09 | 5 | -118/+236 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Update the v2 room sync format to match the current v2 spec | Mark Haines | 2015-10-08 | 1 | -14/+11 |
| | | | | | | | | |||||
| * | | | | | | | Move the rooms out into a room_map mapping from room_id to room. | Mark Haines | 2015-10-05 | 1 | -18/+9 |
| | | | | | | | | |||||
| * | | | | | | | Start updating the sync API to match the specification | Mark Haines | 2015-10-01 | 1 | -36/+28 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Remove unused room_id arg | Erik Johnston | 2015-10-14 | 3 | -7/+7 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | 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 | ||||
| * | | | | | Split the sections of EventStreamHandler.get_stream that handle presence | Mark Haines | 2015-10-09 | 1 | -35/+52 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into separate functions. This makes the code a bit easier to read, and means that we can reuse the logic when implementing the v2 sync API. | ||||
* | | | | | 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… | ||||
| * | | | | Fix some races in the synapse presence handler caused by not yielding on ↵ | Mark Haines | 2015-10-09 | 1 | -3/+8 |
| |/ / / | | | | | | | | | | | | | deferreds | ||||
* | | | | Formatting changes | Steven Hammerton | 2015-10-10 | 1 | -1/+2 |
| | | | | |||||
* | | | | Provide ability to login using CAS | Steven Hammerton | 2015-10-10 | 1 | -0/+31 |
| | | | | |||||
* | | | | Add a flag to initial sync to indicate we want rooms that the user has left | Mark Haines | 2015-10-08 | 1 | -5/+8 |
|/ / / | |||||
* | / | 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 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #275 from matrix-org/erikj/invite_state | Erik Johnston | 2015-10-02 | 2 | -4/+30 |
|\ \ | | | | | | | Bundle in some room state in invites. | ||||
| * | | 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 | 3 | -88/+160 |
| |\ \ | |||||
| * | | | Bundle in some room state in the unsigned bit of the invite when sending to ↵ | Erik Johnston | 2015-09-10 | 2 | -4/+29 |
| | | | | | | | | | | | | | | | | invited servers | ||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable | Erik Johnston | 2015-10-02 | 4 | -240/+302 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #283 from matrix-org/erikj/atomic_join_federation | Erik Johnston | 2015-10-02 | 1 | -76/+131 |
| |\ \ \ \ | | | | | | | | | | | | | Atomically persist events when joining a room over federation/ | ||||
| | * | | | | Comment | Erik Johnston | 2015-09-30 | 1 | -0/+8 |
| | | | | | | |||||
| | * | | | | Rename var | Erik Johnston | 2015-09-30 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | 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 | 1 | -13/+20 |
| | | | | | | |||||
| | * | | | | Refactor do_invite_join | Erik Johnston | 2015-09-17 | 1 | -28/+56 |
| | | | | | | |||||
| * | | | | | Merge pull request #287 from matrix-org/erikj/canonical_alias | Erik Johnston | 2015-09-30 | 1 | -1/+10 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Set m.room.canonical_alias on room creation. | ||||
| | * | | | | 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 | 2 | -75/+0 |
| |\ \ \ \ | | |/ / / | |/| | | | Remove some of the unused definitions from synapse | ||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | 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 | ||||
| | * | | | Change default history visibility for private rooms | Erik Johnston | 2015-09-09 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #276 from ↵ | Mark Haines | 2015-09-21 | 2 | -85/+158 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | matrix-org/markjh/history_for_rooms_that_have_been_left SPEC-216: Allow users to view the history of rooms that they have left. | ||||
| | * | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the room. There isn't a way for the client to learn a valid "to" token for a room that they have left in the C-S API but that doesn't stop a client making one up. | ||||
| | * | | Allow users to GET individual state events for rooms that they have left | Mark Haines | 2015-09-10 | 1 | -7/+13 |
| | | | | |||||
| | * | | Allow users that have left a room to get the messages that happend in the ↵ | Mark Haines | 2015-09-09 | 1 | -4/+27 |
| | | | | | | | | | | | | | | | | room before they left | ||||
| | * | | Remove undocumented and unimplemented 'feedback' parameter from the ↵ | Mark Haines | 2015-09-09 | 2 | -19/+3 |
| | | | | | | | | | | | | | | | | Client-Server API | ||||
| | * | | Allow users that have left the room to view the member list from the point ↵ | Mark Haines | 2015-09-09 | 1 | -36/+0 |
| | | | | | | | | | | | | | | | | they left | ||||
| | * | | Allow rooms/{roomId}/state for a room that has been left | Mark Haines | 2015-09-09 | 1 | -5/+13 |
| | | | | |||||
| | * | | Allow room initialSync for users that have left the room, returning a ↵ | Mark Haines | 2015-09-09 | 1 | -9/+76 |
| | | | | | | | | | | | | | | | | snapshot of how the room was when they left it | ||||
| | * | | Include rooms that a user has left in an initialSync. Include the state and ↵ | Mark Haines | 2015-09-08 | 1 | -6/+21 |
| | |/ | | | | | | | | | | messages at the point they left the room | ||||
| * / | Allow configuration to ignore invalid SSL certs | Daniel Wagner-Hall | 2015-09-09 | 1 | -2/+1 |
| |/ | | | | | | | | | This will be useful for sytest, and sytest only, hence the aggressive config key name. | ||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatable | Erik Johnston | 2015-09-14 | 1 | -1/+16 |
|\| | |||||
| * | Merge pull request #262 from matrix-org/redactyoself | Daniel Wagner-Hall | 2015-09-02 | 1 | -1/+16 |
| |\ | | | | | | | Allow users to redact their own events | ||||
| | * | Merge branch 'develop' into redactyoself | Daniel Wagner-Hall | 2015-08-28 | 3 | -27/+29 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/_base.py | ||||
| | * | | Allow users to redact their own events | Daniel Wagner-Hall | 2015-08-28 | 1 | -2/+17 |
| | | | | |||||
* | | | | Add flag which disables federation of the room | Erik Johnston | 2015-09-01 | 1 | -2/+6 |
|/ / / | |||||
* | | | Merge pull request #258 from matrix-org/slowtestsmakemesad | Daniel Wagner-Hall | 2015-08-28 | 2 | -4/+26 |
|\ \ \ | |_|/ |/| | | Swap out bcrypt for md5 in tests | ||||
| * | | Remove unused import | Daniel Wagner-Hall | 2015-08-26 | 1 | -1/+0 |
| | | | |||||
| * | | Swap out bcrypt for md5 in tests | Daniel Wagner-Hall | 2015-08-26 | 2 | -3/+26 |
| |/ | | | | | | | This reduces our ~8 second sequential test time down to ~7 seconds | ||||
* | | Merge branch 'release-v0.10.0' into develop | Mark Haines | 2015-08-28 | 3 | -27/+29 |
|\ \ | |/ |/| | | | | | | | | | Conflicts: synapse/handlers/auth.py synapse/python_dependencies.py synapse/rest/client/v1/login.py | ||||
| * | Remove needless existence checks | Erik Johnston | 2015-08-26 | 1 | -7/+3 |
| | | |||||
| * | Don't loop over all rooms ever in typing.get_new_events_for_user | Erik Johnston | 2015-08-26 | 1 | -2/+2 |
| | | |||||
| * | Do auth checks *before* persisting the event | Erik Johnston | 2015-08-24 | 1 | -16/+16 |
| | | |||||
| * | Don't make pushers handle presence/typing events | Erik Johnston | 2015-08-24 | 1 | -2/+8 |
| | | |||||
| * | Doc string | Erik Johnston | 2015-08-21 | 1 | -0/+6 |
| | | |||||
| * | When logging in fetch user by user_id case insensitively, *unless* there are ↵ | Erik Johnston | 2015-08-21 | 1 | -8/+23 |
| | | | | | | | | multiple case insensitive matches, in which case require the exact user_id | ||||
| * | Don't allow people to register user ids which only differ by case to an ↵ | Erik Johnston | 2015-08-21 | 1 | -2/+2 |
| | | | | | | | | existing one | ||||
* | | Merge erikj/user_dedup to develop | Daniel Wagner-Hall | 2015-08-26 | 2 | -10/+33 |
| | | |||||
* | | Fix up one more reference | Daniel Wagner-Hall | 2015-08-25 | 1 | -1/+0 |
| | | |||||
* | | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 2 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly. | ||||
* | | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop | Erik Johnston | 2015-08-21 | 1 | -1/+1 |
|\| | |||||
| * | Add missing param in store.get_state_groups invocation | Erik Johnston | 2015-08-21 | 1 | -1/+1 |
| | | |||||
* | | Fix bad merge | Daniel Wagner-Hall | 2015-08-20 | 1 | -8/+1 |
| | | |||||
* | | Fix indentation | Daniel Wagner-Hall | 2015-08-20 | 1 | -1/+2 |
| | | |||||
* | | Fix flake8 warnings | Daniel Wagner-Hall | 2015-08-20 | 1 | -4/+6 |
| | | |||||
* | | Merge branch 'auth' into refresh | Daniel Wagner-Hall | 2015-08-20 | 1 | -3/+3 |
|\ \ | | | | | | | | | | | | | Conflicts: synapse/handlers/register.py | ||||
| * | | Remove incorrect whitespace | Daniel Wagner-Hall | 2015-08-20 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-20 | 6 | -15/+78 |
| |\| | |||||
* | | | Merge branch 'develop' into refresh | Daniel Wagner-Hall | 2015-08-20 | 4 | -3/+46 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: synapse/rest/client/v1/login.py | ||||
| * | | Merge pull request #235 from matrix-org/erikj/room_avatars | Erik Johnston | 2015-08-20 | 1 | -2/+3 |
| |\ \ | | | | | | | | | Add m.room.avatar to default power levels. | ||||
| | * | | Add m.room.avatar to default power levels. Change default required power ↵ | Erik Johnston | 2015-08-20 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | levels of such events to 50 | ||||
| * | | | Another use of check_password that got missed in the yield fix | David Baker | 2015-08-20 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #233 from matrix-org/erikj/canonical_alias | Erik Johnston | 2015-08-20 | 2 | -1/+18 |
| |\ \ | | | | | | | | | Add server side support for canonical aliases | ||||
| | * | | Check that the canonical room alias actually points to the room | Erik Johnston | 2015-08-20 | 1 | -1/+17 |
| | | | | |||||
| | * | | Add canonical alias to the default power levels | Erik Johnston | 2015-08-19 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #211 from matrix-org/email_in_use | Mark Haines | 2015-08-20 | 1 | -0/+25 |
| |\ \ \ | | | | | | | | | | | Changes for unique emails | ||||
| | * | | | Add endpoint that proxies ID server request token and errors if the given ↵ | David Baker | 2015-08-04 | 1 | -0/+25 |
| | | | | | | | | | | | | | | | | | | | | email is in use on this Home Server. | ||||
* | | | | | /tokenrefresh POST endpoint | Daniel Wagner-Hall | 2015-08-20 | 1 | -5/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows refresh tokens to be exchanged for (access_token, refresh_token). It also starts issuing them on login, though no clients currently interpret them. | ||||
* | | | | | Move token generation to auth handler | Daniel Wagner-Hall | 2015-08-20 | 2 | -24/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | I prefer the auth handler to worry about all auth, and register to call into it as needed, than to smatter auth logic between the two. | ||||
* | | | | | Merge branch 'auth' into refresh | Daniel Wagner-Hall | 2015-08-20 | 1 | -6/+13 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-19 | 2 | -4/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Re-add whitespace around caveat operators | Daniel Wagner-Hall | 2015-08-19 | 1 | -4/+4 |
| | | | | |||||
| * | | | Remove padding space around caveat operators | Daniel Wagner-Hall | 2015-08-18 | 1 | -4/+4 |
| | | | | |||||
| * | | | Fix some formatting to use tuples | Daniel Wagner-Hall | 2015-08-18 | 1 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'develop' into auth | Daniel Wagner-Hall | 2015-08-18 | 4 | -49/+136 |
| |\ \ \ | |||||
| * | | | | Issue macaroons as opaque auth tokens | Daniel Wagner-Hall | 2015-08-18 | 1 | -6/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just replaces random bytes with macaroons. The macaroons are not inspected by the client or server. In particular, they claim to have an expiry time, but nothing verifies that they have not expired. Follow-up commits will actually enforce the expiration, and allow for token refresh. See https://bit.ly/matrix-auth for more information | ||||
* | | | | | Don't get apservice interested rooms in RoomHandler.get_joined_rooms_for_users | Erik Johnston | 2015-08-19 | 3 | -12/+32 |
| |_|/ / |/| | | | |||||
* | | | | Remove an access token log line | Erik Johnston | 2015-08-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix regression where we incorrectly responded with a 200 to /login | Erik Johnston | 2015-08-19 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge pull request #227 from matrix-org/erikj/receipts_take2 | Erik Johnston | 2015-08-18 | 1 | -2/+0 |
|\ \ \ \ | |_|/ / |/| | | | Re-enable receipts API. | ||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-17 | 4 | -122/+86 |
| |\ \ \ | | | | | | | | | | | | | | | | erikj/receipts_take2 | ||||
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-08-13 | 1 | -7/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | erikj/receipts_take2 | ||||
| * | | | | | Re-enable receipts | Erik Johnston | 2015-08-13 | 1 | -2/+0 |
| | | | | | | |||||
* | | | | | | Typo | Erik Johnston | 2015-08-18 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | None check | Erik Johnston | 2015-08-18 | 1 | -0/+2 |
| | | | | | | |||||
* | | | | | | More helpful variable names | Erik Johnston | 2015-08-18 | 1 | -7/+7 |
| | | | | | | |||||
* | | | | | | Doc strings | Erik Johnston | 2015-08-18 | 1 | -0/+28 |
| | | | | | | |||||
* | | | | | | Remove debug try/catch | Erik Johnston | 2015-08-18 | 1 | -47/+43 |
| | | | | | | |||||
* | | | | | | Implement a batched presence_handler.get_state and use it | Erik Johnston | 2015-08-17 | 2 | -12/+69 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #221 from matrix-org/auth | Daniel Wagner-Hall | 2015-08-14 | 4 | -122/+86 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | Simplify LoginHander and AuthHandler | ||||
| * | | | Merge password checking implementations | Daniel Wagner-Hall | 2015-08-12 | 1 | -20/+15 |
| | | | | |||||
| * | | | Simplify LoginHander and AuthHandler | Daniel Wagner-Hall | 2015-08-12 | 4 | -108/+77 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | * Merge LoginHandler -> AuthHandler * Add a bunch of documentation * Improve some naming * Remove unused branches I will start merging the actual logic of the two handlers shortly | ||||
* | | | Remove pointless map | Erik Johnston | 2015-08-13 | 1 | -7/+3 |
| |/ |/| | |||||
* | | Fix _filter_events_for_client | Erik Johnston | 2015-08-12 | 2 | -6/+2 |
| | | |||||
* | | Simplify staggered deferred lists | Erik Johnston | 2015-08-12 | 1 | -2/+2 |
| | | |||||
* | | Use list comprehension instead of filter | Erik Johnston | 2015-08-12 | 2 | -20/+6 |
| | | |||||
* | | Remove debug loggers | Erik Johnston | 2015-08-11 | 2 | -6/+0 |
| | | |||||
* | | Fix application of ACLs | Erik Johnston | 2015-08-11 | 3 | -14/+30 |
| | | |||||
* | | Don't be too enthusiatic with defer.gatherResults | Erik Johnston | 2015-08-07 | 1 | -4/+8 |
| | | |||||
* | | Use dictionary cache to do group -> state fetching | Erik Johnston | 2015-08-05 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perf | Erik Johnston | 2015-08-04 | 1 | -1/+1 |
|\| | |||||
| * | Add vector.im as trusted ID server | David Baker | 2015-08-03 | 1 | -1/+1 |
| | | |||||
* | | Speed up event filtering (for ACL) logic | Erik Johnston | 2015-08-04 | 3 | -3/+15 |
|/ | |||||
* | Fix v2_alpha registration. Add unit tests. | Kegan Dougal | 2015-07-28 | 1 | -1/+2 |
| | | | | | | | | V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag. | ||||
* | Disable receipts for now | Matrix | 2015-07-22 | 1 | -0/+2 |
| | |||||
* | Don't do any database hits in receipt handling if from_key == to_key | Matrix | 2015-07-18 | 1 | -0/+3 |
| | |||||
* | Merge pull request #199 from matrix-org/erikj/receipts | Erik Johnston | 2015-07-16 | 5 | -5/+224 |
|\ | | | | | Implement read receipts. | ||||
| * | Docs | Erik Johnston | 2015-07-14 | 1 | -3/+8 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts | Erik Johnston | 2015-07-13 | 5 | -1/+197 |
| |\ | |||||
| * | | Comments | Erik Johnston | 2015-07-13 | 1 | -4/+12 |
| | | | |||||
| * | | Remove spurious comment | Erik Johnston | 2015-07-09 | 1 | -2/+0 |
| | | | |||||
| * | | Integer timestamps | Erik Johnston | 2015-07-09 | 1 | -1/+1 |
| | | | |||||
| * | | Change format of receipts to allow inclusion of data | Erik Johnston | 2015-07-09 | 1 | -8/+16 |
| | | | |||||
| * | | Add a cache to fetching of receipt streams | Erik Johnston | 2015-07-08 | 1 | -24/+7 |
| | | | |||||
| * | | Split receipt events up into one per room | Erik Johnston | 2015-07-08 | 1 | -30/+21 |
| | | | |||||
| * | | Hook up receipts to v1 initialSync | Erik Johnston | 2015-07-08 | 2 | -4/+57 |
| | | | |||||
| * | | Wire together receipts and the notifer/federation | Erik Johnston | 2015-07-07 | 1 | -21/+60 |
| | | | |||||
| * | | Fix various typos | Erik Johnston | 2015-07-07 | 2 | -2/+6 |
| | | | |||||
| * | | Consolidate duplicate code in notifier | Erik Johnston | 2015-07-02 | 3 | -4/+4 |
| | | | |||||
| * | | Add basic ReceiptHandler | Erik Johnston | 2015-07-01 | 1 | -0/+130 |
| | | | |||||
* | | | Merge pull request #203 from matrix-org/erikj/room_creation_presets | Erik Johnston | 2015-07-16 | 1 | -19/+77 |
|\ \ \ | | | | | | | | | Implement presets at room creation | ||||
| * | | | Implement specifying custom initial state for /createRoom | Erik Johnston | 2015-07-16 | 1 | -40/+60 |
| | | | | |||||
| * | | | s/everyone_ops/original_invitees_have_ops/ | Erik Johnston | 2015-07-14 | 1 | -3/+3 |
| | | | | |||||
| * | | | Capitalize contants | Erik Johnston | 2015-07-14 | 1 | -4/+4 |
| | | | | |||||
| * | | | Implement presets at room creation | Erik Johnston | 2015-07-13 | 1 | -22/+60 |
| | |/ | |/| | |||||
* | | | Add back in support for remembering parameters submitted to a ↵ | David Baker | 2015-07-15 | 1 | -2/+4 |
| | | | | | | | | | | | | user-interactive auth call. | ||||
* | | | Merge pull request #193 from matrix-org/erikj/bulk_persist_event | Erik Johnston | 2015-07-14 | 1 | -106/+121 |
|\ \ \ | |/ / |/| | | Add bulk insert events API | ||||
| * | | Add bulk insert events API | Erik Johnston | 2015-06-25 | 1 | -106/+121 |
| |/ | |||||
* | | Merge pull request #196 from matrix-org/erikj/room_history | Erik Johnston | 2015-07-10 | 4 | -1/+168 |
|\ \ | | | | | | | Add ability to restrict room history. | ||||
| * | | Add comment | Erik Johnston | 2015-07-09 | 1 | -0/+4 |
| | | | |||||
| * | | Add m.room.history_visibility to newly created rooms' m.room.power_levels | Erik Johnston | 2015-07-06 | 1 | -0/+1 |
| | | | |||||
| * | | Rename key and values for m.room.history_visibility. Support 'invited' value | Erik Johnston | 2015-07-06 | 3 | -23/+60 |
| | | | |||||
| * | | Filter and redact events that the other server doesn't have permission to ↵ | Erik Johnston | 2015-07-03 | 1 | -0/+44 |
| | | | | | | | | | | | | see during backfill | ||||
| * | | Respect m.room.history_visibility in v2_alpha sync API | Erik Johnston | 2015-07-03 | 1 | -0/+33 |
| | | | |||||
| * | | Make v1 initial syncs respect room history ACL | Erik Johnston | 2015-07-02 | 1 | -17/+34 |
| | | | |||||
| * | | Add basic impl for room history ACL on GET /messages client API | Erik Johnston | 2015-07-02 | 1 | -1/+32 |
| |/ | |||||
* | | code beautify | Muthu Subramanian | 2015-07-08 | 1 | -1/+0 |
| | | |||||
* | | Integrate SAML2 basic authentication - uses pysaml2 | Muthu Subramanian | 2015-07-08 | 1 | -0/+30 |
|/ | |||||
* | Merge pull request #189 from matrix-org/erikj/room_init_sync | Erik Johnston | 2015-06-19 | 2 | -35/+45 |
|\ | | | | | Improve room init sync speed. | ||||
| * | Use another deferred list | Erik Johnston | 2015-06-16 | 1 | -18/+27 |
| | | |||||
| * | Use DeferredList | Erik Johnston | 2015-06-16 | 1 | -9/+9 |
| | | |||||
| * | Don't do unecessary db ops in presence.get_state | Erik Johnston | 2015-06-16 | 2 | -14/+15 |
| | | |||||
* | | Fix bug where synapse was sending AS user queries incorrectly. | Kegan Dougal | 2015-06-17 | 1 | -1/+1 |
|/ | | | | | | Bug introduced in 92b20713d7c6346aeb20dc09963081e472752bb5 which reversed the comparison when checking if a user existed in the users table. Added UTs to prevent this happening again. | ||||
* | Merge pull request #176 from matrix-org/erikj/backfill_auth | Erik Johnston | 2015-06-03 | 1 | -1/+46 |
|\ | | | | | Improve backfill. | ||||
| * | Add a timeout | Erik Johnston | 2015-06-02 | 1 | -0/+1 |
| | | |||||
| * | Handle the fact we might be missing auth events | Erik Johnston | 2015-06-02 | 1 | -15/+19 |
| | | |||||
| * | Add some logging | Erik Johnston | 2015-06-02 | 1 | -0/+5 |
| | | |||||
| * | Correctly look up auth_events | Erik Johnston | 2015-06-02 | 1 | -9/+12 |
| | | |||||
| * | Don't process events we've already processed. Remember to process state events | Erik Johnston | 2015-06-02 | 1 | -0/+22 |
| | | |||||
| * | Correctly pass in auth_events | Erik Johnston | 2015-06-01 | 1 | -1/+11 |
| | | |||||
* | | Merge pull request #180 from matrix-org/erikj/prev_state_context | Erik Johnston | 2015-06-03 | 1 | -1/+3 |
|\ \ | | | | | | | Don't needlessly compute prev_state | ||||
| * | | Don't needlessly compute prev_state | Erik Johnston | 2015-06-03 | 1 | -1/+3 |
| |/ | |||||
* / | Don't needlessly compute context | Erik Johnston | 2015-06-03 | 1 | -2/+4 |
|/ | |||||
* | Merge branch 'develop' into markjh/SYT-8-recaptcha | Mark Haines | 2015-05-29 | 1 | -0/+1 |
|\ | | | | | | | | | Conflicts: synapse/handlers/auth.py | ||||
| * | SYN-395: Fix CAPTCHA, don't double decode json | Erik Johnston | 2015-05-28 | 1 | -2/+3 |
| | | |||||
* | | Add config for setting the recaptcha verify api endpoint, so we can test it ↵ | Mark Haines | 2015-05-29 | 1 | -3/+3 |
|/ | | | | in sytest |