| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | stop generating default identicons. reverts most of ↵ | Matthew Hodgson | 2015-12-17 | 1 | -19/+3 |
| | | | | | 582019f870adbc4a8a8a9ef97b527e0fead77761 and solves vector-web/vector-im#346 | ||||
| * | Strip address and such out of 3pid invites | Daniel Wagner-Hall | 2015-12-17 | 1 | -1/+12 |
| | | | | | We're not meant to leak that into the graph | ||||
| * | Give the IS a bunch more 3pid invite context | Daniel Wagner-Hall | 2015-12-16 | 1 | -7/+60 |
| | | | | | This allows it to form richer emails | ||||
| * | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-16 | 1 | -3/+8 |
| |\ | |||||
| | * | Fix a race between started/stopped stream | Mark Haines | 2015-12-14 | 1 | -3/+8 |
| | | | |||||
| * | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-14 | 1 | -4/+12 |
| |\| | |||||
| | * | Do the /sync in parallel accross the rooms like /initialSync does | Mark Haines | 2015-12-11 | 1 | -4/+12 |
| | | | |||||
| * | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-12 | 1 | -1/+1 |
| |\| | |||||
| | * | Add caches for whether a room has been forgotten by a user | Mark Haines | 2015-12-10 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #435 from matrix-org/erikj/search | Erik Johnston | 2015-12-11 | 1 | -1/+7 |
| |\ \ | | | | | | | Include approximate count of search results | ||||
| | * | | Include approximate count of search results | Erik Johnston | 2015-12-11 | 1 | -1/+7 |
| | |/ | |||||
| * / | Ensure that the event that gets persisted is the one that was signed | Paul "LeoNerd" Evans | 2015-12-10 | 1 | -6/+6 |
| |/ | |||||
| * | Merge pull request #405 from matrix-org/erikj/search-ts | Erik Johnston | 2015-12-08 | 1 | -6/+4 |
| |\ | | | | | Change the result dict to be a list in /search response | ||||
| | * | Change the result tict to be a list | Erik Johnston | 2015-12-01 | 1 | -6/+4 |
| | | | |||||
| * | | Only include the archived rooms if a include_leave flag in set in the filter | Mark Haines | 2015-12-04 | 1 | -6/+6 |
| | | | |||||
| * | | Merge pull request #419 from matrix-org/markjh/reuse_captcha_client | Mark Haines | 2015-12-03 | 1 | -4/+2 |
| |\ \ | | | | | | | Reuse the captcha client rather than creating a new one for each request | ||||
| | * | | Reuse the captcha client rather than creating a new one for each request | Mark Haines | 2015-12-03 | 1 | -4/+2 |
| | | | | |||||
| * | | | Flatten devices into a dict, not a list | Daniel Wagner-Hall | 2015-12-03 | 1 | -4/+3 |
| |/ / | |||||
| * | | Merge pull request #418 from matrix-org/daniel/whois | Daniel Wagner-Hall | 2015-12-03 | 1 | -17/+11 |
| |\ \ | | | | | | | Merge pull request #418 from matrix-org/daniel/whois | ||||
| | * | | Fix implementation of /admin/whois | Daniel Wagner-Hall | 2015-12-02 | 1 | -17/+11 |
| | | | | |||||
| * | | | Make state updates in the C+S API idempotent | Mark Haines | 2015-12-02 | 1 | -0/+12 |
| |/ / | |||||
| * | | Merge pull request #410 from matrix-org/markjh/edu_frequency | Mark Haines | 2015-12-02 | 2 | -5/+15 |
| |\ \ | | | | | | | Only fire user_joined_room if the user has actually joined. | ||||
| | * | | Use the context returned by _handle_new_event | Mark Haines | 2015-12-02 | 1 | -4/+1 |
| | | | | |||||
| | * | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-02 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | Add comments | Mark Haines | 2015-12-02 | 2 | -0/+6 |
| | | | | | |||||
| | * | | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-02 | 8 | -56/+90 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/federation.py synapse/handlers/room.py | ||||
| | * | | | | Only fire user_joined_room if the membership has changed | Mark Haines | 2015-12-01 | 1 | -3/+8 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' into markjh/edu_frequency | Mark Haines | 2015-12-01 | 5 | -91/+173 |
| | |\ \ \ \ | |||||
| | * | | | | | Only fire user_joined_room on the distributor if the user has actually ↵ | Mark Haines | 2015-12-01 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | joined the room | ||||
| * | | | | | | Reuse a single http client, rather than creating new ones | Mark Haines | 2015-12-02 | 1 | -9/+5 |
| | |_|_|/ / |/| | | | | |||||
| * | | | | | Fix typo in collect_presencelike_data | Mark Haines | 2015-12-02 | 1 | -1/+1 |
| | |_|/ / |/| | | | |||||
| * | | | | Merge pull request #408 from matrix-org/markjh/distributor_facade | Mark Haines | 2015-12-02 | 7 | -53/+78 |
| |\ \ \ \ | | | | | | | | | | | Wrap calls to distributor.fire in appropriately named functions | ||||
| | * | | | | Wrap calls to distributor.fire in appropriately named functions so that ↵ | Mark Haines | 2015-12-01 | 7 | -53/+78 |
| | | |/ / | |/| | | | | | | | | | | static analysis can work out want is calling what | ||||
| * | | | | Merge pull request #406 from matrix-org/erikj/search | Erik Johnston | 2015-12-02 | 1 | -3/+12 |
| |\ \ \ \ | |/ / / |/| | | | Search: Don't disregard grouping info in pagination tokens | ||||
| | * | | | Search: Don't disregard grouping info in pagination tokens | Erik Johnston | 2015-12-01 | 1 | -3/+12 |
| | | | | | |||||
| * | | | | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 3 | -22/+111 |
| |/ / / | |||||
| * | | | Merge pull request #404 from matrix-org/markjh/trivial_rename | Mark Haines | 2015-12-01 | 1 | -1/+1 |
| |\ \ \ | |_|/ |/| | | Rename presence_handler.send_invite | ||||
| | * | | Rename presence_handler.send_invite to presence_handler.send_presence_invite ↵ | Mark Haines | 2015-12-01 | 1 | -1/+1 |
| | |/ | | | | | | | to distinguish it from normal invites | ||||
| * | | Tidy up a bit | Erik Johnston | 2015-12-01 | 1 | -8/+9 |
| | | | |||||
| * | | Allow paginating search ordered by recents | Erik Johnston | 2015-11-30 | 1 | -68/+60 |
| |/ | |||||
| * | Return words to highlight in search results | Erik Johnston | 2015-11-27 | 1 | -3/+16 |
| | | |||||
| * | Merge pull request #375 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-23 | 1 | -10/+15 |
| |\ | | | | | Clean up room initialSync for guest users | ||||
| | * | Clean up room initialSync for guest users | Daniel Wagner-Hall | 2015-11-13 | 1 | -10/+15 |
| | | | |||||
| * | | Merge pull request #385 from matrix-org/daniel/forgetrooms | Mark Haines | 2015-11-20 | 2 | -1/+12 |
| |\ \ | | | | | | | Allow users to forget rooms | ||||
| | * \ | Merge branch 'develop' into daniel/forgetrooms | Paul "LeoNerd" Evans | 2015-11-19 | 4 | -24/+24 |
| | |\ \ | |||||
| | * | | | Simplify code | Daniel Wagner-Hall | 2015-11-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Apply forgetting properly to historical events | Daniel Wagner-Hall | 2015-11-18 | 1 | -1/+9 |
| | | | | | |||||
| | * | | | Allow users to forget rooms | Daniel Wagner-Hall | 2015-11-17 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Add option to include the current room state | Erik Johnston | 2015-11-20 | 1 | -0/+24 |
| | | | | | |||||
| * | | | | Optionally include historic profile info | Erik Johnston | 2015-11-20 | 1 | -1/+30 |
| | |/ / |/| | | |||||
| * | | | Merge pull request #386 from matrix-org/markjh/rename_pud_to_account_data | Mark Haines | 2015-11-19 | 3 | -23/+23 |
| |\ \ \ | | | | | | | | | s/private_user_data/account_data/ | ||||
| | * | | | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 3 | -23/+23 |
| | |/ / | |||||
| * / / | Take a boolean not a list of lambdas | Daniel Wagner-Hall | 2015-11-19 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-17 | 6 | -140/+278 |
| |\| | |||||
| | * | Fix a few race conditions in the state calculation | Richard van der Hoff | 2015-11-13 | 1 | -60/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be a bit more careful about how we calculate the state to be returned by /sync. In a few places, it was possible for /sync to return slightly later state than that represented by the next_batch token and the timeline. In particular, the following cases were susceptible: * On a full state sync, for an active room * During a per-room incremental sync with a timeline gap * When the user has just joined a room. (Refactor check_joined_room to make it less magical) Also, use store.get_state_for_events() (and thus the existing stategroups) to calculate the state corresponding to a particular sync position, rather than state_handler.compute_event_context(), which recalculates from first principles (and tends to miss some state). Merged from PR https://github.com/matrix-org/synapse/pull/372 | ||||
| | * | Make handlers.sync return a state dictionary, instead of an event list. | Richard van der Hoff | 2015-11-13 | 1 | -31/+39 |
| | | | | | | | | | | | | | | | | | | | Basically this moves the process of flattening the existing dictionary into a list up to rest.client.*, instead of doing it in handlers.sync. This simplifies a bit of the code in handlers.sync, but it is also going to be somewhat beneficial in the next stage of my hacking on SPEC-254. Merged from PR #371 | ||||
| | * | Update some comments | Richard van der Hoff | 2015-11-13 | 2 | -10/+30 |
| | | | | | | | | | | | | | | | Add a couple of type annotations, docstrings, and other comments, in the interest of keeping track of what types I have. Merged from pull request #370. | ||||
| | * | Fix missing profile data in federation joins | Erik Johnston | 2015-11-12 | 2 | -5/+9 |
| | | | | | | | | | | | There was a regression where we stopped including profile data in initial joins for rooms joined over federation. | ||||
| | * | Merge pull request #367 from matrix-org/daniel/readafterleave | Daniel Wagner-Hall | 2015-11-12 | 1 | -10/+11 |
| | |\ | | | | | | | | | | | | | Merge pull request #367 from matrix-org/daniel/readafterleave Tweak guest access permissions | ||||
| | | * | Tweak guest access permissions | Daniel Wagner-Hall | 2015-11-12 | 1 | -10/+11 |
| | | | | | | | | | | | | | | | | | | | * Allow world_readable rooms to be read by guests who have joined and left * Allow regular users to access world_readable rooms | ||||
| | * | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync | Daniel Wagner-Hall | 2015-11-12 | 1 | -23/+32 |
| | |\ \ | | |/ | |/| | | | | | | | Merge pull request #360 from matrix-org/daniel/guestroominitialsync Allow guest access to room initialSync | ||||
| | | * | Allow guest access to room initialSync | Daniel Wagner-Hall | 2015-11-11 | 1 | -23/+32 |
| | | | | |||||
| | * | | Consider joined guest users as joined users | Daniel Wagner-Hall | 2015-11-12 | 1 | -12/+21 |
| | | | | | | | | | | | | | | | | Otherwise they're inconveniently allowed to write events to the room but not to read them from the room. | ||||
| | * | | Allow guests to access room context API | Daniel Wagner-Hall | 2015-11-11 | 1 | -3/+9 |
| | |/ | |||||
| | * | Allow guest users to join and message rooms | Daniel Wagner-Hall | 2015-11-10 | 5 | -9/+81 |
| | | | |||||
| | * | Merge pull request #356 from matrix-org/daniel/3pidyetagain | Daniel Wagner-Hall | 2015-11-10 | 1 | -5/+3 |
| | |\ | | | | | | | Get display name from identity server, not client | ||||
| | | * | Get display name from identity server, not client | Daniel Wagner-Hall | 2015-11-09 | 1 | -5/+3 |
| | | | | |||||
| | * | | Don't fiddle with results returned by event sources | Richard van der Hoff | 2015-11-09 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | Overwriting hashes returned by other methods is poor form. Fixes: SYN-516 | ||||
| | * | | SYN-513: Include updates for rooms that have had all their tags deleted | Mark Haines | 2015-11-09 | 1 | -1/+1 |
| | |/ | |||||
| * | | Minor review fixes | Steven Hammerton | 2015-11-11 | 1 | -4/+4 |
| | | | |||||
| * | | Share more code between macaroon validation | Steven Hammerton | 2015-11-11 | 1 | -48/+7 |
| | | | |||||
| * | | Merge branch 'develop' into sh-cas-auth-via-homeserver | Steven Hammerton | 2015-11-05 | 11 | -91/+357 |
| |\| | |||||
| | * | Merge pull request #350 from matrix-org/erikj/search | Erik Johnston | 2015-11-05 | 1 | -18/+183 |
| | |\ | | | | | | | Implement pagination, order by and groups in search | ||||
| | | * | Be explicit about what we're doing | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| | | | | |||||
| | | * | Remove redundant test | Erik Johnston | 2015-11-05 | 1 | -1/+0 |
| | | | | |||||
| | | * | Increment by one, not five | Erik Johnston | 2015-11-05 | 1 | -1/+1 |
| | | | | |||||
| | | * | COMMENTS | Erik Johnston | 2015-11-05 | 1 | -4/+26 |
| | | | | |||||
| | | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search | Erik Johnston | 2015-11-05 | 12 | -119/+165 |
| | | |\ | |||||
| | | * | | Implement basic pagination for search results | Erik Johnston | 2015-11-05 | 1 | -13/+65 |
| | | | | | |||||
| | | * | | Implement order and group by | Erik Johnston | 2015-11-04 | 1 | -17/+109 |
| | | | | | |||||
| | * | | | Exchange 3pid invites for m.room.member invites | Daniel Wagner-Hall | 2015-11-05 | 3 | -37/+92 |
| | | |/ | |/| | |||||
| | * | | Open up /events to anonymous users for room events only | Daniel Wagner-Hall | 2015-11-05 | 9 | -36/+82 |
| | | | | | | | | | | | | | Squash-merge of PR #345 from daniel/anonymousevents | ||||
| * | | | Allow hs to do CAS login completely and issue the client with a login token ↵ | Steven Hammerton | 2015-11-05 | 1 | -3/+73 |
| |/ / | | | | | | | that can be redeemed for the usual successful login response | ||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into develop | Daniel Wagner-Hall | 2015-11-04 | 4 | -30/+2 |
| |\ \ | |||||
| | * \ | Merge branch 'develop' into daniel/removesomelies | Mark Haines | 2015-11-04 | 4 | -24/+151 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: synapse/notifier.py | ||||
| | | * | | Remove the LockManager class because it wasn't being used | Mark Haines | 2015-11-04 | 1 | -2/+0 |
| | | |/ | |||||
| | * | | Remove more unused parameters | Daniel Wagner-Hall | 2015-11-02 | 2 | -2/+0 |
| | | | | |||||
| | * | | Remove unused arguments and code | Daniel Wagner-Hall | 2015-11-02 | 2 | -26/+2 |
| | | | | |||||
| * | | | Allow guests to register and call /events?room_id= | Daniel Wagner-Hall | 2015-11-04 | 4 | -55/+83 |
| | |/ |/| | | | | | | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices. | ||||
| * | | Merge branch 'develop' into markjh/v2_sync_receipts | Mark Haines | 2015-11-03 | 3 | -12/+126 |
| |\ \ | | | | | | | | | | | | | Conflicts: synapse/handlers/sync.py | ||||
| | * | | 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 |
| | |\| | |||||
| | * | | 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 |
| | | | | |||||
| * | | | Include read receipts in v2 sync | Mark Haines | 2015-11-02 | 1 | -15/+30 |
| | |/ |/| | |||||
| * | | 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. | ||||
| * | 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 |
| | | | | | |||||
 |
index : matrix/thirdparty/synapse.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summary refs log tree commit diff |