Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #677 from matrix-org/erikj/dns_cache | Erik Johnston | 2016-04-08 | 2 | -19/+56 |
|\ | | | | | Read from DNS cache if within TTL | ||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dns_cache | Erik Johnston | 2016-04-07 | 60 | -1250/+2294 |
| |\ | |||||
| * | | Tests | Erik Johnston | 2016-04-06 | 1 | -2/+29 |
| | | | |||||
| * | | Allow clock to be passed in to func | Erik Johnston | 2016-03-31 | 1 | -3/+3 |
| | | | |||||
| * | | Read from DNS cache if within TTL | Erik Johnston | 2016-03-31 | 2 | -17/+27 |
| | | | |||||
* | | | Merge pull request #707 from matrix-org/markjh/remove_changed_presencelike_data | Erik Johnston | 2016-04-08 | 1 | -15/+0 |
|\ \ \ | | | | | | | | | changed_presencelike_data isn't observed anywhere so can be removed | ||||
| * | | | changed_presencelike_data isn't observed anywhere in synapse so can be removed | Mark Haines | 2016-04-08 | 1 | -15/+0 |
| | | | | |||||
* | | | | Remove some unused functions (#711) | Mark Haines | 2016-04-08 | 15 | -485/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove some unused functions * get_room_events_stream is only used in tests * is_exclusive_room might actually be something we want | ||||
* | | | | Merge pull request #710 from matrix-org/markjh/move_fire | Mark Haines | 2016-04-08 | 5 | -39/+24 |
|\ \ \ \ | |/ / / |/| | | | Move all the wrapper functions for distributor.fire | ||||
| * | | | Move all the wrapper functions for distributor.fire | Mark Haines | 2016-04-08 | 5 | -39/+24 |
|/ / / | | | | | | | | | | | | | | | | | | | Move the functions inside the distributor and import them where needed. This reduces duplication and makes it possible for flake8 to detect when the functions aren't used in a given file. | ||||
* | | | Merge pull request #708 from matrix-org/markjh/remove_collect_presencelike_data | Mark Haines | 2016-04-08 | 2 | -37/+1 |
|\ \ \ | | | | | | | | | Call profile handler get_displayname directly | ||||
| * | | | Call profile handler get_displayname directly rather than using ↵ | Mark Haines | 2016-04-07 | 2 | -37/+1 |
| | | | | | | | | | | | | | | | | collect_presencelike_data | ||||
* | | | | Merge pull request #701 from DoubleMalt/ldap-auth | Erik Johnston | 2016-04-07 | 4 | -10/+134 |
|\ \ \ \ | | | | | | | | | | | Add LDAP authentication | ||||
| * | | | | Add myself to AUTHORS.rst | Christoph Witzany | 2016-04-07 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Witzany <christoph@web.crofting.com> | ||||
| * | | | | fix check for failed authentication | Christoph Witzany | 2016-04-06 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | remove line | Christoph Witzany | 2016-04-06 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | make tests for ldap more specific to not be fooled by Mocks | Christoph Witzany | 2016-04-06 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | output ldap version for info and to pacify pep8 | Christoph Witzany | 2016-04-06 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | conditionally import ldap | Christoph Witzany | 2016-04-06 | 2 | -3/+5 |
| | | | | | |||||
| * | | | | fix pep8 | Christoph Witzany | 2016-04-06 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | fix exception handling | Christoph Witzany | 2016-04-06 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | code style | Christoph Witzany | 2016-04-06 | 1 | -6/+13 |
| | | | | | |||||
| * | | | | cleanup | Christoph Witzany | 2016-04-06 | 1 | -5/+0 |
| | | | | | |||||
| * | | | | add tls property and twist my head around twisted | Christoph Witzany | 2016-04-06 | 1 | -15/+29 |
| | | | | | |||||
| * | | | | add tls property | Christoph Witzany | 2016-04-06 | 1 | -6/+10 |
| | | | | | |||||
| * | | | | move LDAP authentication to AuthenticationHandler | Christoph Witzany | 2016-04-06 | 2 | -61/+48 |
| | | | | | |||||
| * | | | | Introduce LDAP authentication | Christoph Witzany | 2016-04-06 | 4 | -1/+111 |
| | | | | | |||||
* | | | | | Merge pull request #706 from matrix-org/markjh/slaveIV | Mark Haines | 2016-04-07 | 4 | -5/+54 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add tests for redactions | ||||
| * | | | | Add tests for redactions | Mark Haines | 2016-04-07 | 4 | -5/+54 |
|/ / / / | |||||
* | | | | Merge pull request #704 from matrix-org/markh/slaveIII | Mark Haines | 2016-04-07 | 2 | -1/+95 |
|\ \ \ \ | | | | | | | | | | | Add tests for get_latest_event_ids_in_room and get_current_state | ||||
| * | | | | Add sensible __eq__ operators inside the tests. | Mark Haines | 2016-04-07 | 2 | -10/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Rather than adding them globally. This limits the changes to only affect the tests. | ||||
| * | | | | Add tests for get_latest_event_ids_in_room and get_current_state | Mark Haines | 2016-04-07 | 3 | -0/+76 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #700 from matrix-org/erikj/deduplicate_joins | Erik Johnston | 2016-04-07 | 4 | -2/+125 |
|\ \ \ \ | |/ / / |/| | | | Deduplicate membership changes | ||||
| * | | | Rename things | Erik Johnston | 2016-04-07 | 1 | -5/+5 |
| | | | | |||||
| * | | | Log contexts and squash things together | Erik Johnston | 2016-04-07 | 1 | -17/+15 |
| | | | | |||||
| * | | | Add comment | Erik Johnston | 2016-04-07 | 1 | -0/+8 |
| | | | | |||||
| * | | | Deduplicate joins | Erik Johnston | 2016-04-07 | 4 | -1/+118 |
| | | | | |||||
* | | | | Merge pull request #703 from matrix-org/erikj/member | Erik Johnston | 2016-04-07 | 1 | -0/+5 |
|\ \ \ \ | |/ / / |/| | | | Set profile information when joining rooms remotely | ||||
| * | | | Set profile information when joining rooms remotely | Erik Johnston | 2016-04-07 | 1 | -0/+5 |
|/ / / | |||||
* | | | Merge pull request #699 from matrix-org/rav/show_own_leave_event | Richard van der Hoff | 2016-04-06 | 1 | -11/+40 |
|\ \ \ | |/ / |/| | | Let users see their own leave events | ||||
| * | | Let users see their own leave events | Richard van der Hoff | 2016-04-06 | 1 | -11/+40 |
| | | | | | | | | | | | | | | | | | | | | | ... otherwise clients get confused. Fixes https://matrix.org/jira/browse/SYN-662, https://github.com/vector-im/vector-web/issues/368 | ||||
* | | | Merge pull request #702 from matrix-org/markjh/slaveII | Mark Haines | 2016-04-06 | 2 | -11/+67 |
|\ \ \ | | | | | | | | | Test that room membership is replicated | ||||
| * | | | Test that room membership is replicated | Mark Haines | 2016-04-06 | 2 | -11/+67 |
|/ / / | |||||
* | | | Merge pull request #697 from matrix-org/markjh/slaveI | Mark Haines | 2016-04-06 | 10 | -2/+485 |
|\ \ \ | |/ / |/| | | Add a slaved events store class | ||||
| * | | Add a slaved events store class | Mark Haines | 2016-04-06 | 10 | -2/+485 |
| | | | | | | | | | | | | | | | Add a test to check that get_room_names_and_aliases does the same thing on both the master and on the slave data store. | ||||
* | | | Merge pull request #698 from matrix-org/erikj/port_script_fix | Erik Johnston | 2016-04-06 | 13 | -86/+69 |
|\ \ \ | |/ / |/| | | Don't require config to create database | ||||
| * | | Don't require config to create database | Erik Johnston | 2016-04-06 | 13 | -86/+69 |
| | | | |||||
* | | | Merge pull request #694 from matrix-org/markjh/caches | Mark Haines | 2016-04-06 | 2 | -33/+34 |
|\ \ \ | | | | | | | | | Move _get_cache_dict into the SQLBaseStore | ||||
| * | | | Move _get_cache_dict into the SQLBaseStore | Mark Haines | 2016-04-06 | 2 | -33/+34 |
| |/ / | |||||
* | | | Merge pull request #695 from matrix-org/markjh/cachesII | Mark Haines | 2016-04-06 | 4 | -26/+29 |
|\ \ \ | |/ / |/| | | Make the cache objects be per instance rather than being global | ||||
| * | | Make the cache objects be per instance rather than being global | Mark Haines | 2016-04-06 | 4 | -26/+29 |
|/ / | |||||
* | | Merge pull request #692 from matrix-org/markjh/replicate_reshuffle | Mark Haines | 2016-04-05 | 1 | -44/+55 |
|\ \ | | | | | | | Separate generating the replication response... | ||||
| * | | Separate generating the replication response... | Mark Haines | 2016-04-05 | 1 | -44/+55 |
| | | | | | | | | | | | | | | | from doing the http request parsing to make it easier to write unit tests for replication. | ||||
* | | | Merge pull request #693 from matrix-org/erikj/backfill_self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | Don't backfill from self | ||||
| * | | | Don't backfill from self | Erik Johnston | 2016-04-05 | 1 | -1/+4 |
| | | | | |||||
* | | | | Merge pull request #691 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 4 | -16/+58 |
|\ \ \ \ | | | | | | | | | | | Fix stuck invites | ||||
| * | | | | Fix stuck invites | Erik Johnston | 2016-04-05 | 4 | -16/+58 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject. | ||||
* | | | | | Merge pull request #690 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 5 | -32/+155 |
|\| | | | | |_|/ / |/| | | | Store invites in a separate table. | ||||
| * | | | Docs and indents | Erik Johnston | 2016-04-04 | 3 | -14/+31 |
| | | | | |||||
| * | | | Add upgrade path, rename table | Erik Johnston | 2016-04-04 | 2 | -6/+20 |
| | | | | |||||
| * | | | Store invites in a separate table. | Erik Johnston | 2016-04-04 | 5 | -32/+124 |
| | | | | |||||
* | | | | Merge pull request #689 from matrix-org/erikj/member | Erik Johnston | 2016-04-04 | 6 | -154/+192 |
|\| | | | | | | | | | | | Do checks for memberships before creating events | ||||
| * | | | Use computed prev event ids | Erik Johnston | 2016-04-01 | 4 | -13/+41 |
| | | | | |||||
| * | | | Remove state hack from _create_new_client_event | Erik Johnston | 2016-04-01 | 1 | -43/+0 |
| | | | | |||||
| * | | | Do checks for memberships before creating events | Erik Johnston | 2016-04-01 | 3 | -98/+151 |
| | | | | |||||
* | | | | Merge pull request #686 from matrix-org/markjh/doc_strings | Mark Haines | 2016-04-01 | 14 | -169/+242 |
|\ \ \ \ | |/ / / |/| | | | Use google style doc strings. | ||||
| * | | | Use google style doc strings. | Mark Haines | 2016-04-01 | 14 | -169/+242 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format. | ||||
* | | | | Merge pull request #684 from matrix-org/markjh/backfill_id_gen | Mark Haines | 2016-04-01 | 11 | -61/+71 |
|\ \ \ \ | | | | | | | | | | | Use a stream id generator for backfilled ids | ||||
| * | | | | Assert that the step != 0 | Mark Haines | 2016-04-01 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | use google style doc strings | Mark Haines | 2016-04-01 | 1 | -11/+12 |
| | | | | | |||||
| * | | | | Rename direction to step, apply checks consistently | Mark Haines | 2016-04-01 | 2 | -16/+16 |
| | | | | | |||||
| * | | | | Use a stream id generator for backfilled ids | Mark Haines | 2016-04-01 | 11 | -61/+69 |
| |/ / / | |||||
* | | | | Merge pull request #685 from matrix-org/erikj/sync_leave | Erik Johnston | 2016-04-01 | 4 | -72/+85 |
|\ \ \ \ | | | | | | | | | | | Add concurrently_execute function | ||||
| * | | | | Comment | Erik Johnston | 2016-04-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add concurrently_execute function | Erik Johnston | 2016-04-01 | 4 | -75/+82 |
| | | | | | |||||
| * | | | | Filter rooms list before chunking | Erik Johnston | 2016-04-01 | 1 | -6/+12 |
|/ / / / | |||||
* | | | | Merge pull request #682 from matrix-org/markjh/fix_invalidate | Mark Haines | 2016-04-01 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix the invalidation of the names and aliases cache | ||||
| * | | | | Fix the invalidation of the names and aliases cache | Mark Haines | 2016-04-01 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #681 from matrix-org/markjh/remove_outlier | Mark Haines | 2016-03-31 | 3 | -11/+7 |
|\ \ \ \ | |/ / / |/| | | | Remove outlier parameter from compute_event_context | ||||
| * | | | Remove outlier parameter from compute_event_context | Mark Haines | 2016-03-31 | 3 | -11/+7 |
|/ / / | | | | | | | | | | Use event.internal_metadata.is_outlier instead. | ||||
* | | | Merge pull request #680 from matrix-org/markjh/remove_is_new_state | Mark Haines | 2016-03-31 | 3 | -56/+57 |
|\ \ \ | | | | | | | | | Remove the is_new_state argument to persist event. | ||||
| * | | | Move the check for backfilled outside the for loop | Mark Haines | 2016-03-31 | 1 | -5/+5 |
| | | | | |||||
| * | | | Remove the is_new_state argument to persist event. | Mark Haines | 2016-03-31 | 3 | -56/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the checks for whether an event is new state inside persist event itself. This was harder than expected because there wasn't enough information passed to persist event to correctly handle invites from remote servers for new rooms. | ||||
* | | | | Merge pull request #679 from matrix-org/erikj/member | Erik Johnston | 2016-03-31 | 3 | -603/+651 |
|\ \ \ \ | |/ / / |/| | | | Split out RoomMemberHandler | ||||
| * | | | Split out RoomMemberHandler | Erik Johnston | 2016-03-31 | 3 | -603/+651 |
| |/ / | |||||
* | | | Merge pull request #676 from matrix-org/markjh/replicate_stateIII | Mark Haines | 2016-03-31 | 3 | -5/+128 |
|\ \ \ | |/ / |/| | | Add replication streams for ex outliers and current state resets | ||||
| * | | Use a namedtuple rather than tuple unpacking | Mark Haines | 2016-03-31 | 2 | -12/+15 |
| | | | |||||
| * | | Add replication streams for ex outliers and current state resets | Mark Haines | 2016-03-30 | 3 | -2/+113 |
| | | | |||||
| * | | Add a entry to current_state_resets table when the current state is reset | Mark Haines | 2016-03-30 | 1 | -0/+9 |
| | | | |||||
* | | | Line length | Erik Johnston | 2016-03-31 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #678 from matrix-org/dbkr/push_obey_enable | David Baker | 2016-03-31 | 1 | -2/+3 |
|\ \ \ | |_|/ |/| | | Don't ignore the obey overlay if the rule has an enabled attribute of False | ||||
| * | | Don't ignore the obey overlay if the rule has an enabled attribute of False | David Baker | 2016-03-31 | 1 | -2/+3 |
|/ / | | | | | | | Fixes https://github.com/vector-im/vector-web/issues/1244 | ||||
* | | spell out more packages | Matthew Hodgson | 2016-03-30 | 1 | -8/+21 |
| | | |||||
* | | typo | Matthew Hodgson | 2016-03-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #675 from matrix-org/markjh/replicate_stateII | Mark Haines | 2016-03-30 | 4 | -12/+93 |
|\ \ | | | | | | | Add a replication stream for state groups | ||||
| * | | return the state_group for backfill | Mark Haines | 2016-03-30 | 1 | -1/+2 |
| |/ | |||||
| * | Add a replication stream for state groups | Mark Haines | 2016-03-30 | 4 | -11/+91 |
|/ | |||||
* | Merge pull request #674 from matrix-org/markjh/replicate_state | Mark Haines | 2016-03-30 | 4 | -50/+60 |
|\ | | | | | Use a stream id generator to assign state group ids | ||||
| * | Use a stream id generator to assign state group ids | Mark Haines | 2016-03-30 | 4 | -50/+60 |
| | | |||||
* | | Merge pull request #673 from matrix-org/erikj/forget | Erik Johnston | 2016-03-30 | 2 | -6/+54 |
|\ \ | | | | | | | Require user to have left room to forget room | ||||
| * | | Only forget room if you were in the room | Erik Johnston | 2016-03-30 | 1 | -1/+2 |
| | | | |||||
| * | | Remove spurious comment | Erik Johnston | 2016-03-30 | 1 | -1/+0 |
| | | | |||||
| * | | Require user to have left room to forget room | Erik Johnston | 2016-03-30 | 2 | -6/+54 |
| |/ | | | | | | | | | This dramatically simplifies the forget API code - in particular it no longer generates a leave event. | ||||
* | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2016-03-30 | 3 | -3/+71 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'release-v0.14.0' of github.com:matrix-org/synapse v0.14.0 | Erik Johnston | 2016-03-30 | 180 | -5320/+6403 |
| |\ | |||||
| | * | Bump version and changelog | Erik Johnston | 2016-03-30 | 2 | -1/+6 |
| | | | |||||
| | * | Bump version and changelog v0.14.0-rc2 github/release-v0.14.0 release-v0.14.0 | Erik Johnston | 2016-03-23 | 2 | -1/+22 |
| | | | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.14.0 | Erik Johnston | 2016-03-23 | 45 | -474/+923 |
| | |\ | |||||
| | * | | English v0.14.0-rc1 | Erik Johnston | 2016-03-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Bump version and changelog | Erik Johnston | 2016-03-15 | 2 | -1/+40 |
| | | | | |||||
| * | | | Merge pull request #672 from nikriek/new-author | Erik Johnston | 2016-03-29 | 1 | -2/+5 |
| |\ \ \ | | | | | | | | | | | Add new author | ||||
| | * | | | Add new author | Niklas Riekenbrauck | 2016-03-29 | 1 | -2/+5 |
| |/ / / | |||||
* | | | | Merge pull request #671 from nikriek/jwt-support | Erik Johnston | 2016-03-29 | 4 | -1/+93 |
|\ \ \ \ | | | | | | | | | | | Support login using Javascript Web Tokens (JWT) | ||||
| * | | | | Add JWT support | Niklas Riekenbrauck | 2016-03-29 | 4 | -1/+93 |
|/ / / / | |||||
* | | | | Merge pull request #668 from matrix-org/markjh/deduplicate | Mark Haines | 2016-03-24 | 4 | -2/+75 |
|\ \ \ \ | | | | | | | | | | | Deduplicate identical /sync requests | ||||
| * | | | | Fix typo | Mark Haines | 2016-03-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add a response cache for getting the public room list | Mark Haines | 2016-03-24 | 1 | -1/+11 |
| | | | | | |||||
| * | | | | Deduplicate identical /sync requests | Mark Haines | 2016-03-24 | 3 | -1/+64 |
|/ / / / | |||||
* | | | | Merge pull request #667 from matrix-org/dbkr/never_notify_member_events | David Baker | 2016-03-24 | 1 | -20/+21 |
|\ \ \ \ | |_|_|/ |/| | | | Never notify for member events. | ||||
| * | | | Never notify for member events. This fixes ↵ | David Baker | 2016-03-24 | 1 | -20/+21 |
|/ / / | | | | | | | | | | https://github.com/vector-im/vector-web/issues/828 | ||||
* | | | Merge pull request #666 from matrix-org/erikj/intern | Erik Johnston | 2016-03-23 | 8 | -31/+100 |
|\ \ \ | | | | | | | | | Intern lots of strings | ||||
| * | | | Simplify intern_dict | Erik Johnston | 2016-03-23 | 1 | -17/+10 |
| | | | | |||||
| * | | | Don't bother interning keys that are already interned | Erik Johnston | 2016-03-23 | 1 | -3/+1 |
| | | | | |||||
| * | | | Intern all the things | Erik Johnston | 2016-03-23 | 8 | -45/+97 |
| | | | | |||||
| * | | | Intern sender, event_id and room_id in events | Erik Johnston | 2016-03-23 | 1 | -0/+5 |
| | | | | |||||
| * | | | Intern type and state_key on events | Erik Johnston | 2016-03-23 | 1 | -0/+7 |
| | | | | |||||
| * | | | String intern | Erik Johnston | 2016-03-23 | 2 | -3/+17 |
|/ / / | |||||
* | | | Merge pull request #664 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-03-23 | 2 | -18/+51 |
|\ \ \ | | | | | | | | | Don't require alias in public room list. | ||||
| * | | | Comment about weird SQL | Erik Johnston | 2016-03-23 | 1 | -1/+3 |
| | | | | |||||
| * | | | SQLite and postgres doesn't share a true literal | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Ensure all old public rooms have aliases | Erik Johnston | 2016-03-23 | 2 | -4/+26 |
| | | | | |||||
| * | | | Ensure published rooms have public join rules | Erik Johnston | 2016-03-23 | 1 | -0/+7 |
| | | | | |||||
| * | | | Comment | Erik Johnston | 2016-03-23 | 1 | -0/+3 |
| | | | | |||||
| * | | | Don't require alias in public room list. | Erik Johnston | 2016-03-23 | 1 | -14/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rooms now no longer require an alias to be published. Also, changes the way we pull out state of each room to not require fetching all state events. | ||||
* | | | | Merge pull request #663 from matrix-org/erikj/invite_for_user | Erik Johnston | 2016-03-23 | 2 | -7/+5 |
|\ \ \ \ | | | | | | | | | | | Make get_invites return RoomsForUser | ||||
| * | | | | Make get_invites return RoomsForUser | Erik Johnston | 2016-03-23 | 2 | -7/+5 |
| |/ / / | |||||
* | | | | Merge pull request #665 from matrix-org/erikj/dont_cache_events | Erik Johnston | 2016-03-23 | 3 | -23/+30 |
|\ \ \ \ | | | | | | | | | | | Only cache events in the event cache | ||||
| * | | | | Don't cache events in get_recent_events_for_room | Erik Johnston | 2016-03-23 | 1 | -14/+19 |
| | | | | | |||||
| * | | | | Don't cache events in get_current_state_for_key | Erik Johnston | 2016-03-23 | 2 | -9/+11 |
| |/ / / | |||||
* | | | | Merge pull request #662 from matrix-org/erikj/state_cache | Erik Johnston | 2016-03-23 | 3 | -69/+94 |
|\ \ \ \ | |/ / / |/| | | | Make StateHandler._state_cache only store event_ids. | ||||
| * | | | Reduce cache size | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Key StateHandler._state_cache off of state groups | Erik Johnston | 2016-03-22 | 1 | -40/+21 |
| | | | | |||||
| * | | | Make LruCache use a dedicated _Node class | Erik Johnston | 2016-03-22 | 1 | -32/+41 |
| | | | | |||||
| * | | | Make StateHandler._state_cache only store event_ids. | Erik Johnston | 2016-03-22 | 2 | -7/+42 |
|/ / / | |||||
* | | | Measure StateHandler._resolve_events | Erik Johnston | 2016-03-22 | 1 | -38/+40 |
| | | | |||||
* | | | Bump get_unread_event_push_actions_by_room_for_user cache | Erik Johnston | 2016-03-22 | 1 | -1/+1 |
| | | | |||||
* | | | Bump get_aliases_for_room cache | Erik Johnston | 2016-03-22 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #661 from matrix-org/markjh/member_count | Mark Haines | 2016-03-22 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Fix membership count for BulkPushRuleEvaluator | ||||
| * | | | Use get_users_in_room to count the number of room members rather than using ↵ | Mark Haines | 2016-03-22 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | read_receipts | ||||
* | | | | Merge pull request #660 from matrix-org/erikj/state_cache | Erik Johnston | 2016-03-22 | 1 | -60/+48 |
|\ \ \ \ | | | | | | | | | | | Don't cache events in _state_group_cache | ||||
| * | | | | Don't cache events in _state_group_cache | Erik Johnston | 2016-03-22 | 1 | -60/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, simply cache the event ids, relying on the event cache to cache the actual events. The problem was that while the state groups cache was limited in the number of groups it could hold, each individual group could consist of thousands of events. | ||||
* | | | | | Merge pull request #659 from matrix-org/erikj/state_cache_factor | Erik Johnston | 2016-03-22 | 1 | -1/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Make stateGroupCache honour CACHE_SIZE_FACTOR | ||||
| * | | | | | Make stateGroupCache honour CACHE_SIZE_FACTOR | Erik Johnston | 2016-03-22 | 1 | -1/+7 |
| |/ / / / | |||||
* | | | | | Merge pull request #657 from matrix-org/erikj/roomlist | Erik Johnston | 2016-03-22 | 4 | -4/+122 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add published room list edit API | ||||
| * | | | | Doc string | Erik Johnston | 2016-03-22 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | an invalide is something else... | Matthew Hodgson | 2016-03-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add published room list edit API | Erik Johnston | 2016-03-21 | 4 | -4/+116 |
| |/ / / | |||||
* | | | | Merge pull request #658 from matrix-org/markjh/cleanup | Mark Haines | 2016-03-22 | 3 | -44/+19 |
|\ \ \ \ | |/ / / |/| | | | Remove some unused parameters from persist_event | ||||
| * | | | Remove unused backfilled parameter from persist_event | Mark Haines | 2016-03-21 | 3 | -42/+19 |
| | | | | |||||
| * | | | remove unused current_state variable from on_receive_pdu | Mark Haines | 2016-03-21 | 1 | -2/+0 |
|/ / / | |||||
* | | | Merge pull request #655 from matrix-org/erikj/edu_yield | Erik Johnston | 2016-03-18 | 1 | -3/+9 |
|\ \ \ | | | | | | | | | Yield on EDU handling | ||||
| * | | | Catch exceptions from EDU handling | Erik Johnston | 2016-03-18 | 1 | -1/+6 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/edu_yield | Erik Johnston | 2016-03-18 | 4 | -22/+64 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #656 from matrix-org/erikj/get_event | Erik Johnston | 2016-03-18 | 2 | -15/+15 |
|\ \ \ \ | | | | | | | | | | | Dedupe requested event list in _get_events | ||||
| * \ \ \ | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/get_event | Erik Johnston | 2016-03-18 | 2 | -7/+49 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #652 from matrix-org/erikj/delete_alias | Erik Johnston | 2016-03-18 | 2 | -7/+49 |
|\ \ \ \ \ | | | | | | | | | | | | | Update aliases event after deletion | ||||
| * | | | | | Check canonical alias event exists | Erik Johnston | 2016-03-17 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Update aliases event after deletion | Erik Johnston | 2016-03-17 | 2 | -7/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempt to update the appropriate `m.room.aliases` event after deleting an alias. This may fail due to the deleter not being in the room. Will also check if the canonical alias of the event is set to the deleted alias, and if so will attempt to delete it. | ||||
| | * | | | | Don't assume existence of event_id in __str__ | Erik Johnston | 2016-03-18 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | Dedupe requested event list in _get_events | Erik Johnston | 2016-03-18 | 1 | -14/+12 |
| |/ / / / |/| | | | | |||||
| | * | | | Yield on EDU handling | Erik Johnston | 2016-03-18 | 1 | -3/+4 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #650 from matrix-org/dbkr/register_idempotent_with_username | David Baker | 2016-03-17 | 3 | -6/+38 |
|\ \ \ \ | | | | | | | | | | | Make registration idempotent, part 2 | ||||
| * | | | | remove debug logging | David Baker | 2016-03-16 | 1 | -3/+0 |
| | | | | | |||||
| * | | | | Unused import | David Baker | 2016-03-16 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Make registration idempotent, part 2: be idempotent if the client specifies ↵ | David Baker | 2016-03-16 | 3 | -6/+42 |
| |/ / / | | | | | | | | | | | | | a username. | ||||
* | | | | Merge pull request #651 from matrix-org/markjh/unused_II | Mark Haines | 2016-03-17 | 4 | -112/+0 |
|\ \ \ \ | | | | | | | | | | | Remove dead code left over from presence changes | ||||
| * | | | | Remove another unused function from presence | Mark Haines | 2016-03-17 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Remove dead code left over from presence changes | Mark Haines | 2016-03-17 | 4 | -108/+0 |
|/ / / / | |||||
* / / / | Add option to definitions.py to search for functions a function refers to | Mark Haines | 2016-03-17 | 1 | -1/+22 |
|/ / / | |||||
* | | | Merge pull request #649 from matrix-org/dbkr/idempotent_registration | David Baker | 2016-03-16 | 4 | -17/+80 |
|\ \ \ | | | | | | | | | Make registration idempotent | ||||
| * | | | pep8 | David Baker | 2016-03-16 | 1 | -1/+2 |
| | | | | |||||
| * | | | time_msec() | David Baker | 2016-03-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | string with symbols is a bit too symboly. | David Baker | 2016-03-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Replace other time.time(). | David Baker | 2016-03-16 | 1 | -2/+1 |
| | | | | |||||
| * | | | Use hs get_clock instead of time.time() | David Baker | 2016-03-16 | 1 | -2/+2 |
| | | | | |||||
| * | | | take extra return val from check_auth in account too | David Baker | 2016-03-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix tests | David Baker | 2016-03-16 | 1 | -4/+5 |
| | | | | |||||
| * | | | pep8 & remove debug logging | David Baker | 2016-03-16 | 2 | -5/+6 |
| | | | | |||||
| * | | | Make registration idempotent: if you specify the same session, make it give ↵ | David Baker | 2016-03-16 | 2 | -13/+74 |
|/ / / | | | | | | | | | | you an access token for the user that was registered on previous uses of that session. Tweak the UI auth layer to not delete sessions when their auth has completed and hence expire themn so they don't hang around until server restart. Allow server-side data to be associated with UI auth sessions. | ||||
* | | | Merge pull request #647 from matrix-org/markjh/pushers_stream | Mark Haines | 2016-03-16 | 8 | -18/+120 |
|\ \ \ | | | | | | | | | Add replication stream for pushers | ||||
| * | | | Add a comment to offer a hint to an explanation for why we have a unique ↵ | Mark Haines | 2016-03-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | constraint on (app_id, pushkey, user_id) | ||||
| * | | | Fix a couple of errors when deleting pushers | Mark Haines | 2016-03-15 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'develop' into markjh/pushers_stream | Mark Haines | 2016-03-15 | 4 | -29/+53 |
| |\ \ \ | |||||
| * | | | | Hook up adding a pusher to the notifier for replication. | Mark Haines | 2016-03-15 | 2 | -0/+12 |
| | | | | | |||||
| * | | | | Add replication stream for pushers | Mark Haines | 2016-03-15 | 6 | -18/+107 |
| | | | | | |||||
* | | | | | Merge pull request #648 from matrix-org/rav/password_reset | Richard van der Hoff | 2016-03-16 | 3 | -2/+59 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Password reset docs and script | ||||
| * | | | | Clarify that we do have reset functionality via the IS | Richard van der Hoff | 2016-03-16 | 1 | -21/+20 |
| | | | | | |||||
| * | | | | Password reset docs and script | Richard van der Hoff | 2016-03-16 | 3 | -1/+59 |
|/ / / / | | | | | | | | | | | | | | | | | Replace the bash/perl gen_password script with a python one, and write a note on how to use it. | ||||
* | | | | Merge pull request #646 from matrix-org/erikj/reject_invite_federation | Erik Johnston | 2016-03-15 | 1 | -1/+16 |
|\ \ \ \ | |_|_|/ |/| | | | Persist rejection of invites over federation | ||||
| * | | | Remove needless PreserveLoggingContext | Erik Johnston | 2016-03-15 | 1 | -5/+4 |
| | | | | |||||
| * | | | Persist rejection of invites over federation | Erik Johnston | 2016-03-15 | 1 | -1/+17 |
|/ / / | |||||
* | | | Merge pull request #645 from matrix-org/erikj/3pid_guest_config | Erik Johnston | 2016-03-14 | 2 | -25/+36 |
|\ \ \ | | | | | | | | | Add config to create guest account on 3pid invite | ||||
| * | | | Add config to create guest account on 3pid invite | Erik Johnston | 2016-03-14 | 2 | -25/+36 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when a 3pid invite request is sent to an identity server, it includes a provisioned guest access token. This allows the link in the, say, invite email to include the guest access token ensuring that the same account is used each time the link is clicked. This flow has a number of flaws, including when using different servers or servers that have guest access disabled. For now, we keep this implementation but hide it behind a config option until a better flow is implemented. | ||||
* / / | Return list, not generator. | Erik Johnston | 2016-03-14 | 1 | -3/+1 |
|/ / | |||||
* | | Merge pull request #644 from matrix-org/markjh/parse_jsonIII | Mark Haines | 2016-03-14 | 2 | -6/+19 |
|\ \ | | | | | | | Fix regression where synapse checked whether push rules were valid | ||||
| * | | Fix regression where synapse checked whether push rules were valid JSON ↵ | Mark Haines | 2016-03-14 | 2 | -6/+19 |
|/ / | | | | | | | before the compatibility hack that handled clients sending invalid JSON | ||||
* | | Merge pull request #642 from matrix-org/erikj/logout | Erik Johnston | 2016-03-11 | 3 | -15/+113 |
|\ \ | | | | | | | Implement logout | ||||
| * | | Thats not how transactions work. | Erik Johnston | 2016-03-11 | 1 | -13/+16 |
| | | | |||||
| * | | Emtpy commit | Erik Johnston | 2016-03-11 | 0 | -0/+0 |
| | | | |||||
| * | | Implement logout | Erik Johnston | 2016-03-11 | 3 | -14/+109 |
| | | | |||||
* | | | Merge pull request #643 from matrix-org/markjh/parse_json_II | Mark Haines | 2016-03-11 | 11 | -90/+49 |
|\ \ \ | |/ / |/| | | Use parse_json_object_from_request to parse JSON out of request bodies | ||||
| * | | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 11 | -90/+49 |
|/ / | |||||
* | | Fix SQL statement | Erik Johnston | 2016-03-11 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #641 from matrix-org/dbkr/fix_change_password | Erik Johnston | 2016-03-11 | 4 | -30/+32 |
|\ \ | | | | | | | Fix logout on password change | ||||
| * | | more pep8 | David Baker | 2016-03-11 | 1 | -1/+1 |
| | | | |||||
| * | | Make select more sensible when dseleting access tokens, rename pusher ↵ | David Baker | 2016-03-11 | 3 | -7/+5 |
| | | | | | | | | | | | | deletion to match access token deletion and make exception arg optional. | ||||
| * | | Delete old, unused methods and rename new one to just be ↵ | David Baker | 2016-03-11 | 2 | -16/+3 |
| | | | | | | | | | | | | `user_delete_access_tokens` with an `except_token_ids` argument doing what it says on the tin. | ||||
| * | | Dear PyCharm, please indent sensibly for me. Thx. | David Baker | 2016-03-11 | 2 | -3/+3 |
| | | | |||||
| * | | Fix cache invalidation so deleting access tokens (which we did when changing ↵ | David Baker | 2016-03-11 | 4 | -17/+34 |
| | | | | | | | | | | | | password) actually takes effect without HS restart. Reinstate the code to avoid logging out the session that changed the password, removed in 415c2f05491ce65a4fc34326519754cd1edd9c54 | ||||
* | | | Merge pull request #640 from matrix-org/erikj/keyclient_host | Erik Johnston | 2016-03-11 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Make key client send a Host header | ||||
| * | | | Make key client send a Host header | Erik Johnston | 2016-03-11 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #635 from matrix-org/erikj/sync_order | Erik Johnston | 2016-03-11 | 1 | -3/+6 |
|\ \ \ \ | |_|/ / |/| | | | Use topological orders for initial sync timeline | ||||
| * | | | Add comment | Erik Johnston | 2016-03-09 | 1 | -0/+3 |
| | | | | |||||
| * | | | Return the correct token form | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use topological orders for initial sync timeline | Erik Johnston | 2016-03-09 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #638 from matrix-org/daniel/appserviceid | Daniel Wagner-Hall | 2016-03-10 | 2 | -7/+38 |
|\ \ \ \ | | | | | | | | | | | Store appservice ID on register | ||||
| * | | | | Store appservice ID on register | Daniel Wagner-Hall | 2016-03-10 | 2 | -7/+38 |
|/ / / / | |||||
* | | | | Merge pull request #639 from matrix-org/erikj/as_user_update_batch | Erik Johnston | 2016-03-10 | 1 | -9/+14 |
|\ \ \ \ | |_|/ / |/| | | | Update users table in a batched manner | ||||
| * | | | Update users table in a batched manner | Erik Johnston | 2016-03-10 | 1 | -9/+14 |
|/ / / | |||||
* | | | Merge pull request #637 from blide/develop | Erik Johnston | 2016-03-10 | 2 | -11/+20 |
|\ \ \ | |/ / |/| | | SYN-646 - Register endpoint returns refresh_token | ||||
| * | | Flake8 fix | blide | 2016-03-10 | 1 | -6/+6 |
| | | | |||||
| * | | Register endpoint returns refresh_token | blide | 2016-03-10 | 2 | -17/+26 |
|/ / | | | | | | | Guest registration still doesn't return refresh_token | ||||
* | | Merge pull request #634 from matrix-org/erikj/pin_saml2_version | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
|\ \ | | | | | | | Pin pysaml2 version to 3.x | ||||
| * | | Pin pysaml2 version to 3.x | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This is due to the fact that `from saml2 import config` fails in version 4.x | ||||
* | | | Merge pull request #628 from matrix-org/markjh/parse_json | Mark Haines | 2016-03-09 | 11 | -121/+97 |
|\ \ \ | |/ / |/| | | | | | | | | | | | Add a parse_json_object function to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions. | ||||
| * | | Add a parse_json_object function | Mark Haines | 2016-03-09 | 11 | -121/+97 |
|/ / | | | | | | | | | to deduplicate all the copy+pasted _parse_json functions. Also document the parse_.* functions. | ||||
* | | Ensure integer is an integer | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
| | | |||||
* | | Reinstate coverage checks for integ tests | Richard van der Hoff | 2016-03-09 | 2 | -2/+4 |
| | | |||||
* | | Specify synapse-directory for integ tests | Richard van der Hoff | 2016-03-09 | 2 | -2/+6 |
| | | |||||
* | | Only build py27 tox env for integ tests | Richard van der Hoff | 2016-03-08 | 2 | -2/+2 |
| | | |||||
* | | Use sytest build scripts, rather than reinventing the wheel | Richard van der Hoff | 2016-03-08 | 2 | -52/+7 |
| | | |||||
* | | Merge pull request #632 from matrix-org/markjh/py3v2 | Mark Haines | 2016-03-08 | 17 | -22/+22 |
|\ \ | | | | | | | Fix relative imports so they work in both py3 and py27 | ||||
| * | | Fix relative imports so they work in both py3 and py27 | Mark Haines | 2016-03-08 | 17 | -22/+22 |
| | | | |||||
* | | | Merge pull request #633 from matrix-org/daniel/ick | Daniel Wagner-Hall | 2016-03-08 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | Idempotent-ise schema update script | ||||
| * \ \ | Merge branch 'develop' into daniel/ick | Daniel Wagner-Hall | 2016-03-08 | 49 | -336/+1061 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #630 from matrix-org/dbkr/post_urlencoded_encode_params | David Baker | 2016-03-08 | 1 | -2/+15 |
|\ \ \ \ | |_|/ / |/| | | | Encode unicode objects given to post_urlencode* | ||||
| * | | | pep8 | David Baker | 2016-03-08 | 1 | -2/+5 |
| | | | | |||||
| * | | | Encode unicode objects given to post_urlencode* otherwise urllib.urlencode ↵ | David Baker | 2016-03-08 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | chokes. | ||||
* | | | | Merge pull request #631 from matrix-org/markjh/py3v1 | Mark Haines | 2016-03-08 | 8 | -10/+10 |
|\ \ \ \ | | | | | | | | | | | Use syntax that's valid on both py2.7 and py3 | ||||
| * | | | | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 8 | -10/+10 |
| |/ / / |