summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | raise NotImplementedErrorErik Johnston2017-07-131-5/+2
| | | * | | | | | CommentsErik Johnston2017-07-123-5/+79
| | | * | | | | | Simplify checking if adminErik Johnston2017-07-121-53/+19
| | | * | | | | | Add group summary APIsErik Johnston2017-07-124-2/+970
| | |/ / / / / /
| | * | | | | | Merge pull request #2352 from matrix-org/erikj/group_server_splitErik Johnston2017-07-1211-11/+1206
| | |\ \ \ \ \ \
| | | * | | | | | CommentErik Johnston2017-07-121-1/+1
| | | * | | | | | Move commentErik Johnston2017-07-111-2/+2
| | | * | | | | | Add federation API for adding room to groupErik Johnston2017-07-111-0/+18
| | | * | | | | | CommentErik Johnston2017-07-111-5/+8
| | | * | | | | | TypoErik Johnston2017-07-111-1/+1
| | | * | | | | | Rename column to attestation_jsonErik Johnston2017-07-112-5/+5
| | | * | | | | | CommentsErik Johnston2017-07-113-5/+9
| | | * | | | | | CommentErik Johnston2017-07-112-0/+26
| | | * | | | | | Remove u/ requirementErik Johnston2017-07-111-2/+3
| | | * | | | | | Lift out visibility parsingErik Johnston2017-07-111-20/+21
| | | * | | | | | CommentsErik Johnston2017-07-114-43/+132
| | | * | | | | | Initial group server implementationErik Johnston2017-07-1011-11/+1064
| * | | | | | | | Merge pull request #2501 from matrix-org/dbkr/channel_notificationsErik Johnston2017-10-113-7/+85
| |\ \ \ \ \ \ \ \
| | * | | | | | | | pep8David Baker2017-10-102-3/+5
| | * | | | | | | | Don't KeyError if no power_levels eventDavid Baker2017-10-101-1/+3
| | * | | | | | | | Use notification levels in power_levelsDavid Baker2017-10-103-12/+22
| | * | | | | | | | There was already a constant for thisDavid Baker2017-10-101-3/+4
| | * | | | | | | | More optimisationDavid Baker2017-10-101-6/+9
| | * | | | | | | | What year is it!? Who's the president!?David Baker2017-10-101-1/+1
| | * | | | | | | | Merge branch 'develop' into dbkr/channel_notificationsDavid Baker2017-10-107-107/+183
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Make be fasterDavid Baker2017-10-051-3/+3
| | * | | | | | | | | Add fastpath optimisationDavid Baker2017-10-051-3/+9
| | * | | | | | | | | pep8David Baker2017-10-051-0/+3
| | * | | | | | | | | They're called roomsDavid Baker2017-10-051-4/+4
| | * | | | | | | | | Get rule type rightDavid Baker2017-10-051-1/+1
| | * | | | | | | | | Support for channel notificationsDavid Baker2017-10-053-8/+59
| * | | | | | | | | | Merge pull request #2483 from jeremycline/unfreeze-ujson-dumpErik Johnston2017-10-111-1/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Unfreeze event before serializing with ujsonJeremy Cline2017-09-301-1/+2
| * | | | | | | | | | | Merge pull request #2490 from matrix-org/erikj/drop_left_room_eventsErik Johnston2017-10-103-0/+65
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix up commentErik Johnston2017-10-091-1/+2
| | * | | | | | | | | | Invalidate cacheErik Johnston2017-10-031-0/+3
| | * | | | | | | | | | Update commentsErik Johnston2017-10-032-1/+8
| | * | | | | | | | | | Remove spurious line feedErik Johnston2017-10-031-1/+0
| | * | | | | | | | | | Ignore incoming events for rooms that we have leftErik Johnston2017-10-032-0/+55
| * | | | | | | | | | | Merge pull request #2520 from matrix-org/rav/process_incoming_rooms_in_parallelRichard van der Hoff2017-10-101-19/+34
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | fed server: process PDUs for different rooms in parallelRichard van der Hoff2017-10-091-19/+34
| * | | | | | | | | | | | Merge pull request #2518 from matrix-org/rav/linearize_incoming_transactionsRichard van der Hoff2017-10-101-1/+29
| |\| | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fed server: use a linearizer for ongoing transactionsRichard van der Hoff2017-10-091-1/+29
* | | | | | | | | | | | Merge branch 'rav/fancy_logformatter' into matrix-org-hotfixesRichard van der Hoff2017-10-101-0/+43
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Fancy logformatter to format exceptions betterRichard van der Hoff2017-10-091-0/+43
* | | | | | | | | | | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2017-10-1020-130/+332
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #2517 from matrix-org/rav/fed_server_refactorRichard van der Hoff2017-10-091-24/+29
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | fed server: refactor on_incoming_transactionRichard van der Hoff2017-10-091-24/+29
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #2516 from matrix-org/rav/fix_fed_server_origin_checkRichard van der Hoff2017-10-091-24/+24
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fed server: Move origin-check code to _handle_received_pduRichard van der Hoff2017-10-091-24/+24
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #2508 from matrix-org/rav/federation_queue_logcontextsRichard van der Hoff2017-10-091-16/+32
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix up logcontext handling in (federation) TransactionQueueRichard van der Hoff2017-10-061-16/+32
| * | | | | | | | | | Merge pull request #2507 from matrix-org/rav/execute_concurrently_log_contextsRichard van der Hoff2017-10-091-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix logcontext handling for concurrently_executeRichard van der Hoff2017-10-061-2/+2
| | |/ / / / / / / / /
| * | | | | | | | | | Merge pull request #2506 from matrix-org/rav/unhandled_failureRichard van der Hoff2017-10-091-24/+21
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix up deferred handling in federation.pyRichard van der Hoff2017-10-061-24/+21
| |/ / / / / / / / /
| * | | | | | | | | some comments in the state res codeRichard van der Hoff2017-10-051-0/+13
| * | | | | | | | | Merge pull request #2502 from matrix-org/dbkr/allow_dms_to_adminsDavid Baker2017-10-053-8/+10
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Spam checking: add the invitee to user_may_inviteDavid Baker2017-10-053-8/+10
| |/ / / / / / / /
| * | | | | | | | Merge pull request #2500 from matrix-org/dbkr/fix_word_boundary_mentionsDavid Baker2017-10-051-2/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use better method for word boundary searchingDavid Baker2017-10-051-11/+3
| | * | | | | | | | pep8David Baker2017-10-051-0/+1
| | * | | | | | | | Fix notif kws that start/end with non-word charsDavid Baker2017-10-051-2/+21
| |/ / / / / / / /
| * | | | | | | | Merge pull request #2495 from matrix-org/dbkr/spam_check_room_creationDavid Baker2017-10-043-0/+73
| |\ \ \ \ \ \ \ \
| | * | | | | | | | spam check room publishingDavid Baker2017-10-042-0/+26
| | * | | | | | | | un-double indentDavid Baker2017-10-041-1/+1
| | * | | | | | | | Add room creation checks to spam checkerDavid Baker2017-10-043-0/+47
| |/ / / / / / / /
| * | | | | | | | Merge pull request #2492 from matrix-org/dbkr/spam_check_invitesDavid Baker2017-10-033-2/+39
| |\ \ \ \ \ \ \ \
| | * | | | | | | | s/roomid/room_id/David Baker2017-10-031-2/+2
| | * | | | | | | | pass room id tooDavid Baker2017-10-033-4/+6
| | * | | | | | | | Federation was passing strings anywayDavid Baker2017-10-031-1/+1
| | * | | | | | | | this shouldn't be debugDavid Baker2017-10-031-2/+2
| | * | | | | | | | better loggingDavid Baker2017-10-031-4/+9
| | * | | | | | | | Actually write warpper functionDavid Baker2017-10-031-0/+16
| | * | | | | | | | Skip spam check for admin usersDavid Baker2017-10-031-8/+8
| | * | | | | | | | Fix param name & lintDavid Baker2017-10-031-2/+4
| | * | | | | | | | Allow spam checker to reject invites tooDavid Baker2017-10-032-6/+18
| |/ / / / / / / /
| * | | | | | | | Merge pull request #2491 from matrix-org/rav/port_db_fixesRichard van der Hoff2017-10-031-4/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Drop search values with nul charactersRichard van der Hoff2017-10-021-4/+7
| * | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-10-025-13/+37
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Bump version and changelog v0.23.1Erik Johnston2017-10-022-1/+9
| | * | | | | | | Make 'affinity' package optionalErik Johnston2017-10-022-2/+17
| | * | | | | | | Move quit_with_errorErik Johnston2017-10-022-10/+11
| * | | | | | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-10-023-3/+10
| |\| | | | | | | | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse v0.23.0Erik Johnston2017-10-0252-859/+1833
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Bump version and change log github/release-v0.23.0 release-v0.23.0Erik Johnston2017-10-022-1/+7
| | * | | | | | Merge pull request #2464 from rnbdsh/patch-4Richard van der Hoff2017-09-251-2/+3
| | |\ \ \ \ \ \
| | | * | | | | | Start traditionally, stop synctlrnbdsh2017-09-241-1/+2
| | | * | | | | | Remove non-existing files, add stop, use synctlrnbdsh2017-09-241-2/+2
| | |/ / / / / /
| * | | | | | | Merge pull request #2480 from matrix-org/rav/federation_client_loggingRichard van der Hoff2017-09-291-7/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Improve logging of failures in matrixfederationclientRichard van der Hoff2017-09-281-7/+6
| * | | | | | | | Only log if we've removed mediaErik Johnston2017-09-281-2/+4
| |/ / / / / / /
| * | | | | | | Handle SERVFAILs when doing AAAA lookups for federation (#2477)Richard van der Hoff2017-09-281-5/+17
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-09-282-2/+4
|\| | | | | | |
| * | | | | | | Up the limits on number of url cache entries to delete at one timeErik Johnston2017-09-281-2/+2
| * | | | | | | Add old indicesErik Johnston2017-09-281-0/+2
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-09-2816-65/+477
|\| | | | | | |
| * | | | | | | Clear up expired url cache every 10sErik Johnston2017-09-281-1/+1
| * | | | | | | Actually assign result to variableErik Johnston2017-09-281-1/+1
| * | | | | | | Only pull out local media that were for url cacheErik Johnston2017-09-281-1/+1
| * | | | | | | Fix typo in url cache expiry timerErik Johnston2017-09-281-1/+1
| * | | | | | | Merge pull request #2479 from matrix-org/erikj/expire_url_cache_thumbnailsErik Johnston2017-09-281-31/+81
| |\ \ \ \ \ \ \
| | * | | | | | | Support new and old style media id formatsErik Johnston2017-09-281-31/+81
| * | | | | | | | Fix typoErik Johnston2017-09-281-3/+3
| * | | | | | | | Merge pull request #2478 from matrix-org/erikj/expire_url_cache_thumbnailsErik Johnston2017-09-285-12/+234
| |\| | | | | | | | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Change expires column to expires_tsErik Johnston2017-09-283-10/+29
| | * | | | | | More bracketsErik Johnston2017-09-281-1/+1
| | * | | | | | Delete expired url cache dataErik Johnston2017-09-285-5/+208
| |/ / / / / /
| * | | | | | Merge pull request #2476 from matrix-org/erikj/joined_members_authErik Johnston2017-09-282-13/+26
| |\ \ \ \ \ \
| | * | | | | | Fix /joined_members to work with AS usersErik Johnston2017-09-282-13/+26
| * | | | | | | Merge pull request #2475 from matrix-org/erikj/joined_members_authErik Johnston2017-09-272-10/+38
| |\| | | | | |
| | * | | | | | Fix bug where /joined_members didn't check user was in roomErik Johnston2017-09-272-10/+38
| |/ / / / / /
| * | | | | | Merge pull request #2474 from matrix-org/dbkr/spam_check_moduleDavid Baker2017-09-276-23/+74
| |\ \ \ \ \ \
| | * | | | | | Don't test is spam_checker not NoneDavid Baker2017-09-271-1/+7
| | * | | | | | Remove unintentional debuggingDavid Baker2017-09-271-1/+0
| | * | | | | | pep8David Baker2017-09-272-0/+2
| | * | | | | | Forgot the new file again :(David Baker2017-09-271-0/+35
| | * | | | | | Make the spam checker a moduleDavid Baker2017-09-265-23/+33
| * | | | | | | pep8David Baker2017-09-261-0/+1
| |/ / / / / /
| * | | | | | Merge pull request #2473 from matrix-org/dbkr/factor_out_module_loadingDavid Baker2017-09-262-12/+51
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | unnecessary parensDavid Baker2017-09-261-1/+1
| | * | | | | Add module_loader.pyDavid Baker2017-09-261-0/+41
| | * | | | | Factor out module loading to a separate placeDavid Baker2017-09-261-12/+10
| |/ / / / /
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.23.0 v0.23.0-rc2Erik Johnston2017-09-263-19/+39
| |\ \ \ \ \
| * | | | | | Bump changelog and versionErik Johnston2017-09-262-1/+9
* | | | | | | Disable presence some morehera2017-09-281-0/+1
* | | | | | | Actually block presenceErik Johnston2017-09-251-1/+1
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-09-254-19/+71
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #2470 from matrix-org/erikj/sync_speed_fixErik Johnston2017-09-251-5/+18
| |\ \ \ \ \ \
| | * | | | | | Refactor to speed up incremental syncsErik Johnston2017-09-251-5/+18
| |/ / / / / /
| * | | | | | Merge pull request #2468 from maxidor/developRichard van der Hoff2017-09-251-13/+20
| |\ \ \ \ \ \
| | * | | | | | Include review feedbackMax Dor2017-09-251-5/+3
| | * | | | | | Clarify recommended network setupMax Dor2017-09-251-15/+24
| |/ / / / / /
| * | | | | | Merge branch 'release-v0.23.0' of github.com:matrix-org/synapse into developErik Johnston2017-09-252-1/+33
| |\| | | | |
| | * | | | | Update CHANGES v0.23.0-rc1Erik Johnston2017-09-251-3/+11
| | * | | | | Bump version and changesErik Johnston2017-09-252-1/+25
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-09-2535-331/+1564
|\| | | | | |
| * | | | | | Merge pull request #2390 from r3dey3/developRichard van der Hoff2017-09-251-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 'develop' into developRichard van der Hoff2017-09-2548-805/+1855
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Fix logcontxt leak in keyclient (#2465)Richard van der Hoff2017-09-251-12/+5
| * | | | | | Do an AAAA lookup on SRV record targets (#2462)Richard van der Hoff2017-09-222-24/+118
| * | | | | | fix thinko'd docstringMatthew Hodgson2017-09-221-1/+1
| * | | | | | Fix device list when rejoining room (#2461)Erik Johnston2017-09-221-2/+14
| * | | | | | Merge pull request #2459 from matrix-org/rav/keyring_cleanupsRichard van der Hoff2017-09-205-214/+353
| |\ \ \ \ \ \
| | * | | | | | Fix logcontexts in _check_sigs_and_hashesRichard van der Hoff2017-09-202-60/+62
| | * | | | | | Add some more tests for KeyringRichard van der Hoff2017-09-201-37/+140
| | * | | | | | Fix logcontext handling in verify_json_objects_for_serverRichard van der Hoff2017-09-201-8/+12
| | * | | | | | Turn _start_key_lookups into an inlineCallbacks functionRichard van der Hoff2017-09-201-40/+37
| | * | | | | | Fix potential race in _start_key_lookupsRichard van der Hoff2017-09-201-5/+8
| | * | | | | | Add some comments to _start_key_lookupsRichard van der Hoff2017-09-201-0/+8
| | * | | | | | Consistency for how verify_request.deferred is calledRichard van der Hoff2017-09-201-13/+17
| | * | | | | | Factor out _start_key_lookupsRichard van der Hoff2017-09-201-7/+17
| | * | | | | | Replace `server_and_json` with `verify_requests`Richard van der Hoff2017-09-201-3/+3
| | * | | | | | pull out handle_key_deferred to top levelRichard van der Hoff2017-09-201-43/+44
| | * | | | | | Fix incorrect key_ids in error messageRichard van der Hoff2017-09-201-1/+1
| | * | | | | | Invalidate signing key cache when we gat an updateRichard van der Hoff2017-09-201-17/+24
| | * | | | | | Remove redundant `preserve_fn`Richard van der Hoff2017-09-201-2/+2
| |/ / / / / /
| * | | | | | Fix concurrent server_key requests (#2458)Richard van der Hoff2017-09-192-4/+58
| * | | | | | Add a config option to block all room invites (#2457)Richard van der Hoff2017-09-195-0/+44
| * | | | | | add some comments to on_exchange_third_party_invite_requestRichard van der Hoff2017-09-191-0/+11
| * | | | | | PoC for filtering spammy events (#2456)Richard van der Hoff2017-09-193-17/+69
| | |_|_|_|/ | |/| | | |
| * | | | | Fix overzealous kicking of guest users (#2453)Richard van der Hoff2017-09-191-1/+1
| * | | | | Clean up and document handling of logcontexts in Keyring (#2452)Richard van der Hoff2017-09-182-28/+110
| * | | | | Merge pull request #2451 from matrix-org/erikj/add_state_to_timelineErik Johnston2017-09-182-3/+18
| |\ \ \ \ \
| | * | | | | Don't filter out current state events from timelineErik Johnston2017-09-182-3/+18
| * | | | | | Merge pull request #2450 from matrix-org/dbkr/push_event_id_onlyDavid Baker2017-09-181-0/+20
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Also include the room_idDavid Baker2017-09-181-0/+1
| | * | | | | Use .get - it's much shorterDavid Baker2017-09-181-1/+1
| | * | | | | Add support for event_id_only push formatDavid Baker2017-09-181-0/+19
| * | | | | | Merge pull request #2449 from matrix-org/erikj/rejoin_device_listsErik Johnston2017-09-181-13/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Correctly handle leaving room in /key/changesErik Johnston2017-09-181-13/+12
| * | | | | | Merge pull request #2443 from matrix-org/erikj/rejoin_device_listsErik Johnston2017-09-184-29/+153
| |\| | | | |
| | * | | | | Fix typoErik Johnston2017-09-151-1/+1
| | * | | | | Actually hook leave notifs upErik Johnston2017-09-141-2/+3
| | * | | | | Handle joining/leaving rooms in /keys/changesErik Johnston2017-09-131-1/+38
| | * | | | | Get left roomsErik Johnston2017-09-131-3/+32
| | * | | | | In sync handle device lists for newly joined/left roomsErik Johnston2017-09-121-2/+10
| | * | | | | Add left section to /keys/changesErik Johnston2017-09-083-11/+19
| | * | | | | Send down device list change notif when member leaves/rejoins roomErik Johnston2017-09-073-14/+55
| |/ / / / /
| * | | | | Merge pull request #2439 from matrix-org/rav/tox_tweaksRichard van der Hoff2017-09-061-5/+29
| |\ \ \ \ \
| | * | | | | do tox install with pip -eRichard van der Hoff2017-09-051-5/+29
| * | | | | | Merge remote-tracking branch 'origin/master' into developRichard van der Hoff2017-09-053-0/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Exclude the github issue template from our sdist (#2440)Richard van der Hoff2017-09-052-0/+1
| | * | | | | Merge pull request #2433 from ptman/patch-1Erik Johnston2017-09-011-0/+2
| | |\ \ \ \ \
| | | * | | | | Document known to work postgres versionPaul Tötterman2017-09-011-0/+2
| | |/ / / / /
| * | / / / / Merge branch 'master' into developRichard van der Hoff2017-09-054-0/+483
| |\| | | | | | | |/ / / / | |/| | | |
| | * | | | Set --python when running sytestRichard van der Hoff2017-09-014-0/+4
| | * | | | Merge pull request #2416 from matrix-org/rav/prometheus_configRichard van der Hoff2017-08-223-0/+436
| | |\ \ \ \
| | | * | | | Add prometheus configRichard van der Hoff2017-08-163-0/+436
| | * | | | | Merge pull request #2413 from matrix-org/toml-issue-templateTom Lant2017-08-211-0/+47
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Update ISSUE_TEMPLATE.mdTom Lant2017-08-171-1/+5
| | | * | | | Update ISSUE_TEMPLATE.mdTom Lant2017-08-171-3/+10
| | | * | | | Update ISSUE_TEMPLATE.mdTom Lant2017-08-141-2/+2
| | | * | | | Update ISSUE_TEMPLATE.mdTom Lant2017-08-141-1/+1
| | | * | | | Create ISSUE_TEMPLATE.mdTom Lant2017-08-141-0/+36
| | |/ / / /
| * | | | | fix python path in jenkins scriptsRichard van der Hoff2017-09-014-4/+4
| * | | | | Set --python when running sytestRichard van der Hoff2017-09-014-0/+4
| * | | | | Merge pull request #2428 from matrix-org/rav/update_upgradeRichard van der Hoff2017-08-241-33/+42
| |\ \ \ \ \
| | * | | | | Tweaks to the upgrade instructionsRichard van der Hoff2017-08-231-33/+42
| |/ / / / /
| * | | | | Merge pull request #2417 from matrix-org/rav/federation_clientRichard van der Hoff2017-08-231-8/+79
| |\ \ \ \ \
| | * | | | | test federation client: Allow server-name and key-file as optionsRichard van der Hoff2017-08-221-8/+28
| | * | | | | Improvements to the federation test clientRichard van der Hoff2017-08-171-7/+58
| * | | | | | Merge pull request #2288 from kyrias/bcryptRichard van der Hoff2017-08-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | python_dependencies: Use bcrypt module instead of py-bcryptJohannes Löthberg2017-06-171-1/+1
| | | | * | | Fix iteration of requests_missing_keys; list doesn't have .values()Kenny Keslar2017-07-261-1/+1
* | | | | | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2017-08-161-1/+1
|\| | | | | |
| * | | | | | Fix user_dir startupRichard van der Hoff2017-08-161-1/+1
* | | | | | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2017-08-161-10/+13
|\| | | | | |
| * | | | | | Fix process startupRichard van der Hoff2017-08-161-10/+13
* | | | | | | Merge branch 'develop' into matrix-org-hotfixesRichard van der Hoff2017-08-1616-467/+300
|\| | | | | |
| * | | | | | explain why CPU affinity is a good ideaMatthew Hodgson2017-08-151-0/+8
| * | | | | | Merge pull request #2415 from matrix-org/rav/synctl_cpu_affinityRichard van der Hoff2017-08-1514-465/+271
| |\ \ \ \ \ \
| | * | | | | | Allow configuration of CPU affinityRichard van der Hoff2017-08-155-1/+23
| | * | | | | | Factor out common application startRichard van der Hoff2017-08-1511-464/+248
| |/ / / / / /
| * | | | | | fix englishhera2017-08-041-7/+7
| * | | | | | typohera2017-08-041-1/+1
| * | | | | | Reduce spammy log line in synchrotronsErik Johnston2017-08-021-1/+1
| | |_|/ / / | |/| | | |
| * | | | | Merge pull request #2375 from matrix-org/erikj/port_scriptErik Johnston2017-07-201-0/+19
| |\ \ \ \ \
| | * | | | | Extend commentErik Johnston2017-07-201-1/+2
| | * | | | | Fix port script for user directory tablesErik Johnston2017-07-201-0/+18
| |/ / / / /
* | | | | | fix englishhera2017-08-041-7/+7
* | | | | | typohera2017-08-041-1/+1
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-07-171-0/+8
|\| | | | |
| * | | | | Merge pull request #2371 from matrix-org/erikj/push_cache_hitErik Johnston2017-07-171-0/+8
| |\ \ \ \ \
| | * | | | | Increase cache hit ratio for pushErik Johnston2017-07-141-0/+8
| |/ / / / /
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-07-141-2/+46
|\| | | | |
| * | | | | Merge pull request #2366 from matrix-org/erikj/push_metricsErik Johnston2017-07-141-2/+42
| |\ \ \ \ \
| | * | | | | Add more metrics to push rule evaluationErik Johnston2017-07-131-2/+42
| |/ / / / /
| * | | | | Merge pull request #2365 from matrix-org/erikj/push_skip_lockErik Johnston2017-07-131-0/+4
| |\ \ \ \ \
| | * | | | | Push: Don't acquire lock unless necessaryErik Johnston2017-07-131-0/+4
| |/ / / / /
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-07-122-24/+32
|\| | | | |
| * | | | | Merge pull request #2362 from matrix-org/erikj/sync_user_users_who_shareErik Johnston2017-07-121-8/+7
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Use less DB for device list handling in syncErik Johnston2017-07-121-8/+7
| |/ / / /
| * | | | Merge pull request #2354 from krombel/reduce_static_sync_replyErik Johnston2017-07-111-16/+25
| |\ \ \ \
| | * | | | split out reducing stuff; just make encode_* staticKrombel2017-07-111-35/+27
| | * | | | fix testKrombel2017-07-101-1/+3
| | * | | | encode sync-response statically; omit empty objects from sync-responseKrombel2017-07-101-33/+48
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-07-112-3/+3
|\| | | | |
| * | | | | Merge pull request #2357 from matrix-org/erikj/pushErik Johnston2017-07-111-1/+1
| |\ \ \ \ \
| | * | | | | Don't compute push actions for backfilled eventsErik Johnston2017-07-111-1/+1
| | | |_|_|/ | | |/| | |
| * / | | | Reduce log levels in tcp replicationErik Johnston2017-07-111-2/+2
| |/ / / /
* | | | | Random stuffhera2017-07-075-14/+40
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-07-073-1/+14
|\| | | |
| * | | | Include registration and as stores in frontend proxyErik Johnston2017-07-071-0/+4
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-07-072-1/+10
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch 'hotfixes-v0.22.1' of github.com:matrix-org/synapse v0.22.1Erik Johnston2017-07-065-11/+21
| | |\ \ \
| | | * | | Bump version and changelogErik Johnston2017-07-062-1/+10
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2017-07-072-0/+269
|\| | | | |
| * | | | | Merge pull request #2344 from matrix-org/erikj/frontend_proxyErik Johnston2017-07-072-0/+269
| |\ \ \ \ \
| | * | | | | Add a frontend proxyErik Johnston2017-07-072-0/+269
| |/ / / / /