summary refs log tree commit diff
path: root/synapse (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add pepper to password hashingKent Shikama2016-07-052-3/+8
* 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
* Feature: Add deactivate account admin APIErik Johnston2016-06-303-0/+40
* 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 #894 from matrix-org/dbkr/push_room_namingDavid Baker2016-06-286-80/+26
|\
| * 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 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-2033-504/+545
| |\ \
| * | | point to the CAPTCHA docsMatthew Hodgson2016-06-121-0/+1
* | | | 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
* | | | Rework ldap integration with ldap3Martin Weinelt2016-06-223-60/+248
* | | | 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 #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-201-1/+1
* | | 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-171-1/+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
| |/ /
* | | Fix ``KeyError: 'msgtype'``. Use ``.get``Mark Haines2016-06-171-14/+15
* | | Fix setting gc thresholds in the workersMark Haines2016-06-172-2/+4
|/ /
* | 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-1610-61/+112
|\ \
| * \ 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
| * | | 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
| |/ /
| * | Bump version and changelogErik Johnston2016-06-151-1/+1
| * | 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
| | |/
| * | 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 #863 from matrix-org/markjh/load_configMark Haines2016-06-102-45/+105
|\ \ \ | |/ / |/| |
| * | Add function to load config without generating itMark Haines2016-06-092-45/+105
* | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2016-06-091-1/+1
|\ \ \ | |/ / |/| / | |/
| * Bump version and changelogErik Johnston2016-06-091-1/+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-091-2/+2
|\ \ \ | |/ / |/| |
| * | Fix a bug caused by a change in auth_handler functionNegar Fazeli2016-06-081-2/+2
* | | 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-081-1/+1
|\ \ \ | |/ / |/| / | |/
| * Bump version and changelog to v0.16.0-rc2Erik Johnston2016-06-081-1/+1
* | Don't make rooms visibile by defaultErik Johnston2016-06-081-2/+0
* | 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
| |/
* / 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
* | 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 #849 from matrix-org/erikj/gc_thresholdErik Johnston2016-06-074-6/+38
|\|
| * Allow setting of gc.set_thresholdsErik Johnston2016-06-074-6/+38
* | Remove dead code.Mark Haines2016-06-074-54/+0
|/
* 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
* | Notify users for events in rooms they join.Mark Haines2016-06-071-8/+6
* | Fix AS retries, but with correct orderingErik Johnston2016-06-071-2/+2
* | Fix AS retriesErik Johnston2016-06-071-2/+2
* | 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
* | | 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
* | | 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
* | | 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-036-199/+74
|\ \
| * | Remove event fetching from DB threadsErik Johnston2016-06-036-199/+74
* | | 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-031-1/+1
|\ \
| * | Bump changelog and versionErik Johnston2016-06-031-1/+1
| * | Merge branch 'release-v0.15.0' of github.com:matrix-org/synapse into release-...Erik Johnston2016-06-031-1/+1
| |\ \
| | * | Bump changelog and version v0.15.0-rc1Erik Johnston2016-04-261-1/+1
* | | | 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-0313-115/+187
| |\ \ \ \
| * | | | | 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
* | | | | | Move insert_client_ip to a separate classMark Haines2016-06-032-45/+71
| |_|/ / / |/| | | |
* | | | | Fix typoErik Johnston2016-06-031-1/+1
|/ / / /
* | | | Merge branch 'develop' into matthew/brand-from-headerMatthew Hodgson2016-06-0334-193/+680
|\ \ \ \
| * \ \ \ 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-037-57/+72
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Change CacheMetrics to be quickerErik Johnston2016-06-037-57/+72
| | |/ / /
| * | | | 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-022-29/+37
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribeDavid Baker2016-06-028-554/+806
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribeDavid Baker2016-06-0212-24/+38
| | |\ \ \ \ \ \
| | * | | | | | | 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-021-28/+36
| |_|/ / / / |/| | | | |
* | | | | | 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-023-13/+167
* | | | | | Merge pull request #817 from matrix-org/dbkr/split_out_auth_handlerDavid Baker2016-06-028-13/+17
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Split out the auth handlerDavid Baker2016-06-028-13/+17
* | | | | | 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
* | | | | | | 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
| |_|/ / / / / |/| | | | | |
* | | | | | | 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
|\ \ \ \ \ \
| * | | | | | Force booleanErik Johnston2016-05-311-1/+2
* | | | | | | Merge pull request #806 from matrix-org/erikj/hash_cacheErik Johnston2016-06-011-9/+16
|\ \ \ \ \ \ \
| * | | | | | | Cache get_event_reference_hashesErik Johnston2016-05-311-9/+16
| | |_|_|/ / / | |/| | | | |
* | | | | | | Fix room list spideringDavid Baker2016-06-011-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #808 from matrix-org/dbkr/room_list_spiderDavid Baker2016-06-016-3/+151
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/develop' into dbkr/room_list_spiderDavid Baker2016-06-019-48/+58
| |\ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | Limit number of notifications in an email notificationDavid Baker2016-06-011-2/+4
| |/ / / / / / |/| | | | | |
* | | | | | | 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
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Fix typoErik Johnston2016-05-311-1/+1
| * | | | | | Change fixErik Johnston2016-05-312-5/+8
| * | | | | | Fix GET /push_rulesErik Johnston2016-05-311-0/+3
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #804 from matrix-org/erikj/push_rules_cacheErik Johnston2016-05-312-9/+15
|\| | | | |
| * | | | | Add caches to bulk_get_push_rules*Erik Johnston2016-05-312-9/+15
* | | | | | Move the AS handler out of the Handlers object.Mark Haines2016-05-316-35/+33
| |/ / / / |/| | | |
* | | | | 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
| |/ / /
* | | | Check for presence of 'avatar_url' keyDavid Baker2016-05-241-1/+3
* | | | Merge pull request #799 from matrix-org/matthew/quieter-email-notifsDavid Baker2016-05-243-23/+72
|\ \ \ \
| * | | | catch thinko in presentable namesMatthew Hodgson2016-05-231-4/+15
| * | | | fix NPE in room orderingMatthew Hodgson2016-05-231-2/+2
| * | | | 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
| |/ / /
* / / / Fix set profile error with Requester.Negi Fazeli2016-05-231-4/+5
|/ / /
* | | 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
* | | | Move typing handler out of the Handlers objectMark Haines2016-05-175-25/+24
* | | | Move the functions for parsing app service configMark Haines2016-05-172-103/+109
* | | | Merge remote-tracking branch 'origin/develop' into markjh/liberate_sync_handlerMark Haines2016-05-175-25/+45
|\ \ \ \
| * | | | Merge pull request #786 from matrix-org/matthew/email_notifs_tuningMatthew Hodgson2016-05-172-9/+30
| |\| | |
| | * | | tune email notifs, fix CSS a bit, and add debugging detailsMatthew Hodgson2016-05-162-9/+30
| * | | | Remove unused get_joined_rooms_for_userMark Haines2016-05-171-15/+0
| * | | | Merge branch 'develop' into markjh/member_cleanupMark Haines2016-05-1713-36/+63
| |\ \ \ \
| | * \ \ \ Merge pull request #787 from matrix-org/markjh/liberate_presence_handlerMark Haines2016-05-1711-35/+48
| | |\ \ \ \
| | * \ \ \ \ 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-1611-35/+48
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |