summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-03-215-54/+39
|\
| * Merge pull request #2033 from matrix-org/erikj/repl_speedErik Johnston2017-03-215-54/+39
| |\
| | * Fix unit testErik Johnston2017-03-201-1/+1
| | * PEP8Erik Johnston2017-03-202-3/+0
| | * Don't send the full event json over replicationErik Johnston2017-03-174-50/+38
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-03-2119-163/+928
|\| |
| * | Merge pull request #2035 from matrix-org/rav/debug_federationRichard van der Hoff2017-03-211-1/+8
| |\ \
| | * | Add some debug to help diagnose weird federation issueRichard van der Hoff2017-03-201-1/+8
| |/ /
| * | Merge pull request #2026 from matrix-org/rav/logcontext_docsRichard van der Hoff2017-03-202-8/+449
| |\ \
| | * | log_contexts.rst: fix formatting of Note blockRichard van der Hoff2017-03-201-6/+6
| | * | log_contexts.rst: fix typosRichard van der Hoff2017-03-181-2/+2
| | * | Logcontext docsRichard van der Hoff2017-03-172-8/+449
| | |/
| * | Merge pull request #2027 from matrix-org/rav/logcontext_leaksRichard van der Hoff2017-03-2012-62/+147
| |\ \
| | * | Stop preserve_fn leaking context into the reactorRichard van der Hoff2017-03-183-34/+93
| | * | Run the reactor with the sentinel logcontextRichard van der Hoff2017-03-188-16/+51
| | * | Remove broken use of clock.call_laterRichard van der Hoff2017-03-181-12/+3
| | |/
| * | Merge pull request #2025 from matrix-org/rav/no_reset_state_on_rejectionsRichard van der Hoff2017-03-206-84/+278
| |\ \ | | |/ | |/|
| | * Avoid resetting state on rejected eventsRichard van der Hoff2017-03-172-4/+14
| | * Refactoring and cleanupsRichard van der Hoff2017-03-175-80/+264
| |/
| * Merge pull request #2016 from matrix-org/rav/queue_pdus_during_joinRichard van der Hoff2017-03-172-24/+69
| |\
| | * Queue up federation PDUs while a room join is in progressRichard van der Hoff2017-03-151-24/+44
| | * Implement reset_context_after_deferredRichard van der Hoff2017-03-151-0/+25
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-03-1611-54/+98
|\| |
| * | Merge pull request #2022 from matrix-org/erikj/no_op_syncErik Johnston2017-03-1610-52/+93
| |\ \
| | * | CommentsErik Johnston2017-03-162-2/+4
| | * | CommentErik Johnston2017-03-161-3/+8
| | * | Don't recreate so many setsErik Johnston2017-03-1610-51/+42
| | * | Implement no op for room stream in syncErik Johnston2017-03-161-4/+47
| |/ /
| * | Merge pull request #2014 from Half-Shot/hs/fix-appservice-presenceErik Johnston2017-03-152-2/+5
| |\ \
| | * | Modify test_user_sync so it doesn't look at last_active_ts over last_user_syn...Will Hunt2017-03-151-1/+1
| | * | Add a great comment to handle_timeout for active vs sync times.Will Hunt2017-03-151-0/+2
| | * | Add fallback to last_active_ts if it beats the last sync time.Will Hunt2017-03-151-1/+2
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-03-1514-59/+152
|\| | |
| * | | Merge pull request #2013 from matrix-org/erikj/presence_FASTERErik Johnston2017-03-157-53/+115
| |\ \ \
| | * | | CommentErik Johnston2017-03-151-1/+3
| | * | | Cache set of users whose presence the other user should seeErik Johnston2017-03-151-13/+27
| | * | | CommentErik Johnston2017-03-152-0/+6
| | * | | Remove unused importErik Johnston2017-03-151-1/+0
| | * | | Format presence events on the edges instead of reformatting them multiple timesErik Johnston2017-03-157-39/+80
| |/ / /
| * | | Merge pull request #1997 from matrix-org/dbkr/cas_partialdownloadDavid Baker2017-03-151-1/+8
| |\ \ \ | | |/ / | |/| |
| | * | Handle PartialDownloadError in CAS loginDavid Baker2017-03-141-1/+8
| * | | Merge pull request #2010 from matrix-org/rav/fix_txnq_wedgeRichard van der Hoff2017-03-156-5/+29
| |\ \ \
| | * | | Fix assertion to stop transaction queue getting wedgedRichard van der Hoff2017-03-156-5/+29
| |/ / /
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-03-151-0/+6
|\| | |
| * | | Merge pull request #2008 from matrix-org/erikj/notifier_statsErik Johnston2017-03-151-0/+6
| |\ \ \
| | * | | Add some metrics on notifierErik Johnston2017-03-151-0/+6
| |/ / /
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-03-1536-317/+1082
|\| | |
| * | | Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2Erik Johnston2017-03-159-50/+412
| |\ \ \
| | * | | Use extend instead of +=David Baker2017-03-141-4/+4
| | * | | Oops, remove printDavid Baker2017-03-141-1/+0
| | * | | Fix registration for broken clientsDavid Baker2017-03-131-4/+22
| | * | | Support registration / login with phone numberDavid Baker2017-03-139-50/+395
| * | | | Merge pull request #1992 from matrix-org/rav/fix_media_loopRichard van der Hoff2017-03-144-24/+121
| |\ \ \ \
| | * | | | kick jenkinsRichard van der Hoff2017-03-140-0/+0
| | * | | | Address review commentsRichard van der Hoff2017-03-142-20/+31
| | * | | | re-refactor exception heirarchyRichard van der Hoff2017-03-141-16/+14
| | * | | | Fix routing loop when fetching remote mediaRichard van der Hoff2017-03-134-14/+102
| | | |_|/ | | |/| |
| * | | | Merge pull request #2002 from matrix-org/erikj/dont_sync_by_defaultErik Johnston2017-03-141-13/+31
| |\ \ \ \
| | * | | | Reduce spurious calls to generate syncErik Johnston2017-03-141-13/+31
| | | |_|/ | | |/| |
| * | | | Merge pull request #1989 from matrix-org/erikj/public_list_speedErik Johnston2017-03-147-33/+76
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_lis...Erik Johnston2017-03-1426-592/+492
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1996 from matrix-org/erikj/fix_current_stateErik Johnston2017-03-141-3/+28
| |\ \ \ \
| | * | | | Fix current_state_events table to not lieErik Johnston2017-03-141-3/+28
| |/ / / /
| * | | | Merge pull request #1993 from matrix-org/luke/delete-devicesLuke Barnard2017-03-144-0/+139
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Implement _simple_delete_many_txn, use it to delete devicesLuke Barnard2017-03-134-11/+101
| | * | | FlakeLuke Barnard2017-03-131-0/+2
| | * | | Implement delete_devices APILuke Barnard2017-03-131-0/+47
| | | |/ | | |/|
| * | | Merge pull request #1990 from matrix-org/rav/log_config_commentsRichard van der Hoff2017-03-132-7/+11
| |\ \ \ | | |/ / | |/| |
| | * | Bring example log config into line with defaultRichard van der Hoff2017-03-131-2/+4
| | * | Add helpful texts to logger config optionsRichard van der Hoff2017-03-131-5/+7
| * | | Merge pull request #1978 from matrix-org/rav/refactor_received_pduRichard van der Hoff2017-03-132-163/+207
| |\ \ \ | | |/ / | |/| |
| | * | Merge remote-tracking branch 'origin/develop' into rav/refactor_received_pduRichard van der Hoff2017-03-1322-423/+160
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1983 from matrix-org/rav/no_redirect_stdioRichard van der Hoff2017-03-139-14/+38
| |\ \ \
| | * | | Add an option to disable stdio redirectRichard van der Hoff2017-03-101-1/+12
| | * | | Refactor logger config for workersRichard van der Hoff2017-03-109-13/+26
| * | | | Merge pull request #1982 from matrix-org/rav/sighup_for_logconfigRichard van der Hoff2017-03-131-10/+19
| |\ \ \ \
| | * | | | Reread log config on SIGHUPRichard van der Hoff2017-03-101-10/+19
| | |/ / /
| | | * | Move FederationServer._handle_new_pdu to FederationHandlerRichard van der Hoff2017-03-092-198/+198
| | | * | Move sig check out of _handle_new_pduRichard van der Hoff2017-03-091-12/+36
| | | * | Factor _get_missing_events_for_pdu out of _handle_new_pduRichard van der Hoff2017-03-091-62/+82
| | |/ /
| | | * Add new storage function to slave storeErik Johnston2017-03-131-0/+4
| | | * CommentsErik Johnston2017-03-131-0/+12
| | | * Assume rooms likely haven't changedErik Johnston2017-03-132-8/+14
| | | * Get current state by using current_state_events tableErik Johnston2017-03-105-31/+52
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-03-1314-401/+104
|\| | |
| * | | Revert "Support registration & login with phone number"Erik Johnston2017-03-139-395/+50
| | |/ | |/|
| * | Merge pull request #1976 from matrix-org/erikj/device_delete_syncErik Johnston2017-03-103-4/+46
| |\ \
| | * | Fix it for the workersErik Johnston2017-03-101-0/+8
| | * | Noop repated delete device inbox calls from /syncErik Johnston2017-03-102-4/+38
| |/ /
| * / Add setdefault key to ExpiringCacheErik Johnston2017-03-101-0/+7
| |/
| * Fix docstringRichard van der Hoff2017-03-091-2/+1
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-03-099-50/+395
|\|
| * Merge pull request #1971 from matrix-org/dbkr/msisdn_signinDavid Baker2017-03-099-50/+395
| |\
| | * Comment when our 3pids would be incompleteDavid Baker2017-03-081-0/+2
| | * DocsDavid Baker2017-03-081-0/+13
| | * Incorrectly copied copyrightDavid Baker2017-03-081-1/+0
| | * Not any more, it doesn'tDavid Baker2017-03-081-1/+0
| | * Better error messageDavid Baker2017-03-081-1/+3
| | * pep8David Baker2017-03-082-1/+2
| | * Add msisdn util fileDavid Baker2017-03-081-0/+27
| | * Pull out datastore in initialiserDavid Baker2017-03-081-5/+10
| | * Minor fixes from PR feedbackDavid Baker2017-03-082-5/+3
| | * Fix log lineDavid Baker2017-03-081-1/+1
| | * TyposDavid Baker2017-03-081-2/+2
| | * Refector out assert_params_in_requestDavid Baker2017-03-083-37/+27
| | * Factor out msisdn canonicalisationDavid Baker2017-03-084-41/+11
| | * Fix pep8David Baker2017-03-084-7/+7
| | * Support new login formatDavid Baker2017-03-071-6/+91
| | * Add msisdns as 3pids during registrationDavid Baker2017-03-031-0/+47
| | * Just return the deferred straight offDavid Baker2017-03-011-4/+2
| | * Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signinDavid Baker2017-03-0141-193/+816
| | |\
| | * | WIP support for msisdn 3pid proxy methodsDavid Baker2017-02-146-19/+228
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-03-096-62/+180
|\| | |
| * | | Remove spurious SQL logging (#1972)Richard van der Hoff2017-03-081-8/+0
| * | | Merge pull request #1969 from matrix-org/erikj/get_distinct_devicesErik Johnston2017-03-061-1/+1
| |\ \ \
| | * | | Select distinct devices from DBErik Johnston2017-03-061-1/+1
| |/ / /
| * | | Merge pull request #1964 from matrix-org/erikj/device_list_update_fixErik Johnston2017-03-031-47/+123
| |\ \ \
| | * | | Don't keep around old stream IDs foreverErik Johnston2017-03-031-2/+9
| | * | | SpellingErik Johnston2017-03-031-2/+2
| | * | | Fix device list update to not constantly resyncErik Johnston2017-03-011-46/+115
| * | | | Merge pull request #1963 from matrix-org/erikj/delete_old_device_streamsErik Johnston2017-03-032-0/+34
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix upErik Johnston2017-03-032-8/+8
| | * | | Add index to device_lists_streamErik Johnston2017-03-013-4/+28
| | * | | Clobber old device list stream entriesErik Johnston2017-03-011-0/+10
| | |/ /
| * | | kick jenkinsPaul "LeoNerd" Evans2017-03-010-0/+0
| * | | Merge pull request #1960 from matrix-org/paul/sytest-integrationPaul Evans2017-03-012-6/+22
| |\ \ \ | | |/ / | |/| |
| | * | Added also a control script to run via the crazy dendron+haproxy hybrid we're...Paul "LeoNerd" Evans2017-02-281-0/+22
| | * | No longer need to request all the sub-components to be split when running syt...Paul "LeoNerd" Evans2017-02-281-6/+0
| |/ /
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-02-281-1/+3
|\| |
| * | Don't log unknown cache warnings in workersErik Johnston2017-02-281-1/+3
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-02-283-4/+19
|\| |
| * | Merge pull request #1959 from matrix-org/erikj/intern_onceErik Johnston2017-02-281-3/+2
| |\ \
| | * | Intern table column names onceErik Johnston2017-02-281-3/+2
| * | | Merge pull request #1957 from matrix-org/device_poke_indexErik Johnston2017-02-282-1/+17
| |\ \ \ | | |/ / | |/| |
| | * | Add stream_id index to device_lists_outbound_pokesErik Johnston2017-02-282-1/+17
| |/ /
* | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-02-285-3/+19
|\| |
| * | Fix up txn nameErik Johnston2017-02-281-1/+1
| * | Pop with default value to stop throwingErik Johnston2017-02-281-1/+1
| * | merge in right archlinux package, thanks to @saram-kon from https://github.co...Matthew Hodgson2017-02-281-1/+1
| * | Merge pull request #1955 from matrix-org/erikj/current_state_query_bypassErik Johnston2017-02-271-0/+15
| |\ \
| | * | Remove needless checkErik Johnston2017-02-271-2/+0
| | * | It should be allErik Johnston2017-02-271-1/+1
| | * | Don't fetch current state in common caseErik Johnston2017-02-271-0/+17
| * | | Pop rather than del from dictErik Johnston2017-02-271-1/+1
| |/ /
| * | Merge pull request #1904 from Pneumaticat/patch-1Erik Johnston2017-02-271-0/+1
| |\ \
| | * | Fix typoKevin Liu2017-02-111-1/+1
| | * | Fix synapse_port_db failure (fixes #1902)Kevin Liu2017-02-111-0/+1
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes 2017-02-27Erik Johnston2017-02-275-51/+84
|\| | |
| * | | Merge pull request #1954 from matrix-org/erikj/cache_device2Erik Johnston2017-02-271-45/+73
| |\ \ \
| | * | | Cache get_user_devices_from_cacheErik Johnston2017-02-271-45/+73
| * | | | Merge pull request #1951 from enckse/developMatthew Hodgson2017-02-271-3/+2
| |\ \ \ \
| | * | | | the aur package is no longer there, community package in arch does existSean Enck2017-02-271-3/+2
| |/ / / /
| * | | | Merge pull request #1945 from jkolo/fix_dynamic_thumbnails_aspectErik Johnston2017-02-271-0/+3
| |\ \ \ \
| | * | | | Fix dynamic thumbnails aspectJurek2017-02-241-0/+3
| * | | | | Merge pull request #1939 from matrix-org/erikj/strip_sql_newlinesErik Johnston2017-02-231-0/+6
| |\ \ \ \ \
| | * | | | | Strip newlines from SQL queriesErik Johnston2017-02-231-0/+6
| |/ / / / /
| * | | | | Remove lock from rotate notifsErik Johnston2017-02-221-3/+0
| * | | | | Ensure we pass positive ints to delay functionErik Johnston2017-02-221-1/+2
| | |/ / / | |/| | |
* | | | | Local changes 2017-02-27-beforeMatrix2017-02-247-7/+16
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-02-2110-26/+148
|\| | | |
| * | | | Store looping callErik Johnston2017-02-211-1/+3
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-02-212-1/+8
| |\ \ \ \
| | * \ \ \ Merge branch 'release-v0.19.2' of github.com:matrix-org/synapse v0.19.2Erik Johnston2017-02-214-4/+13
| | |\ \ \ \
| | | * | | | Bump version and changelog github/release-v0.19.2 release-v0.19.2Erik Johnston2017-02-212-1/+8
| | | * | | | Remove unused paramErik Johnston2017-02-202-2/+1
| | | * | | | Fix /context/ visibiltiy rulesErik Johnston2017-02-201-1/+4
| | |/ / / /
| * | | | | Merge pull request #1930 from matrix-org/rav/fix_txnq_raceRichard van der Hoff2017-02-211-9/+21
| |\ \ \ \ \
| | * | | | | Fix a race in transaction queueRichard van der Hoff2017-02-201-9/+21
| |/ / / / /
| * | | | | Merge pull request #1929 from matrix-org/erikj/context_fixErik Johnston2017-02-202-3/+5
| |\ \ \ \ \
| | * | | | | Remove unused paramErik Johnston2017-02-202-2/+1
| | * | | | | Fix /context/ visibiltiy rulesErik Johnston2017-02-201-1/+4
| * | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2017-02-201-11/+21
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Update metrics-howto.rstRichard van der Hoff2017-02-191-0/+2
| | * | | | Update metrics-howto.rstRichard van der Hoff2017-02-191-12/+18
| | * | | | Update metrics-howto.rstRichard van der Hoff2017-02-191-2/+4
| * | | | | Fix up notif rotationErik Johnston2017-02-181-14/+22
| * | | | | Merge pull request #1926 from matrix-org/rav/example_log_configRichard van der Hoff2017-02-171-0/+48
| |\ \ \ \ \
| | * | | | | Update example_log_config.yamlRichard van der Hoff2017-02-171-1/+1
| | * | | | | Add an example log_config fileRichard van der Hoff2017-02-171-0/+48
| * | | | | | Merge pull request #1925 from matrix-org/dbkr/pushers_lang_lengthenDavid Baker2017-02-171-0/+39
| |\ \ \ \ \ \
| | * | | | | | Use TEXT rather than VARCHARDavid Baker2017-02-171-6/+6
| | * | | | | | Make the pushers lang field column longerDavid Baker2017-02-171-0/+39
| * | | | | | | Merge pull request #1922 from matrix-org/dbkr/allow_forget_for_banDavid Baker2017-02-171-1/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Allow forgetting rooms you're banned fromDavid Baker2017-02-151-1/+3
* | | | | | | | Don't limit countErik Johnston2017-02-211-2/+2
* | | | | | | | Fix up notif rotationErik Johnston2017-02-181-14/+22
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-02-169-81/+460
|\| | | | | | |
| * | | | | | | Merge pull request #1923 from matrix-org/erikj/push_action_compressErik Johnston2017-02-161-11/+50
| |\ \ \ \ \ \ \
| | * | | | | | | CommentErik Johnston2017-02-161-1/+4
| | * | | | | | | CommentErik Johnston2017-02-161-7/+14
| | * | | | | | | Store the default push actions in a more efficient mannerErik Johnston2017-02-161-11/+40
| |/ / / / / / /
| * | | | | | | Merge pull request #1916 from matrix-org/erikj/push_actions_deleteErik Johnston2017-02-165-57/+340
| |\ \ \ \ \ \ \
| | * | | | | | | Less aggressive timersErik Johnston2017-02-141-2/+2
| | * | | | | | | Aggregate event push actionsErik Johnston2017-02-145-57/+340
| * | | | | | | | Merge pull request #1921 from matrix-org/rav/fix_key_changesRichard van der Hoff2017-02-153-11/+58
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Fix bugs in the /keys/changes apiRichard van der Hoff2017-02-143-11/+58
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #1917 from matrix-org/dbkr/make_ban_reasons_workDavid Baker2017-02-141-0/+5
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Make kick & ban reasons workDavid Baker2017-02-141-0/+5
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #1873 from matrix-org/erikj/delete_push_actionsErik Johnston2017-02-141-3/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Be more agressive about purging old room event_push_actionsErik Johnston2017-02-011-3/+8
* | | | | | | Merge commit 'd7457c7661fa3b28427b21f44252c3abbee45ef8' of github.com:matrix-...Erik Johnston2017-02-154-8/+26
|\| | | | | |
| * | | | | | Merge pull request #1914 from matrix-org/erikj/cache_presenceErik Johnston2017-02-133-5/+15
| |\ \ \ \ \ \
| | * | | | | | Cache get_presence storageErik Johnston2017-02-133-5/+15
| * | | | | | | Merge pull request #1913 from matrix-org/kegan/dont-cache-errorsErik Johnston2017-02-131-3/+11
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Ordering is important on errbacks so add the cleanup func before creating an ...Kegan Dougal2017-02-131-7/+7
| | * | | | | | Pop the txn from the map in case it has already been deleted somehowKegan Dougal2017-02-131-1/+1
| | * | | | | | Don't cache errors at allKegan Dougal2017-02-131-10/+9
| | * | | | | | http txns: Do not cache error responsesKegan Dougal2017-02-131-1/+10
| |/ / / / / /
* | | | | | | Merge branch 'develop' into matrix-org-hotfixesErik Johnston2017-02-1512-12/+517
|\| | | | | |
| * | | | | | Merge pull request #1912 from matrix-org/markjh/roominitialsyncErik Johnston2017-02-132-0/+10
| |\ \ \ \ \ \
| | * | | | | | Add db functions needed for room initial sync to slaveMark Haines2017-02-132-0/+10
| * | | | | | | Merge pull request #1907 from andrewshadura/developErik Johnston2017-02-131-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Use signedjson.sign instead of syutil.crypto.jsonsignAndrew Shadura2017-02-131-1/+1
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #1906 from tyler-smith/TS_fix_config_documentationErik Johnston2017-02-131-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix typo in config comments.Tyler Smith2017-02-111-1/+1
| |/ / / / / /
| * | | | | | Merge pull request #1896 from DanielDent/patch-1Erik Johnston2017-02-091-3/+2
| |\ \ \ \ \ \
| | * | | | | | Update CAPTCHA_SETUP.rst X-Forwarded-For docsDaniel Dent2017-02-081-3/+2
| * | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-02-092-1/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| * | | | | | Make None check explicitErik Johnston2017-02-081-1/+1
| * | | | | | Merge pull request #1892 from matrix-org/erikj/rejection_fwd_extremErik Johnston2017-02-081-9/+6
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #1891 from matrix-org/dbkr/remove_unused_constantsDavid Baker2017-02-081-3/+0
| |\ \ \ \ \ \
| | * | | | | | Remove a few aspirational but unused constantsDavid Baker2017-02-081-3/+0
| |/ / / / / /
| * | | | | | Merge pull request #1784 from morteza-araby/user-adminErik Johnston2017-02-065-3/+502
| |\ \ \ \ \ \
| | * | | | | | admin,storage: added more administrator functionalitiesMorteza Araby2017-02-025-3/+502
| * | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-02-042-1/+76
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'master' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-02-093-10/+89
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'release-v0.19.1' of github.com:matrix-org/synapse v0.19.1Erik Johnston2017-02-093-10/+14
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Update version and changelog github/release-v0.19.1 release-v0.19.1Erik Johnston2017-02-092-1/+8
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Ignore new rejected events when working out forward extremeties.Erik Johnston2017-02-081-9/+6
| |/ / / / / /
| * | | | | | Merge branch 'release-v0.19.0' of github.com:matrix-org/synapse v0.19.0Erik Johnston2017-02-04102-1798/+3629
| |\ \ \ \ \ \
| | * | | | | | Bump changelog and version github/release-v0.19.0 release-v0.19.0Erik Johnston2017-02-042-1/+7
| | * | | | | | Bump changelog and version v0.19.0-rc4Erik Johnston2017-02-022-2/+8
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0Erik Johnston2017-02-023-4/+9
| | |\| | | | |
| | * | | | | | Bump version and changelog v0.19.0-rc3Erik Johnston2017-02-022-5/+14
| | * | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0Erik Johnston2017-02-0216-107/+135
| | |\ \ \ \ \ \
| | * | | | | | | Update changelog v0.19.0-rc2Erik Johnston2017-02-022-1/+7
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0Erik Johnston2017-02-023-5/+57
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Update changelog v0.19.0-rc1Erik Johnston2017-02-021-1/+1
| | * | | | | | | Bump version and changelogErik Johnston2017-02-022-1/+49
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-02-0217-110/+143
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #1879 from matrix-org/erikj/bump_cache_factorsErik Johnston2017-02-021-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bump cache sizes for common membership queriesErik Johnston2017-02-021-3/+3
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #1878 from matrix-org/erikj/device_measureErik Johnston2017-02-022-1/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Measure new device list stuffErik Johnston2017-02-022-1/+6
| |/ / / / / / /
| * | | | | | | Merge pull request #1877 from matrix-org/erikj/device_list_fixesErik Johnston2017-02-022-21/+23
| |\ \ \ \ \ \ \
| | * | | | | | | Use new get_users_who_share_room_with_userErik Johnston2017-02-021-11/+13
| | * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/device_lis...Erik Johnston2017-02-026-29/+42
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #1876 from matrix-org/erikj/shared_member_storeErik Johnston2017-02-026-29/+42
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Fix replicationErik Johnston2017-02-021-0/+3
| | * | | | | | | CommentErik Johnston2017-02-021-1/+4
generated by cgit-magenta 1.5.1 (git 2.48.1) at 2025-08-09 13:33:56 +0000