Commit Graph

5739 Commits (2223204ebaf7624f4d640f2c56d3a4eb7ff6d98e)
 

Author SHA1 Message Date
Mark Haines 2223204eba Hook push rules up to the replication API 9 years ago
Mark Haines a1cf9e3bf3 Add a stream for push rule updates 9 years ago
Mark Haines a612ce6659 Merge pull request #489 from matrix-org/markjh/replication 9 years ago
Mark Haines d50ca1b1ed Merge pull request #613 from matrix-org/markjh/yield 9 years ago
Mark Haines 60a0f81c7a Add a /replication API for extracting the updates that happened on 9 years ago
Mark Haines 54172924c8 Load the current id in the IdGenerator constructor 9 years ago
Erik Johnston 742ec37ca3 Merge pull request #611 from matrix-org/erikj/expiring_cache_size 9 years ago
Erik Johnston 72165e5b77 Reraise exception 9 years ago
Erik Johnston ff2d7551c7 Correct cache miss detection 9 years ago
Erik Johnston 903fb34b39 Merge branch 'develop' of github.com:matrix-org/synapse into erikj/expiring_cache_size 9 years ago
David Baker bfdcc7b9b6 Merge pull request #607 from matrix-org/dbkr/send_inviter_member_event 9 years ago
Mark Haines 4bf13a8207 Merge pull request #609 from matrix-org/markjh/change_action 9 years ago
Mark Haines de27f7fc79 Add support for changing the actions for default rules 9 years ago
David Baker 413e36b17a Merge remote-tracking branch 'origin/develop' into dbkr/send_inviter_member_event 9 years ago
David Baker 354d3842b5 Empty to commit to force re-test 9 years ago
David Baker 9329cd5f13 Merge pull request #608 from gergelypolonkai/syn-638 9 years ago
Gergely Polonkai 87acd8fb07 Fix to appease the PEP8 dragon 9 years ago
Gergely Polonkai a53774721a Add error codes for malformed/bad JSON in /login 9 years ago
David Baker 0f0b011440 Send the invier's member event in room invite state so the invitee has their display name and avatar. 9 years ago
Mark Haines faa3d172ab Merge pull request #606 from matrix-org/markjh/get_enabled 9 years ago
Mark Haines 15c2ac2cac Make sure we return a JSON object when returning the values of specif… 9 years ago
Mark Haines fb9b5b6f4a Merge pull request #605 from matrix-org/markjh/dead_code 9 years ago
Mark Haines 4ecfbac85f Merge branch 'develop' into markjh/dead_code 9 years ago
Mark Haines 9892d017b2 Remove unused get_rule_attr method 9 years ago
Daniel Wagner-Hall e8d34bccbd Merge pull request #604 from matrix-org/daniel/guestaccesstoken 9 years ago
Daniel Wagner-Hall 33300673b7 Generate guest access token on 3pid invites 9 years ago
Daniel Wagner-Hall 869580206d Ignore invalid POST bodies when joining rooms 9 years ago
Erik Johnston 278d6c0527 Report size of ExpiringCache 9 years ago
Erik Johnston e7ab0e0f9f Merge pull request #603 from matrix-org/erikj/presence 9 years ago
Erik Johnston 6451fcd085 Create a new stream_id per presence update 9 years ago
Erik Johnston b5f77eb12a Check presence token interval is less than 100, rather than the token itself 9 years ago
Erik Johnston e3e0ac6ec7 Merge pull request #602 from matrix-org/erikj/presence 9 years ago
Daniel Wagner-Hall f1dd03548f Set WORKSPACE if not set 9 years ago
Daniel Wagner-Hall 28ad246bb4 Merge pull request #584 from matrix-org/daniel/ephemeralthreepids 9 years ago
Daniel Wagner-Hall 577951b032 Allow third_party_signed to be specified on /join 9 years ago
Erik Johnston 13f86c3489 Handle get_all_entities_changed returning None 9 years ago
Erik Johnston 6e0209112b Add comments 9 years ago
Erik Johnston c77dae7a1a Change the way we figure out presence updates for small deltas 9 years ago
Erik Johnston a7b2ce32f7 Merge pull request #600 from matrix-org/erikj/presence 9 years ago
Daniel Wagner-Hall 0d4b3a133d Merge pull request #601 from Rugvip/pep8 9 years ago
Erik Johnston 02e928cf9b Don't include defer.returnValue in Measure block 9 years ago
Erik Johnston 56a94ccd9e Measure PresenceEventSource.get_new_events 9 years ago
Patrik Oldsberg baf056bae8 handlers/sync: style fix, line too long 9 years ago
Mark Haines 10d581d1cf Merge pull request #595 from matrix-org/markjh/coverage 9 years ago
Erik Johnston 138c405974 Pick up currently_active across federation 9 years ago
Erik Johnston 8fe3b450d2 Merge pull request #597 from Rugvip/account-data-sync 9 years ago
Patrik Oldsberg 1dcfb201c4 handlers/sync: fix SyncResult not counting account_data change when converting to bool 9 years ago
Richard van der Hoff f7e3de02ef Merge pull request #587 from matrix-org/rav/guest_access_after_room_join 9 years ago
Mark Haines 4d14655c2b Merge pull request #594 from matrix-org/markjh/coverage 9 years ago
Mark Haines 5e2890bd49 Check that the disable_registration config key is handled correctly 9 years ago