summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Protect password when registering using shared secretErik Johnston2016-07-052-7/+15
* Merge pull request #904 from matrix-org/dbkr/register_email_no_untrusted_id_s...David Baker2016-07-052-15/+29
|\
| * requestToken updateDavid Baker2016-06-302-15/+29
* | Merge pull request #906 from matrix-org/markjh/faster_events_aroundMark Haines2016-07-052-60/+102
|\ \
| * | Fix typoMark Haines2016-07-051-1/+1
| * | Make get_events_around more efficient on sqlite3Mark Haines2016-07-051-13/+49
| * | Use true/false for boolean parameter inclusive to avoid potential for sqli, a...Mark Haines2016-07-052-5/+7
| * | Use different SQL for postgres and sqlite3 for when using multicolumn indexesMark Haines2016-07-042-59/+59
| * | Use a query that postgresql optimises better for get_events_aroundMark Haines2016-07-041-12/+16
* | | Merge pull request #907 from KentShikama/pepperErik Johnston2016-07-052-2/+8
|\ \ \
| * | | Remove default password pepper stringKent Shikama2016-07-051-2/+1
| * | | Fix password configKent Shikama2016-07-052-3/+3
| * | | Fix pep8Kent Shikama2016-07-052-2/+3
| * | | Add comment to prompt changing of pepperKent Shikama2016-07-051-0/+1
| * | | Add pepper to password hashingKent Shikama2016-07-052-3/+8
|/ / /
* | | Merge pull request #905 from KentShikama/add-password-hashErik Johnston2016-07-042-3/+7
|\ \ \ | |/ / |/| |
| * | Fix style violationsKent Shikama2016-07-042-2/+4
| * | Use .get() instead of [] to access password_hashKent Shikama2016-07-041-1/+1
| * | Optionally include password hash in createUser endpointKent Shikama2016-07-032-3/+5
|/ /
* | code_style.rst: add link to sphinx examplesRichard van der Hoff2016-07-011-1/+3
* | code_style.rst: *fix* link to google styleRichard van der Hoff2016-07-011-1/+1
* | code_style.rst: add link to google styleRichard van der Hoff2016-07-011-2/+3
|/
* Merge pull request #903 from matrix-org/erikj/deactivate_userErik Johnston2016-06-303-0/+40
|\
| * Feature: Add deactivate account admin APIErik Johnston2016-06-303-0/+40
|/
* Merge pull request #902 from matrix-org/erikj/expire_mediaErik Johnston2016-06-297-21/+190
|\
| * Remove raceErik Johnston2016-06-291-11/+0
| * Implement purge_media_cache admin APIErik Johnston2016-06-295-20/+130
| * Track approximate last access time for remote mediaErik Johnston2016-06-294-1/+71
|/
* Merge pull request #900 from RickCogley/RickCogley-coturn-readme-2David Baker2016-06-281-7/+12
|\
| * Update turn-howto.rst to use git clone (2)Rick Cogley2016-06-281-1/+5
| * Update turn-howto.rst to use git cloneRick Cogley2016-06-281-1/+1
| * Remove double spacesRick Cogley2016-06-281-12/+11
| * Update to reflect new location at github. Rick Cogley2016-06-261-16/+18
* | Merge pull request #894 from matrix-org/dbkr/push_room_namingDavid Baker2016-06-287-121/+26
|\ \
| * \ Merge remote-tracking branch 'origin/develop' into dbkr/push_room_namingDavid Baker2016-06-243-4/+7
| |\ \
| * | | Remove room name & alias testDavid Baker2016-06-241-41/+0
| * | | even more pep8David Baker2016-06-241-0/+1
| * | | more pep8David Baker2016-06-241-1/+0
| * | | pep8David Baker2016-06-241-1/+0
| * | | Use similar naming we use in email notifs for pushDavid Baker2016-06-246-79/+26
* | | | remove vector.im from default secondary DS listMatthew Hodgson2016-06-271-1/+0
| |/ / |/| |
* | | Merge pull request #895 from matrix-org/markjh/jenkins_port_rangeMark Haines2016-06-243-4/+7
|\ \ \ | |/ / |/| |
| * | Fix the sytests to use a port-range rather than a port baseMark Haines2016-06-243-4/+7
|/ /
* | Merge branch 'master' into developMark Haines2016-06-232-27/+152
|\|
| * Merge pull request #889 from matrix-org/markjh/synctl_workersMark Haines2016-06-211-27/+151
| |\
| | * Optionally start or stop workers in synctl.Mark Haines2016-06-211-27/+151
| * | Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse v0.16.1Erik Johnston2016-06-2040-517/+617
| |\ \
| * | | point to the CAPTCHA docsMatthew Hodgson2016-06-121-0/+1
* | | | Merge pull request #892 from matrix-org/dbkr/email_notif_most_recentDavid Baker2016-06-231-4/+15
|\ \ \ \
| * | | | Actually we need to order these properlyDavid Baker2016-06-221-2/+12
| * | | | StyleDavid Baker2016-06-221-1/+1
| * | | | Put most recent 20 messages in notifDavid Baker2016-06-221-3/+4
|/ / / /
* | | | Merge pull request #843 from mweinelt/ldap3-rewriteErik Johnston2016-06-224-60/+249
|\ \ \ \
| * | | | Rework ldap integration with ldap3Martin Weinelt2016-06-224-60/+249
|/ / / /
* | | | Merge pull request #888 from matrix-org/markjh/content_repoMark Haines2016-06-213-132/+3
|\ \ \ \
| * | | | Remove the legacy v0 content upload API.Mark Haines2016-06-213-132/+3
| | |_|/ | |/| |
* | | | Merge pull request #887 from matrix-org/dbkr/notif_template_subs_failDavid Baker2016-06-211-1/+1
|\ \ \ \
| * | | | Fix substitution failure in mail templateDavid Baker2016-06-211-1/+1
|/ / / /
* | | | Merge pull request #879 from matrix-org/erikj/linearize_fed_serverErik Johnston2016-06-202-67/+78
|\ \ \ \ | |_|_|/ |/| | |
| * | | Linearize some federation endpoints based on (origin, room_id)Erik Johnston2016-06-172-67/+78
| |/ /
* | | Bump version and changelogErik Johnston2016-06-202-1/+16
* | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.1Erik Johnston2016-06-2018-355/+251
|\ \ \
| * \ \ Merge pull request #880 from matrix-org/markjh/registered_userMark Haines2016-06-174-27/+25
| |\ \ \ | | |/ / | |/| |
| | * | Add the create_profile method back since the tests use itMark Haines2016-06-171-0/+6
| | * | Add a comment on why we don't create a profile for upgrading usersMark Haines2016-06-171-0/+1
| | * | Remove registered_users from the distributor.Mark Haines2016-06-175-33/+24
| |/ /
| * | Merge pull request #878 from matrix-org/erikj/ujsonErik Johnston2016-06-171-1/+1
| |\ \
| | * | Disable responding with canonical json for federationErik Johnston2016-06-171-1/+1
| * | | Merge pull request #877 from matrix-org/erikj/frozen_defaultErik Johnston2016-06-172-1/+2
| |\ \ \
| | * | | Enable use_frozen_events in testsErik Johnston2016-06-171-0/+1
| | * | | Turn use_frozen_events off by defaultErik Johnston2016-06-171-1/+1
| | |/ /
| * | | Merge pull request #876 from matrix-org/erikj/sign_ownErik Johnston2016-06-172-12/+18
| |\ \ \
| | * | | Only re-sign our own eventsErik Johnston2016-06-172-12/+18
| | |/ /
| * | | Merge pull request #875 from matrix-org/markjh/email_formattingMark Haines2016-06-171-14/+15
| |\ \ \
| | * | | Fix ``KeyError: 'msgtype'``. Use ``.get``Mark Haines2016-06-171-14/+15
| |/ / /
| * / / Fix setting gc thresholds in the workersMark Haines2016-06-172-2/+4
| |/ /
| * | Merge pull request #874 from matrix-org/markjh/worker_configMark Haines2016-06-176-295/+181
| |\ \
| | * | Use worker_ prefixes for worker config, use existing support for multiple con...Mark Haines2016-06-165-79/+33
| | * | Access the event_cache_size directly from the server object.Mark Haines2016-06-165-21/+10
| | * | Access replication_url from the worker config directlyMark Haines2016-06-163-8/+6
| | * | Comment on what's going on in clobber_with_worker_configMark Haines2016-06-161-1/+12
| | * | Merge remote-tracking branch 'origin/develop' into markjh/worker_configMark Haines2016-06-1612-62/+140
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #873 from vt0r/bugfix/bcrypt-utf8-encodeErik Johnston2016-06-161-1/+1
| |\ \ \
| | * | | Fix TypeError in call to bcrypt.hashpwSalvatore LaMendola2016-06-161-1/+1
| * | | | Merge pull request #872 from matrix-org/erikj/preview_url_fixesErik Johnston2016-06-161-5/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Line lengthsErik Johnston2016-06-151-3/+3
| | * | | Handle floats as img widthsErik Johnston2016-06-151-1/+1
| | * | | Handle og props with not contentErik Johnston2016-06-151-1/+2
| |/ / /
| * | | Merge pull request #867 from matrix-org/markjh/enable_jenkins_synchrotronMark Haines2016-06-151-0/+1
| |\ \ \
| | * | | Enable testing the synchrotron on jenkinsMark Haines2016-06-101-0/+1
| * | | | Merge branch 'release-v0.16.1' of github.com:matrix-org/synapse into developErik Johnston2016-06-152-2/+28
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Update change log v0.16.1-rc1Erik Johnston2016-06-151-1/+2
* | | | | Bump version and changelogErik Johnston2016-06-152-2/+27
|/ / / /
* | | | Merge pull request #871 from matrix-org/erikj/linearize_state_fetch_on_pduErik Johnston2016-06-154-37/+58
|\ \ \ \
| * | | | Linearize fetching of gaps on incoming eventsErik Johnston2016-06-154-37/+58
|/ / / /
* | | | Merge pull request #870 from matrix-org/rav/work_around_tls_bugRichard van der Hoff2016-06-151-2/+26
|\ \ \ \
| * | | | Work around TLS bug in twistedRichard van der Hoff2016-06-151-2/+26
| | |_|/ | |/| |
* | | | Merge pull request #869 from matrix-org/erikj/backfill_fixErik Johnston2016-06-151-14/+16
|\ \ \ \
| * | | | Correctly mark backfilled events as backfilledErik Johnston2016-06-151-14/+16
|/ / / /
* | | | Merge pull request #868 from matrix-org/erikj/invalid_idErik Johnston2016-06-141-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Make get_domain_from_id throw SynapseError on invalid IDErik Johnston2016-06-141-1/+4
| | | * Add worker config moduleMark Haines2016-06-161-0/+71
| | | * Inline the synchrotron and pusher configs into the main configMark Haines2016-06-165-291/+154
| |_|/ |/| |
* | | Merge pull request #866 from bartekrutkowski/developErik Johnston2016-06-101-2/+2
|\ \ \
| * | | Change /bin/bash to /bin/sh in tox.iniBartek Rutkowski2016-06-101-2/+2
| |/ /
* | | Merge pull request #863 from matrix-org/markjh/load_configMark Haines2016-06-104-48/+126
|\ \ \ | |/ / |/| |
| * | Add function to load config without generating itMark Haines2016-06-094-48/+126
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-06-094-8/+20
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse v0.16.0Erik Johnston2016-06-09218-5459/+13401
| |\
| | * Change CHANGELOGErik Johnston2016-06-091-1/+1
| | * Bump version and changelogErik Johnston2016-06-092-1/+11
| * | Merge pull request #801 from ruma/readme-history-storageMatthew Hodgson2016-05-291-6/+7
| |\ \
| | * | Alter phrasing to clarify where info is stored.Jimmy Cuadra2016-05-291-6/+7
| |/ /
| * | Merge pull request #766 from sbts/patch-1Erik Johnston2016-05-091-1/+1
| |\ \
| | * | Fix Typo in README.rst s/Halp/Help/David2016-05-061-1/+1
| |/ /
| * | Merge pull request #728 from OlegGirko/systemd_env_fileErik Johnston2016-04-181-0/+1
| |\ \
| | * | Add environment file to systemd unit configuration.Oleg Girko2016-04-141-0/+1
| |/ /
* | | Merge pull request #862 from matrix-org/erikj/media_remote_errorErik Johnston2016-06-091-4/+10
|\ \ \
| * | | 502 on /thumbnail when can't contact remote serverErik Johnston2016-06-091-4/+10
* | | | Merge pull request #860 from negzi/bug_fix_get_or_create_userErik Johnston2016-06-092-8/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fix a bug caused by a change in auth_handler functionNegar Fazeli2016-06-082-8/+5
* | | | Merge pull request #861 from matrix-org/erikj/events_logErik Johnston2016-06-091-24/+21
|\ \ \ \ | |/ / / |/| | |
| * | | Remove redundant exception log in /eventsErik Johnston2016-06-091-24/+21
|/ / /
* | | Merge pull request #859 from matrix-org/erikj/public_room_performanceErik Johnston2016-06-081-16/+16
|\ \ \
| * | | Pull full state for each room all at onceErik Johnston2016-06-081-16/+16
* | | | Merge branch 'release-v0.16.0' of github.com:matrix-org/synapse into developErik Johnston2016-06-082-1/+28
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Update commit hash in changelog v0.16.0-rc2Erik Johnston2016-06-081-1/+1
| * | Bump version and changelog to v0.16.0-rc2Erik Johnston2016-06-082-1/+28
| * | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.16.0Erik Johnston2016-06-0822-398/+997
| |\ \
* | \ \ Merge pull request #857 from matrix-org/erikj/default_visibilityErik Johnston2016-06-081-2/+0
|\ \ \ \
| * | | | Don't make rooms visibile by defaultErik Johnston2016-06-081-2/+0
* | | | | Disable the synchrotron on jenkins until the sytest support lands (#855)Mark Haines2016-06-081-1/+2
|/ / / /
* | | | Fix up federation PublicRoomListErik Johnston2016-06-081-1/+1
* | | | Merge pull request #856 from matrix-org/erikj/fed_pub_roomsErik Johnston2016-06-082-5/+7
|\ \ \ \
| * | | | Log user that is making /publicRooms callsErik Johnston2016-06-081-0/+7
| * | | | Enable auth on federation PublicRoomListErik Johnston2016-06-081-5/+0
* | | | | Merge pull request #854 from matrix-org/erikj/federation_loggingErik Johnston2016-06-081-0/+19
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add some logging for when servers ask for missing eventsErik Johnston2016-06-081-0/+19
| | |/ / | |/| |
* | | | Merge pull request #853 from matrix-org/erikj/replication_noopErik Johnston2016-06-085-0/+15
|\ \ \ \ | |/ / / |/| | |
| * | | Don't hit DB for noop replications queriesErik Johnston2016-06-085-0/+15
|/ / /
* | | Merge pull request #850 from matrix-org/erikj/gc_thresholdErik Johnston2016-06-082-0/+28
|\ \ \
| * | | Add gc_threshold to pusher and synchrotronErik Johnston2016-06-072-0/+28
* | | | Merge pull request #852 from matrix-org/erikj/gc_metricsErik Johnston2016-06-081-0/+4
|\ \ \ \
| * | | | Don't track total objects as its too expensive to calculateErik Johnston2016-06-071-1/+0
| * | | | Record some more GC metricsErik Johnston2016-06-071-0/+5
* | | | | Merge pull request #851 from matrix-org/markjh/jenkins_synchrotronMark Haines2016-06-071-0/+84
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add script for running sytest with dendronMark Haines2016-06-071-0/+84
* | | | | Merge pull request #849 from matrix-org/erikj/gc_thresholdErik Johnston2016-06-074-6/+38
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Allow setting of gc.set_thresholdsErik Johnston2016-06-074-6/+38
| |/ / /
* | | | Merge pull request #848 from matrix-org/markjh/unusedIVMark Haines2016-06-074-54/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove dead code.Mark Haines2016-06-074-54/+0
|/ / /
* | | Merge pull request #847 from matrix-org/erikj/gc_tickErik Johnston2016-06-071-8/+6
|\ \ \
| * | | Also record number of unreachable objectsErik Johnston2016-06-071-2/+4
| * | | Change the way we do statsErik Johnston2016-06-071-7/+3
|/ / /
* | | Merge pull request #771 from matrix-org/erikj/gc_tickErik Johnston2016-06-071-0/+26
|\ \ \
| * | | Count number of GC collectsErik Johnston2016-05-161-5/+11
| * | | Add a commentErik Johnston2016-05-131-0/+5
| * | | Manually run GC on reactor tick.Erik Johnston2016-05-091-0/+15
* | | | Merge pull request #846 from matrix-org/markjh/user_joined_notifierMark Haines2016-06-071-8/+6
|\ \ \ \
| * | | | Notify users for events in rooms they join.Mark Haines2016-06-071-8/+6
|/ / / /
* | | | 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 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 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
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Change metric styleErik Johnston2016-06-031-5/+4
| * | | | | | Presence metrics. Change def of small deltaErik Johnston2016-06-031-5/+10
* | | | | | | 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
|/ / / / / /
* / / / / / Fix typoErik Johnston2016-06-031-1/+1
|/ / / / /
* | | | | 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
|\ \ \ \ \ \
| * | | | | | Use state to calculate get_users_in_roomErik Johnston2016-06-015-28/+45
* | | | | | | Merge pull request #809 from matrix-org/erikj/cache_receipts_in_roomErik Johnston2016-06-032-4/+32
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | Add get_users_with_read_receipts_in_room cacheErik Johnston2016-06-012-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
* | | | | | | Disable INCLUDE_ALL_UNREAD_NOTIFSErik Johnston2016-06-021-1/+2
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-20 12:52:59 +0000