summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timings github/erikj/timings erikj/timingsErik Johnston2016-06-076-39/+97
|\
| * Fix AS retries, but with correct orderingErik Johnston2016-06-072-6/+6
| * Fix AS retriesErik Johnston2016-06-072-5/+5
| * Merge pull request #845 from matrix-org/markjh/synchrotron_presenceMark Haines2016-06-061-1/+4
| |\
| | * Fix a KeyError in the synchrotron presenceMark Haines2016-06-061-1/+4
| * | Merge pull request #844 from matrix-org/markjh/yield_on_sleepMark Haines2016-06-062-2/+2
| |\ \
| | * | Yield on the sleeps intended to backoff replicationMark Haines2016-06-062-2/+2
| | |/
| * | .values() returns list of setsErik Johnston2016-06-061-1/+2
| * | Merge pull request #842 from matrix-org/erikj/presence_timerErik Johnston2016-06-061-33/+37
| |\ \ | | |/ | |/|
| | * Fix typosErik Johnston2016-06-061-32/+36
| | * Fire after 30s not 8hErik Johnston2016-06-061-1/+1
| |/
| * Merge pull request #841 from matrix-org/erikj/event_counterErik Johnston2016-06-061-0/+9
| |\
| | * Add metric counter for number of persisted eventsErik Johnston2016-06-061-0/+9
| * | Merge pull request #840 from matrix-org/erikj/event_write_throughErik Johnston2016-06-061-0/+41
| |\ \ | | |/ | |/|
| | * Add events to cache when we persist themErik Johnston2016-06-061-0/+41
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timingsErik Johnston2016-06-068-254/+139
|\|
| * Merge pull request #836 from matrix-org/erikj/change_event_cacheErik Johnston2016-06-031-54/+59
| |\
| | * Don't rely on options when inserting event into cacheErik Johnston2016-06-031-40/+43
| | * Change the way we cache eventsErik Johnston2016-06-031-39/+41
| * | Merge pull request #837 from matrix-org/markjh/synchrotron_presence_listMark Haines2016-06-031-5/+10
| |\ \ | | |/ | |/|
| | * Fix spellingMark Haines2016-06-031-1/+1
| | * Add get_presence_list_accepted to the broken caches in synchrotronMark Haines2016-06-031-4/+9
| |/
| * Merge pull request #835 from matrix-org/erikj/get_event_txnErik Johnston2016-06-037-200/+75
| |\
| | * Remove event fetching from DB threadsErik Johnston2016-06-037-200/+75
* | | Merge remote-tracking branch 'origin/develop' into erikj/timingsDavid Baker2016-06-036-51/+673
|\| |
| * | Merge pull request #834 from matrix-org/dbkr/fix_email_fromDavid Baker2016-06-031-1/+1
| |\ \ | | |/ | |/|
| | * 3rd time lucky: we'd already calculated it aboveDavid Baker2016-06-031-3/+1
| | * Oops, we're using the dict formDavid Baker2016-06-031-1/+3
| | * Add substitutions to email notif FromDavid Baker2016-06-031-1/+1
| |/
| * Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into developErik Johnston2016-06-032-5/+91
| |\
| | * Note that v0.15.x was never released v0.16.0-rc1Erik Johnston2016-06-031-0/+2
| | * Bump changelog and versionErik Johnston2016-06-032-1/+51
| | * Merge branch 'release-v0.15.0' of github.com:matrix-org/synapse into release-...Erik Johnston2016-06-032-5/+39
| | |\
| | | * Bump changelog and version v0.15.0-rc1Erik Johnston2016-04-262-5/+39
| * | | Merge pull request #831 from matrix-org/markjh/synchrotronIIMark Haines2016-06-031-0/+510
| |\ \ \
| | * | | Clear the list of ongoing syncs on shutdownMark Haines2016-06-031-0/+9
| | * | | Appease flake8Mark Haines2016-06-031-1/+1
| | * | | Use ClientIpStore to record client ipsMark Haines2016-06-031-3/+4
| | * | | Merge branch 'develop' into markjh/synchrotronIIMark Haines2016-06-0314-128/+197
| | |\ \ \
| | * | | | Send updates to the syncing users every ten seconds or immediately if they've...Mark Haines2016-06-031-10/+43
| | * | | | Add a separate process that can handle /sync requestsMark Haines2016-06-031-0/+467
| * | | | | Merge pull request #832 from matrix-org/erikj/presence_coountErik Johnston2016-06-031-5/+9
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #833 from matrix-org/markjh/client_ipsMark Haines2016-06-032-45/+71
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Move insert_client_ip to a separate classMark Haines2016-06-032-45/+71
| |/ / / /
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timingsErik Johnston2016-06-031-1/+1
|\| | | |
| * | | | Fix typoErik Johnston2016-06-031-1/+1
* | | | | Merge branch 'erikj/presence_coount' of github.com:matrix-org/synapse into er...Erik Johnston2016-06-031-5/+4
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Change metric styleErik Johnston2016-06-031-5/+4
* | | | | Merge branch 'erikj/presence_coount' of github.com:matrix-org/synapse into er...Erik Johnston2016-06-031-5/+10
|\| | | |
| * | | | Presence metrics. Change def of small deltaErik Johnston2016-06-031-5/+10
| |/ / /
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timingsErik Johnston2016-06-0336-119/+677
|\| | |
| * | | Merge pull request #822 from matrix-org/matthew/brand-from-headerMatthew Hodgson2016-06-032-2/+9
| |\ \ \
| | * \ \ Merge branch 'develop' into matthew/brand-from-headerMatthew Hodgson2016-06-0335-206/+690
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'erikj/cache_perf' of github.com:matrix-org/synapse into developErik Johnston2016-06-032-10/+34
| |\ \ \ \
| | * | | | Pull out update_results_dictErik Johnston2016-06-031-8/+7
| | * | | | Small optimisation to CacheListDescriptorErik Johnston2016-06-033-14/+21
| | * | | | Make cachedList go a bit fasterErik Johnston2016-06-032-20/+46
| * | | | | Merge pull request #830 from matrix-org/erikj/metrics_perfErik Johnston2016-06-038-70/+82
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Change CacheMetrics to be quickerErik Johnston2016-06-038-70/+82
| | |/ / /
| * | | | Merge pull request #829 from matrix-org/erikj/poke_notifierErik Johnston2016-06-031-4/+7
| |\ \ \ \
| | * | | | Poke notifier on next reactor tickErik Johnston2016-06-031-4/+7
| | |/ / /
| * | | | Merge pull request #828 from matrix-org/erikj/joined_hosts_for_roomErik Johnston2016-06-031-16/+3
| |\ \ \ \
| | * | | | Make get_joined_hosts_for_room use get_users_in_roomErik Johnston2016-06-031-16/+3
| | |/ / /
| * | | | Merge pull request #827 from matrix-org/markjh/more_slaved_methodsMark Haines2016-06-033-6/+81
| |\ \ \ \
| | * | | | Add methods to events, account data and receipt slavesMark Haines2016-06-033-6/+81
| * | | | | Merge pull request #825 from matrix-org/erikj/cache_push_rulesErik Johnston2016-06-036-52/+71
| |\ \ \ \ \
| | * | | | | Load push rules in storage layer, so that they get cachedErik Johnston2016-06-035-44/+63
| | * | | | | Remove unnecessary setsErik Johnston2016-06-031-6/+3
| | * | | | | Only get local usersErik Johnston2016-06-032-3/+6
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #824 from matrix-org/markjh/slaved_presence_storeMark Haines2016-06-032-3/+62
| |\ \ \ \ \
| | * | | | | Add a slaved store for presenceMark Haines2016-06-032-3/+62
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #823 from matrix-org/markjh/more_slaved_storesMark Haines2016-06-034-0/+152
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add a comment explaining why the filter cache doesn't need exipiringMark Haines2016-06-031-0/+1
| | * | | | Add slaved stores for filters, tokens, and push rulesMark Haines2016-06-034-0/+151
| | |/ / /
| * | | | Merge pull request #811 from matrix-org/erikj/state_users_in_roomErik Johnston2016-06-035-28/+45
| |\ \ \ \
| * \ \ \ \ Merge pull request #809 from matrix-org/erikj/cache_receipts_in_roomErik Johnston2016-06-032-4/+32
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #821 from matrix-org/dbkr/email_unsubscribeDavid Baker2016-06-026-17/+125
| |\ \ \ \ \
| | * | | | | peppateDavid Baker2016-06-021-1/+3
| | * | | | | Working unsubscribe links going straight to the HSDavid Baker2016-06-024-6/+36
| | * | | | | Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into ...David Baker2016-06-023-31/+39
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribeDavid Baker2016-06-029-563/+813
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribeDavid Baker2016-06-0214-35/+44
| | |\ \ \ \ \ \ \
| | * | | | | | | | Email unsubscribing that may in theory, workDavid Baker2016-06-023-6/+22
| | * | | | | | | | WIP on unsubscribing email notifs without logging inDavid Baker2016-06-012-10/+70
| * | | | | | | | | Merge pull request #820 from matrix-org/dbkr/email_notif_string_fmt_errorDavid Baker2016-06-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Fix error in email notification string formattingDavid Baker2016-06-021-1/+1
| | | | | | | | * | brand the email from headerMatthew Hodgson2016-06-022-2/+9
| | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | add some branding debuggingMatthew Hodgson2016-06-021-0/+1
| |/ / / / / / /
| * | | / / / / Store the typing users as user_id strings. (#819)Mark Haines2016-06-022-30/+38
| | |_|/ / / / | |/| | | | |
| * | | | | | Fix setting the _clock in SQLBaseStoreMark Haines2016-06-021-0/+1
| * | | | | | Deduplicate presence entries in sync (#818)Mark Haines2016-06-021-0/+3
| * | | | | | Allow external processes to mark a user as syncing. (#812)Mark Haines2016-06-024-22/+174
| * | | | | | Merge pull request #817 from matrix-org/dbkr/split_out_auth_handlerDavid Baker2016-06-0210-24/+23
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Split out the auth handlerDavid Baker2016-06-0210-24/+23
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timingsErik Johnston2016-06-022-538/+609
|\| | | | | |
| * | | | | | Disable INCLUDE_ALL_UNREAD_NOTIFSErik Johnston2016-06-021-1/+2
| * | | | | | Merge pull request #800 from matrix-org/erikj/sync_refactorErik Johnston2016-06-021-537/+607
| |\ \ \ \ \ \
| | * | | | | | Change short circuit pathErik Johnston2016-05-241-16/+26
| | * | | | | | Don't send down all ephemeral eventsErik Johnston2016-05-241-1/+3
| | * | | | | | Only work out newly_joined_users for incremental syncErik Johnston2016-05-241-6/+9
| | * | | | | | Only include non-offline presence in initial syncErik Johnston2016-05-241-0/+3
| | * | | | | | Spell builder correctlyErik Johnston2016-05-241-63/+63
| | * | | | | | Inline function. Make load_filtered_recents privateErik Johnston2016-05-241-17/+7
| | * | | | | | Add commentsErik Johnston2016-05-241-7/+105
| | * | | | | | Shuffle things roomErik Johnston2016-05-241-37/+33
| | * | | | | | Add back concurrently_executeErik Johnston2016-05-231-25/+9
| | * | | | | | Refactor SyncHandlerErik Johnston2016-05-231-497/+481
* | | | | | | | Also log which state groups.Erik Johnston2016-06-021-0/+1
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timingsErik Johnston2016-06-023-3/+28
|\| | | | | | |
| * | | | | | | Merge pull request #814 from matrix-org/matthew/3pid_invite_authMatthew Hodgson2016-06-021-0/+18
| |\ \ \ \ \ \ \
| | * | | | | | | special case m.room.third_party_invite event auth to match invites, otherwise...Matthew Hodgson2016-06-011-0/+18
| * | | | | | | | if an email pusher specifies a brand param, use itMatthew Hodgson2016-06-022-3/+8
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #815 from matrix-org/dbkr/email_greeting_not_noneDavid Baker2016-06-021-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Use user_id in email greeting if display name is nullDavid Baker2016-06-021-0/+2
| |/ / / / / /
| * | | | | | Merge pull request #807 from matrix-org/erikj/push_rules_cacheErik Johnston2016-06-011-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #806 from matrix-org/erikj/hash_cacheErik Johnston2016-06-011-9/+16
| |\ \ \ \ \ \ \
* | | | | | | | | Poke notifier on next reactor tickErik Johnston2016-06-021-8/+11
* | | | | | | | | Make get_joined_hosts_for_room use get_users_in_roomErik Johnston2016-06-021-16/+3
* | | | | | | | | Small optimisation to CacheListDescriptorErik Johnston2016-06-022-2/+11
* | | | | | | | | Change CacheMetrics to be quickerErik Johnston2016-06-028-66/+74
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timingsErik Johnston2016-06-011-1/+1
|\| | | | | | | |
| * | | | | | | | Merge pull request #813 from matrix-org/dbkr/fix_room_list_spideringErik Johnston2016-06-011-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Fix room list spideringDavid Baker2016-06-011-1/+1
| |/ / / / / / /
* | | | | | | | Make cachedList go a bit fasterErik Johnston2016-06-012-20/+46
* | | | | | | | Remove unneeded timing log linesErik Johnston2016-06-012-35/+26
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/timingsErik Johnston2016-06-0122-60/+319
|\| | | | | | |
| * | | | | | | Merge pull request #808 from matrix-org/dbkr/room_list_spiderDavid Baker2016-06-017-3/+153
| |\ \ \ \ \ \ \
| | * | | | | | | Inject fake room list handler in testsDavid Baker2016-06-011-0/+2
| | * | | | | | | Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spiderDavid Baker2016-06-0112-53/+71
| | |\ \ \ \ \ \ \
| | * | | | | | | | pep8David Baker2016-06-011-1/+3
| | * | | | | | | | Add cache to remote room listsDavid Baker2016-05-311-4/+30
| | * | | | | | | | Add vector.im to default secondary_directory_servers and add comment explaini...David Baker2016-05-311-0/+4
| | * | | | | | | | Apparently I am not permitted to have two blank lines hereDavid Baker2016-05-311-1/+0
| | * | | | | | | | Basic, un-cached support for secondary_directory_serversDavid Baker2016-05-315-3/+68
| | * | | | | | | | Fix c+p failDavid Baker2016-05-311-17/+0
| | * | | | | | | | Add federation room list servletDavid Baker2016-05-312-1/+70
| * | | | | | | | | Merge pull request #810 from matrix-org/dbkr/limit_email_notifsDavid Baker2016-06-011-2/+4
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Limit number of notifications in an email notificationDavid Baker2016-06-011-2/+4
| |/ / / / / / / /
| * | | | | | | | handle emotes & notices correctly in email notifsMatthew Hodgson2016-05-312-2/+10
| * | | | | | | | Fix synapse/storage/schema/delta/30/as_users.pyMark Haines2016-05-311-2/+2
| * | | | | | | | Merge pull request #805 from matrix-org/erikj/push_rules_cacheErik Johnston2016-05-311-2/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #804 from matrix-org/erikj/push_rules_cacheErik Johnston2016-05-312-9/+15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #803 from matrix-org/markjh/liberate_appservice_handlerMark Haines2016-05-317-38/+36
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Move the AS handler out of the Handlers object.Mark Haines2016-05-317-38/+36
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #802 from matrix-org/dbkr/split_room_list_handlerDavid Baker2016-05-313-3/+7
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Split out the room list handlerDavid Baker2016-05-313-3/+7
| |/ / / / / / / / /
| * | | | | | | | | Fix to allow start with postgresErik Johnston2016-05-271-2/+7
| * | | | | | | | | Send down correct error response if user not foundErik Johnston2016-05-271-2/+7
| * | | | | | | | | Merge pull request #795 from matrix-org/dbkr/delete_push_actions_after_a_monthDavid Baker2016-05-244-7/+94
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove debug loggingDavid Baker2016-05-231-1/+0
| | * | | | | | | | | Oops, missing commaDavid Baker2016-05-201-1/+1
| | * | | | | | | | | Remove stale lineDavid Baker2016-05-201-2/+0
| | * | | | | | | | | Handle empty events tableDavid Baker2016-05-201-0/+3
| | * | | | | | | | | Make deleting push actions more efficientDavid Baker2016-05-203-13/+68
| | * | | | | | | | | Only delete push actions after 30 daysDavid Baker2016-05-202-6/+38
| | | |_|_|_|/ / / / | | |/| | | | | | |
* | | | | | | | | | Remove unnecessary setsErik Johnston2016-06-011-13/+9
* | | | | | | | | | Merge branch 'erikj/state_users_in_room' of github.com:matrix-org/synapse int...Erik Johnston2016-06-010-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Use state to calculate get_users_in_roomErik Johnston2016-06-015-28/+45
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Load push rules in storage layer, so that they get cachedErik Johnston2016-06-015-46/+63
* | | | | | | | | Only get local usersErik Johnston2016-06-012-3/+6
* | | | | | | | | Up max_etnriesErik Johnston2016-06-011-1/+1
* | | | | | | | | Up max_etnriesErik Johnston2016-06-011-1/+1
* | | | | | | | | Use state to calculate get_users_in_roomErik Johnston2016-06-015-23/+36
* | | | | | | | | Merge branch 'erikj/cache_receipts_in_room' of github.com:matrix-org/synapse ...Erik Johnston2016-06-012-6/+11
|\| | | | | | | |
| * | | | | | | | Add get_users_with_read_receipts_in_room cacheErik Johnston2016-06-012-4/+32
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Add get_users_with_read_receipts_in_room cacheErik Johnston2016-06-013-5/+41
* | | | | | | | Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into e...Erik Johnston2016-05-311-1/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Force booleanErik Johnston2016-05-311-1/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into e...Erik Johnston2016-05-311-1/+1
|\| | | | | |
| * | | | | | Fix typoErik Johnston2016-05-311-1/+1
* | | | | | | Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into e...Erik Johnston2016-05-312-5/+8
|\| | | | | |
| * | | | | | Change fixErik Johnston2016-05-312-5/+8
* | | | | | | Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into e...Erik Johnston2016-05-311-0/+3
|\| | | | | |
| * | | | | | Fix GET /push_rulesErik Johnston2016-05-311-0/+3
| |/ / / / /
* | | | | | Merge branch 'erikj/hash_cache' of github.com:matrix-org/synapse into erikj/t...Erik Johnston2016-05-311-9/+16
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Cache get_event_reference_hashesErik Johnston2016-05-311-9/+16
| |/ / / /
* | | | | Merge branch 'erikj/push_rules_cache' of github.com:matrix-org/synapse into e...Erik Johnston2016-05-312-10/+15
|\| | | |
| * | | | Add caches to bulk_get_push_rules*Erik Johnston2016-05-312-9/+15
| |/ / /
* | | | Time _get_rulesErik Johnston2016-05-311-22/+26
* | | | Time evaluator_for_eventErik Johnston2016-05-311-15/+23
* | | | Log duration of action generatorErik Johnston2016-05-311-7/+10
* | | | Add some crude measurement log linesErik Johnston2016-05-312-51/+76
|/ / /
* | | Check for presence of 'avatar_url' keyDavid Baker2016-05-241-1/+3
* | | tweak mail notifsMatrix2016-05-241-6/+8
* | | Merge pull request #799 from matrix-org/matthew/quieter-email-notifsDavid Baker2016-05-245-25/+79
|\ \ \
| * | | catch thinko in presentable namesMatthew Hodgson2016-05-231-4/+15
| * | | fix NPE in room orderingMatthew Hodgson2016-05-231-2/+2
| * | | fix debug textMatthew Hodgson2016-05-232-2/+7
| * | | consistency is the better part of valourMatthew Hodgson2016-05-231-1/+1
| * | | Tune email notifs to make them quieter:Matthew Hodgson2016-05-232-18/+56
* | | | Merge pull request #798 from negzi/bugfix_create_user_featureErik Johnston2016-05-242-13/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Fix set profile error with Requester.Negi Fazeli2016-05-232-13/+30
|/ / /
* / / Fix link to A-S specRichard van der Hoff2016-05-231-2/+1
|/ /
* | Merge pull request #794 from matrix-org/kegan/join-with-server-nameKegsay2016-05-191-1/+4
|\ \
| * | Allow clients to specify a server_name to avoid 'No known servers'Kegan Dougal2016-05-191-1/+4
|/ /
* | Merge pull request #793 from matrix-org/matthew/one-push-badge-per-convoMatthew Hodgson2016-05-181-1/+3
|\ \
| * | increment badge count per missed convo, not per msgMatthew Hodgson2016-05-181-1/+3
* | | Add desc to get_presence_for_usersErik Johnston2016-05-181-0/+1
* | | Merge pull request #792 from matrix-org/markjh/liberate_typing_handlerMark Haines2016-05-178-36/+27
|\ \ \
| * | | Move typing handler out of the Handlers objectMark Haines2016-05-178-36/+27
|/ / /
* | | Merge pull request #791 from matrix-org/markjh/app_service_configMark Haines2016-05-172-103/+109
|\ \ \
| * | | Move the functions for parsing app service configMark Haines2016-05-172-103/+109
|/ / /
* | | Merge pull request #790 from matrix-org/markjh/liberate_sync_handlerMark Haines2016-05-174-9/+11
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handlerMark Haines2016-05-177-25/+61
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #786 from matrix-org/matthew/email_notifs_tuningMatthew Hodgson2016-05-174-9/+46
|\ \ \ \ | | |/ / | |/| |
| * | | tweak textMatthew Hodgson2016-05-161-2/+2
| * | | tune email notifs, fix CSS a bit, and add debugging detailsMatthew Hodgson2016-05-164-9/+46
* | | | Merge pull request #789 from matrix-org/markjh/member_cleanupMark Haines2016-05-178-174/+37
|\ \ \ \
| * | | | Remove unused get_joined_rooms_for_userMark Haines2016-05-171-15/+0
| * | | | Merge branch 'develop' into markjh/member_cleanupMark Haines2016-05-1714-37/+64
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #787 from matrix-org/markjh/liberate_presence_handlerMark Haines2016-05-1712-36/+49
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #788 from matrix-org/markjh/domianMark Haines2016-05-176-19/+19
|\ \ \ \ \ \
* | | | | | | Fix emailpusher importDavid Baker2016-05-161-1/+11
* | | | | | | os.environ requires a stringErik Johnston2016-05-161-1/+1
* | | | | | | Merge pull request #785 from matrix-org/erikj/cache_factor_synctlyErik Johnston2016-05-161-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Make synctl read a cache factor from config fileErik Johnston2016-05-161-0/+4
| | | | | | * | Move SyncHandler out of the Handlers objectMark Haines2016-05-164-9/+11
| | | | | | * | Merge branch 'markjh/liberate_presence_handler' into markjh/liberate_sync_han...Mark Haines2016-05-1612-36/+49
| | | | | |/| | | | | | |/|/ / | | | | |/| | | | | |/| | |
| | | * | | | Don't inherit PresenceHandler from BaseHandler, remove references to self.hs ...Mark Haines2016-05-161-19/+21
| | | * | | | Move the presence handler out of the Handlers objectMark Haines2016-05-1612-18/+29
| |_|/ / / / |/| | | | |
| | | * | | Remove get_joined_rooms_for_user from RoomMemberHandlerMark Haines2016-05-163-11/+4
| | | * | | get_room_members is unused nowMark Haines2016-05-162-36/+0
| | | * | | Replaces calls to fetch_room_distributions_into with get_joined_hosts_for_roomMark Haines2016-05-165-112/+33
| | |/ / /
| | * / / Spell "domain" correctlyMark Haines2016-05-166-19/+19
| |/ / / |/| | |
* | | | Merge pull request #760 from matrix-org/matthew/preview_url_ip_whitelistMatthew Hodgson2016-05-164-42/+58
|\ \ \ \ | |/ / / |/| | |
| * | | Clean up the blacklist/whitelist handling.Mark Haines2016-05-163-41/+37
| * | | Merge branch 'develop' into matthew/preview_url_ip_whitelistMark Haines2016-05-1675-544/+3178
| |\ \ \ | |/ / / |/| | |
* | | | fix logoMatrix2016-05-131-1/+1
| |/ / |/| |
* | | rogue imgMatthew Hodgson2016-05-131-1/+0
* | | fix matrix.to URLsMatthew Hodgson2016-05-131-2/+2
* | | Assert that stream replicated stream positions are intsMark Haines2016-05-133-7/+7
* | | Merge pull request #780 from matrix-org/dbkr/email_notifs_on_pusherMark Haines2016-05-133-12/+43
|\ \ \
| * | | Manually expire broken caches like the who_forgot_in_roomMark Haines2016-05-131-0/+16
| * | | Use the SlavedAccountDataStoreMark Haines2016-05-131-10/+3
| * | | Merge branch 'develop' into dbkr/email_notifs_on_pusherMark Haines2016-05-1319-27/+511
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #783 from matrix-org/markjh/slave_account_dataMark Haines2016-05-132-0/+117
|\ \ \ \
| * | | | Add a slaved datastore for account dataMark Haines2016-05-132-0/+117
* | | | | Merge pull request #784 from matrix-org/markjh/receipts_fixMark Haines2016-05-131-4/+6
|\ \ \ \ \
| * | | | | Allow receipts for events we haven't seen in the dbMark Haines2016-05-131-4/+6
|/ / / / /
* | | | | Merge pull request #741 from negzi/create_user_with_expiryErik Johnston2016-05-1310-9/+301
|\ \ \ \ \
| * | | | | Create user with expiryNegi Fazeli2016-05-1310-9/+301
* | | | | | Merge pull request #778 from matrix-org/erikj/add_pusherErik Johnston2016-05-132-4/+17
|\ \ \ \ \ \
| * | | | | | SpellingErik Johnston2016-05-131-1/+1
| * | | | | | Fixup add_pusherErik Johnston2016-05-132-4/+17
* | | | | | | Merge pull request #769 from matrix-org/erikj/push_actions_deleteErik Johnston2016-05-132-9/+29
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into erikj/push_actio...Erik Johnston2016-05-0615-49/+433
| |\ \ \ \ \ \ \
| * | | | | | | | Delete old pushersErik Johnston2016-05-032-9/+29
* | | | | | | | | Merge pull request #779 from matrix-org/erikj/receiptsErik Johnston2016-05-131-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use tree cache for get_linearized_receipts_for_roomErik Johnston2016-05-131-3/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #782 from matrix-org/erikj/remove_indicesErik Johnston2016-05-131-0/+38
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-21 07:30:52 +0000