summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* When exposing group state, return is_openly_joinableLuke Barnard2018-04-061-0/+5
* By default, join policy is "invite"Luke Barnard2018-04-061-1/+1
* add_user -> _add_userLuke Barnard2018-04-061-3/+3
* pep8Luke Barnard2018-04-062-2/+4
* Get group_info from existing call to check_group_is_oursLuke Barnard2018-04-061-5/+1
* Don't use redundant inlineCallbacksLuke Barnard2018-04-061-4/+1
* join_rule -> join_policyLuke Barnard2018-04-061-1/+1
* is_joinable -> join_ruleLuke Barnard2018-04-062-5/+2
* Fix federation client `set_group_joinable` typoLuke Barnard2018-04-061-1/+1
* Factor out add_user from accept_invite and join_groupLuke Barnard2018-04-061-41/+29
* pep8David Baker2018-04-061-1/+2
* Implement group join APIDavid Baker2018-04-065-4/+124
* use PUT instead of POST for federating groups/m.join_policyKrombel2018-04-063-3/+7
* more verbosity in synctlRichard van der Hoff2018-04-061-0/+1
* Merge pull request #2986 from jplatte/join_reponse_room_idRichard van der Hoff2018-04-051-1/+6
|\
| * Add room_id to the response of `rooms/{roomId}/join`Jonas Platte2018-03-131-1/+6
* | Merge pull request #3068 from matrix-org/rav/fix_cache_invalidationRichard van der Hoff2018-04-051-26/+38
|\ \
| * | Fix overzealous cache invalidationRichard van der Hoff2018-04-051-26/+38
* | | Merge pull request #3066 from matrix-org/rav/remove_redundant_metricsRichard van der Hoff2018-04-052-51/+0
|\ \ \
| * | | Remove redundant metrics which were deprecated in 0.27.0.Richard van der Hoff2018-04-042-51/+0
| |/ /
* | | Merge pull request #3045 from matrix-org/dbkr/group_joinableLuke Barnard2018-04-058-0/+157
|\ \ \
| * | | NON NULL -> NOT NULLLuke Barnard2018-04-051-1/+1
| * | | Use "/settings/" (plural)Luke Barnard2018-04-053-3/+3
| * | | Use DEFAULT join_policy of "invite" in dbLuke Barnard2018-04-051-1/+1
| * | | Document set_group_join_policyLuke Barnard2018-04-051-0/+6
| * | | Use join_policy API instead of joinableLuke Barnard2018-04-037-23/+58
| * | | This should probably be a PUTDavid Baker2018-03-281-1/+1
| * | | OK, smallint it is thenDavid Baker2018-03-281-1/+1
| * | | Grr. Copy the definition from is_adminDavid Baker2018-03-281-1/+1
| * | | pep8David Baker2018-03-281-2/+1
| * | | Make column definition that works on both dbsDavid Baker2018-03-281-1/+1
| * | | Add schema delta fileDavid Baker2018-03-281-0/+16
| * | | Add joinability for groupsDavid Baker2018-03-287-1/+102
* | | | Merge pull request #3041 from matrix-org/r30_statsNeil Johnson2018-04-055-7/+115
|\ \ \ \
| * | | | Review commentsNeil Johnson2018-04-052-5/+6
| * | | | pep8Neil Johnson2018-03-291-2/+4
| * | | | Remove need for sqlite specific queryNeil Johnson2018-03-291-30/+57
| * | | | fix pep8 errorsNeil Johnson2018-03-281-3/+0
| * | | | remove twisted deferral cruftNeil Johnson2018-03-281-6/+3
| * | | | bump schema versionNeil Johnson2018-03-281-1/+1
| * | | | Support multi client R30 for psqlNeil Johnson2018-03-282-9/+31
| * | | | rename stat to future proofNeil Johnson2018-03-281-1/+1
| * | | | Add user_ips last seen indexNeil Johnson2018-03-282-0/+24
| * | | | No need to cast in count_daily_usersNeil Johnson2018-03-281-2/+2
| * | | | query and call for r30 statsNeil Johnson2018-03-282-0/+38
| * | | | count_daily_users failed if db was sqlite due to type failure - presumably th...Neil Johnson2018-03-281-1/+1
* | | | | Merge pull request #3060 from matrix-org/rav/kill_event_contentRichard van der Hoff2018-04-053-7/+12
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove uses of events.contentRichard van der Hoff2018-03-293-7/+12
* | | | | phone home cache size configurationsJan Christian Grünhage2018-04-041-0/+3
* | | | | Revert "improve mxid check performance"Richard van der Hoff2018-04-041-4/+3
* | | | | Merge pull request #3000 from NotAFile/change-except-styleRichard van der Hoff2018-04-042-5/+5
|\ \ \ \ \
| * | | | | replace old style error catching with 'as' keywordNotAFile2018-03-152-5/+5
* | | | | | Merge pull request #3044 from matrix-org/michaelk/performance_statsRichard van der Hoff2018-04-041-0/+33
|\ \ \ \ \ \
| * | | | | | Handle review commentsMichael Kaye2018-03-281-6/+9
| * | | | | | As daemonizing will make a new process, defer call to init.Michael Kaye2018-03-281-13/+23
| * | | | | | Include coarse CPU and Memory use in stats callbacks.Michael Kaye2018-03-271-0/+20
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3053 from NotAFile/speedup-mxid-checkRichard van der Hoff2018-04-041-3/+4
|\ \ \ \ \ \
| * | | | | | improve mxid check performance ~4xAdrian Tschira2018-03-311-3/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #3049 from matrix-org/rav/use_staticjsonRichard van der Hoff2018-04-034-20/+34
|\ \ \ \ \ \
| * | | | | | Fix json encoding bug in replicationRichard van der Hoff2018-04-031-1/+1
| * | | | | | Use static JSONEncodersRichard van der Hoff2018-03-294-20/+34
| |/ / / / /
* / / / / / Use simplejson throughoutRichard van der Hoff2018-03-293-5/+9
|/ / / / /
* | | | | Merge pull request #3043 from matrix-org/erikj/measure_state_group_creationErik Johnston2018-03-281-27/+28
|\ \ \ \ \
| * | | | | Measure time it takes to calculate state group IDErik Johnston2018-03-281-27/+28
* | | | | | Merge pull request #3034 from matrix-org/rav/fix_key_claim_errorsRichard van der Hoff2018-03-281-28/+28
|\ \ \ \ \ \
| * | | | | | Stringify exceptions for keys/{query,claim}Richard van der Hoff2018-03-271-1/+4
| * | | | | | factor out exception handling for keys/claim and keys/queryRichard van der Hoff2018-03-271-28/+25
| | |/ / / / | |/| | | |
* | | | | | Fix search_user_dir multiple sqlite versions do different thingsNeil Johnson2018-03-281-2/+2
| |/ / / / |/| | | |
* | | | | Merge pull request #3029 from matrix-org/erikj/linearize_generate_user_idErik Johnston2018-03-282-7/+11
|\ \ \ \ \
| * | | | | Also do check inside linearizerErik Johnston2018-03-271-3/+4
| * | | | | PEP8Erik Johnston2018-03-261-1/+3
| * | | | | Don't use _cursor_to_dict in find_next_generated_user_id_localpartErik Johnston2018-03-261-3/+1
| * | | | | Linearize calls to _generate_user_idErik Johnston2018-03-261-4/+7
* | | | | | Merge pull request #3030 from matrix-org/erikj/no_ujsonErik Johnston2018-03-282-2/+1
|\ \ \ \ \ \
| * | | | | | Remove last usage of ujsonErik Johnston2018-03-262-2/+1
* | | | | | | Merge pull request #3033 from matrix-org/erikj/calculate_state_metricsErik Johnston2018-03-281-1/+38
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | CommentErik Johnston2018-03-271-4/+5
| * | | | | | Fix indentErik Johnston2018-03-271-1/+1
| * | | | | | CommentErik Johnston2018-03-271-0/+7
| * | | | | | Add counter metrics for calculating state deltaErik Johnston2018-03-271-1/+30
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #3017 from matrix-org/erikj/add_cache_control_headersErik Johnston2018-03-271-0/+1
|\ \ \ \ \ \
| * | | | | | Add Cache-Control headers to all JSON APIsErik Johnston2018-03-211-0/+1
* | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-03-261-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Bum version and changelogErik Johnston2018-03-261-1/+1
| * | | | | | Merge branch 'erikj/simplejson_replication' of github.com:matrix-org/synapse ...Erik Johnston2018-03-261-7/+9
| |\| | | | |
| * | | | | | Bump version and changelogErik Johnston2018-03-261-1/+1
| * | | | | | version bumpNeil Johnson2018-03-261-1/+1
| | |/ / / / | |/| | | |
* | | | | | 404 correctly on missing paths via NoResourceMatthew Hodgson2018-03-2312-24/+24
| |_|/ / / |/| | | |
* | | | | Merge pull request #3006 from matrix-org/erikj/state_iterErik Johnston2018-03-221-12/+12
|\ \ \ \ \
| * | | | | Fix s/iteriterms/itervaluesErik Johnston2018-03-221-1/+1
| * | | | | Use .iter* to avoid copies in StateHandlerErik Johnston2018-03-151-12/+12
| | |_|/ / | |/| | |
* | | | | Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse into developErik Johnston2018-03-221-1/+1
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | fix merge conflictsNeil Johnson2018-03-2029-46/+57
| |\ \ \
| * | | | Update __init__.pyNeil Johnson2018-03-191-1/+1
| * | | | Bump version number v0.27.0-rc1Erik Johnston2018-03-151-1/+1
| | |/ / | |/| |
* | | | Explicitly use simplejsonErik Johnston2018-03-201-7/+7
* | | | Fix replication after switch to simplejsonErik Johnston2018-03-191-2/+4
| |/ / |/| |
* | | Merge pull request #3005 from matrix-org/erikj/fix_cache_sizeErik Johnston2018-03-192-5/+16
|\ \ \
| * | | Add commentsErik Johnston2018-03-191-0/+7
| * | | Fix bug where state cache used lots of memoryErik Johnston2018-03-152-5/+9
| |/ /
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2018-03-1925-37/+34
|\ \ \
| * | | Remove wrong commentErik Johnston2018-03-161-1/+0
| * | | Bump version and changelogErik Johnston2018-03-151-1/+1
| * | | Replace ujson with simplejsonErik Johnston2018-03-1525-38/+37
* | | | spell out not to massively increase bcrypt roundsMatthew Hodgson2018-03-191-1/+3
* | | | Replace some ujson with simplejson to make it workErik Johnston2018-03-164-4/+5
| |/ / |/| |
* | | Register membership/state servlets in event_creatorErik Johnston2018-03-141-1/+13
* | | Merge pull request #2992 from matrix-org/erikj/implement_member_workreErik Johnston2018-03-144-4/+440
|\ \ \
| * | | Fix importsErik Johnston2018-03-142-7/+4
| * | | s/join/joined/ in notify_user_membership_changeErik Johnston2018-03-142-4/+4
| * | | Split RoomMemberWorkerHandler to separate fileErik Johnston2018-03-143-81/+104
| * | | Implement RoomMemberWorkerHandlerErik Johnston2018-03-134-2/+418
* | | | Merge pull request #2989 from matrix-org/erikj/profile_cache_masterErik Johnston2018-03-141-1/+4
|\ \ \ \
| * | | | Only update remote profile cache on masterErik Johnston2018-03-131-1/+4
* | | | | Merge pull request #2988 from matrix-org/erikj/split_profile_storeErik Johnston2018-03-142-24/+47
|\ \ \ \ \
| * | | | | Split up ProfileStoreErik Johnston2018-03-132-24/+47
| |/ / / /
* | | | | Merge pull request #2991 from matrix-org/erikj/fixup_rmErik Johnston2018-03-141-4/+4
|\ \ \ \ \
| * | | | | _remote_join and co take a requesterErik Johnston2018-03-131-4/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #2993 from matrix-org/erikj/is_blockedErik Johnston2018-03-141-13/+17
|\ \ \ \ \
| * | | | | Add is_blocked to worker storeErik Johnston2018-03-131-13/+17
| |/ / / /
* / / / / fix bug #2926 (loading all state for a given type from the DB if the state_ke...Matthew Hodgson2018-03-131-7/+27
|/ / / /
* | | | Merge pull request #2987 from matrix-org/erikj/split_room_member_handlerErik Johnston2018-03-132-100/+189
|\ \ \ \ | |/ / / |/| | |
| * | | Raise, don't return, exceptionErik Johnston2018-03-131-1/+1
| * | | Add missing param to docstringsErik Johnston2018-03-131-0/+3
| * | | Correct import orderErik Johnston2018-03-131-3/+3
| * | | Move user_*_room distributor stuff to master classErik Johnston2018-03-131-5/+50
| * | | Split RoomMemberHandler into base and master classErik Johnston2018-03-132-98/+139
* | | | Merge pull request #2978 from matrix-org/erikj/refactor_replication_layerErik Johnston2018-03-139-12/+12
|\ \ \ \
| * | | | s/replication_client/federation_client/Erik Johnston2018-03-138-9/+9
| * | | | s/replication_server/federation_serverErik Johnston2018-03-132-3/+3
* | | | | Merge pull request #2981 from matrix-org/erikj/factor_remote_leaveErik Johnston2018-03-131-22/+54
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_rem...Erik Johnston2018-03-1319-110/+146
| |\ \ \
| * | | | Add docstringErik Johnston2018-03-131-0/+26
| * | | | Factor out _remote_reject_invite in RoomMemberErik Johnston2018-03-131-22/+28
* | | | | Merge pull request #2979 from matrix-org/erikj/no_handlersErik Johnston2018-03-1319-91/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't build handlers on workers unnecessarilyErik Johnston2018-03-135-5/+0
| | |/ / | |/| |
| * | | Remove unused ReplicationLayerErik Johnston2018-03-132-59/+0
| * | | Split replication layer into twoErik Johnston2018-03-1312-27/+19
* | | | Merge pull request #2980 from matrix-org/erikj/rm_privErik Johnston2018-03-131-7/+7
|\ \ \ \
| * | | | Make functions private that can beErik Johnston2018-03-131-7/+7
| | |/ / | |/| |
* | | | Merge pull request #2982 from matrix-org/erikj/fix_extra_usersErik Johnston2018-03-132-5/+5
|\ \ \ \
| * | | | extra_users is actually a list of UserIDsErik Johnston2018-03-132-5/+5
| |/ / /
* | | | Merge pull request #2983 from matrix-org/erikj/rename_register_3pidErik Johnston2018-03-132-11/+25
|\ \ \ \
| * | | | Refactor get_or_register_3pid_guestErik Johnston2018-03-132-11/+25
| |/ / /
* | | | Merge pull request #2984 from matrix-org/erikj/fix_rest_regeixErik Johnston2018-03-131-1/+1
|\ \ \ \
| * | | | RoomMembershipRestServlet doesn't handle /forgetErik Johnston2018-03-131-1/+1
| |/ / /
* | | | Merge pull request #2975 from matrix-org/rav/measure_persist_eventsRichard van der Hoff2018-03-131-4/+5
|\ \ \ \
| * | | | Add Measure block for persist_eventsRichard van der Hoff2018-03-131-4/+5
| |/ / /
* | | | Merge pull request #2977 from matrix-org/erikj/replication_move_propsErik Johnston2018-03-134-22/+13
|\ \ \ \ | | |/ / | |/| |
| * | | Move property setting from ReplicationLayer to FederationBaseErik Johnston2018-03-134-22/+13
* | | | Fix docstring typesErik Johnston2018-03-131-2/+2
|/ / /
* / / Split out edu/query registration to a separate classErik Johnston2018-03-1310-60/+90
|/ /
* | Add transactional API to history purgeRichard van der Hoff2018-03-122-8/+134
* | Return an error when doing two purges on a roomRichard van der Hoff2018-03-121-3/+14
* | Merge pull request #2961 from matrix-org/rav/run_in_backgroundRichard van der Hoff2018-03-121-24/+29
|\ \
| * | Factor run_in_background out from preserve_fnRichard van der Hoff2018-03-081-24/+29
* | | Merge pull request #2965 from matrix-org/rav/request_loggingRichard van der Hoff2018-03-122-34/+96
|\ \ \
| * | | Add some docstrings to help figure this outRichard van der Hoff2018-03-091-2/+26
| * | | Add a metric which increments when a request is receivedRichard van der Hoff2018-03-092-2/+26
| * | | refactor JsonResourceRichard van der Hoff2018-03-091-32/+46
* | | | Fix up log messageErik Johnston2018-03-071-1/+1
* | | | Fix typoErik Johnston2018-03-071-2/+2
* | | | Fix race in sync when joining roomErik Johnston2018-03-073-30/+102
| |/ / |/| |
* | | Merge pull request #2949 from krombel/use_bcrypt_checkpwRichard van der Hoff2018-03-062-3/+5
|\ \ \
| * | | use bcrypt.checkpwKrombel2018-03-052-3/+5
* | | | Merge pull request #2946 from matrix-org/rav/timestamp_to_purgeRichard van der Hoff2018-03-063-12/+87
|\ \ \ \
| * | | | Provide a means to pass a timestamp to purge_historyRichard van der Hoff2018-03-053-12/+87
| |/ / /
* | | | Merge pull request #2948 from matrix-org/erikj/kill_as_syncErik Johnston2018-03-064-163/+14
|\ \ \ \
| * | | | Remove ability for AS users to call /events and /syncErik Johnston2018-03-054-163/+14
* | | | | Merge pull request #2947 from matrix-org/erikj/split_directory_storeErik Johnston2018-03-052-28/+30
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix cache invalidation on deletionErik Johnston2018-03-051-1/+4
| * | | | Split Directory storeErik Johnston2018-03-052-27/+26
| |/ / /
* | | | Merge pull request #2943 from matrix-org/rav/fix_find_first_stream_ordering_a...Richard van der Hoff2018-03-051-12/+71
|\ \ \ \ | |/ / / |/| | |
| * | | Test and fix find_first_stream_ordering_after_tsRichard van der Hoff2018-03-051-15/+53
| * | | Add find_first_stream_ordering_after_tsRichard van der Hoff2018-03-051-0/+21
* | | | Merge pull request #2934 from matrix-org/erikj/cache_fixErik Johnston2018-03-052-13/+15
|\ \ \ \
| * | | | Fix bug with delayed cache invalidation streamErik Johnston2018-03-022-13/+15
* | | | | Merge pull request #2929 from matrix-org/erikj/split_regististration_storeErik Johnston2018-03-052-72/+64
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Split registration storeErik Johnston2018-03-022-72/+64
* | | | | Add missing yield during 3pid signature checksErik Johnston2018-03-021-1/+1
|/ / / /
* | | | Merge pull request #2928 from matrix-org/erikj/read_marker_cachesErik Johnston2018-03-011-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Fix typo in getting replication account data processingErik Johnston2018-03-011-1/+1
* | | | Merge pull request #2925 from matrix-org/erikj/split_sig_fedErik Johnston2018-03-013-180/+152
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove unused DataStoreErik Johnston2018-03-011-1/+0
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_sig_fedErik Johnston2018-03-017-445/+428
| |\ \ \
| * | | | Stub out broken function only used for cacheErik Johnston2018-03-011-1/+3
| * | | | Split out SignatureStore and EventFederationStoreErik Johnston2018-03-013-174/+148
* | | | | Merge pull request #2927 from matrix-org/erikj/read_marker_cachesErik Johnston2018-03-014-5/+46
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fewer lies are betterErik Johnston2018-03-011-2/+2
| * | | | Improve caching for read_marker APIErik Johnston2018-03-013-3/+41
| * | | | Add some caches to help read marker APIErik Johnston2018-03-013-2/+5
| |/ / /
* | | | Merge pull request #2926 from matrix-org/erikj/member_handler_moveErik Johnston2018-03-0110-39/+51
|\ \ \ \ | |_|/ / |/| | |
| * | | Move back to hs.is_mineErik Johnston2018-03-011-7/+6
| * | | Move RoomMemberHandler out of HandlersErik Johnston2018-03-0110-44/+57
| |/ /
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_stre...Erik Johnston2018-03-016-225/+221
|\ \ \
| * \ \ Merge pull request #2923 from matrix-org/erikj/stream_ago_workerErik Johnston2018-03-013-80/+85
| |\ \ \
| | * | | Default stream_ordering_*_ago to NoneErik Johnston2018-03-011-2/+2
| | * | | Fix comment typoErik Johnston2018-03-011-1/+1
| | * | | Calculate stream_ordering_month_ago correctly on workersErik Johnston2018-03-013-80/+85
| | |/ /
| * | | Merge pull request #2922 from matrix-org/erikj/split_room_storeErik Johnston2018-03-012-135/+125
| |\ \ \
| | * | | Split up RoomStoreErik Johnston2018-03-012-135/+125
| | |/ /
| * | | Merge pull request #2921 from matrix-org/rav/unyielding_make_deferred_yieldableRichard van der Hoff2018-03-011-9/+11
| |\ \ \ | | |/ / | |/| |
| | * | Rewrite make_deferred_yieldable avoiding inlineCallbacksRichard van der Hoff2018-03-011-9/+11
* | | | Remove unused variablesErik Johnston2018-03-011-8/+1
* | | | Document abstract class and method betterErik Johnston2018-03-011-8/+13
* | | | Split out stream storeErik Johnston2018-03-013-210/+202
|/ / /
* | | Log in the correct placesErik Johnston2018-03-011-2/+4
* | | Don't do preserve_fn for every requestErik Johnston2018-03-011-1/+2
* | | Add some loggingErik Johnston2018-03-011-0/+2
* | | Make repl send_event idempotent and retry on timeoutsErik Johnston2018-03-011-6/+38
* | | Check event auth on the workerErik Johnston2018-03-011-16/+16
* | | Correctly send ratelimit and extra_users paramsErik Johnston2018-03-012-1/+15
* | | Fixup commentsErik Johnston2018-03-011-4/+4
* | | Calculate push actions on workerErik Johnston2018-02-283-26/+70
|/ /
* | Move storage functions for push calculationsErik Johnston2018-02-276-98/+101
* | Merge pull request #2904 from matrix-org/erikj/receipt_cache_invalidationErik Johnston2018-02-272-14/+16
|\ \
| * | Fix missing invalidations for receipt storageErik Johnston2018-02-212-14/+16
* | | Merge pull request #2903 from matrix-org/erikj/split_roommember_storeErik Johnston2018-02-272-207/+187
|\ \ \
| * \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_room...Erik Johnston2018-02-2313-594/+647
| |\ \ \
| * | | | Update copyrightErik Johnston2018-02-233-0/+3
| * | | | Split out RoomMemberStoreErik Johnston2018-02-212-206/+184
* | | | | Merge pull request #2901 from matrix-org/erikj/split_as_storesErik Johnston2018-02-272-37/+29
|\ \ \ \ \
| * | | | | Add commentErik Johnston2018-02-271-0/+4
| * | | | | Update copyrightErik Johnston2018-02-232-0/+2
| * | | | | Split AS storesErik Johnston2018-02-212-37/+23
| |/ / / /
* | | | | Merge pull request #2892 from matrix-org/erikj/batch_inserts_push_actionsErik Johnston2018-02-262-23/+46
|\ \ \ \ \
| * | | | | Update commentsErik Johnston2018-02-211-3/+4
| * | | | | Batch inserts into event_push_actions_stagingErik Johnston2018-02-202-23/+45
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/handle_unp...Erik Johnston2018-02-2615-687/+747
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_even...Erik Johnston2018-02-2312-507/+570
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #2902 from matrix-org/erikj/split_events_storeErik Johnston2018-02-233-370/+405
| | |\ \ \ \ \
| | | * | | | | Split EventsWorkerStore into separate fileErik Johnston2018-02-233-361/+401
| | | * | | | | Update copyrightErik Johnston2018-02-232-0/+2
| | | * | | | | Remove redundant clockErik Johnston2018-02-231-3/+0
| | | * | | | | _event_persist_queue shouldn't be in worker storeErik Johnston2018-02-231-4/+4
| | | | |/ / / | | | |/| | |
| | | * | | | Split out get_events and co into a worker storeErik Johnston2018-02-212-356/+352
| | * | | | | Merge pull request #2899 from matrix-org/erikj/split_pushersErik Johnston2018-02-232-13/+10
| | |\ \ \ \ \
| | | * | | | | Update copyrightErik Johnston2018-02-232-0/+2
| | | * | | | | Split PusherStoreErik Johnston2018-02-212-13/+8
| | | |/ / / /
| | * | | | | Merge pull request #2898 from matrix-org/erikj/split_push_rules_storeErik Johnston2018-02-233-45/+64
| | |\ \ \ \ \
| | | * | | | | Update copyrightErik Johnston2018-02-233-0/+3
| | | * | | | | Split PushRulesStoreErik Johnston2018-02-213-45/+61
| | | |/ / / /
| | * | | | | Merge pull request #2897 from matrix-org/erikj/split_account_dataErik Johnston2018-02-234-69/+74
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Update copyrightErik Johnston2018-02-233-0/+3
| | | * | | | Use absolute importsErik Johnston2018-02-233-5/+5
| | | * | | | Split AccountDataStore and TagStoreErik Johnston2018-02-214-67/+69
| | | |/ / /
| | * | | | Merge pull request #2893 from matrix-org/erikj/delete_from_staging_fedErik Johnston2018-02-211-9/+17
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Delete from push_actions_staging in federation tooErik Johnston2018-02-201-9/+17
| | | |/ /
| * | | | Update copyrightErik Johnston2018-02-232-0/+2
| * | | | Split out EventPushActionWorkerStoreErik Johnston2018-02-212-91/+76
| |/ / /