summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge pull request #5793 from matrix-org/erikj/fix_bg_updateBrendan Abolivier2019-07-303-1/+23
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | NewsfileErik Johnston2019-07-301-0/+1
| | * | | | Don't recreate columnErik Johnston2019-07-302-1/+22
| * | | | | Merge pull request #5792 from matrix-org/erikj/fix_bg_updateErik Johnston2019-07-303-1/+2
| |\| | | |
| | * | | | NewsfileErik Johnston2019-07-301-0/+1
| | * | | | Fix current_state_events membership background update.Erik Johnston2019-07-302-1/+1
| |/ / / /
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-07-302-4/+4
|\| | | |
| * | | | Merge pull request #5789 from matrix-org/erikj/fix_error_handling_keysErik Johnston2019-07-302-4/+4
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-07-301-0/+1
| | * | | | Unwrap errorErik Johnston2019-07-301-1/+2
| | * | | | Fix error handling when fetching remote device keysErik Johnston2019-07-301-3/+1
| |/ / / /
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-07-30227-1909/+2842
|\| | | |
| * | | | Merge pull request #5746 from matrix-org/erikj/test_bg_update_currnet_stateErik Johnston2019-07-302-1/+37
| |\ \ \ \
| | * | | | NewsfileErik Johnston2019-07-231-0/+1
| | * | | | Add unit test for current state membership bg updateErik Johnston2019-07-231-1/+36
| * | | | | Remove non-functional 'expire_access_token' setting (#5782)Richard van der Hoff2019-07-308-37/+9
| | |_|/ / | |/| | |
| * | | | Room Complexity Client Implementation (#5783)Amber Brown2019-07-308-14/+298
| | |/ / | |/| |
| * | | Merge pull request #5774 from matrix-org/erikj/fix_rejected_membershipErik Johnston2019-07-292-0/+7
| |\ \ \
| | * | | NewsfileErik Johnston2019-07-261-0/+1
| | * | | Fix room summary when rejected events are in stateErik Johnston2019-07-261-0/+6
| * | | | Merge pull request #5752 from matrix-org/erikj/forgotten_userErik Johnston2019-07-293-35/+124
| |\ \ \ \
| | * | | | Expand commentErik Johnston2019-07-291-0/+5
| | * | | | Remove lost commentErik Johnston2019-07-291-7/+0
| | |/ / /
| | * | | NewsfileErik Johnston2019-07-241-0/+1
| | * | | Remove join when calculating room summaries.Erik Johnston2019-07-241-13/+21
| | * | | Remove join on room_memberships when fetching rooms for user.Erik Johnston2019-07-241-22/+36
| | * | | Add function to get all forgotten rooms for userErik Johnston2019-07-242-0/+68
| | |/ /
| * | | Merge pull request #5770 from matrix-org/erikj/fix_current_state_event_sqliteErik Johnston2019-07-293-4/+6
| |\ \ \
| | * | | NewsfileErik Johnston2019-07-291-0/+1
| | * | | Update old deps unit test to use old sqlite3Erik Johnston2019-07-291-2/+3
| | * | | Fix current_state bg update to work on old SQLiteErik Johnston2019-07-291-2/+2
| * | | | Move some timeout checking logs to DEBUG #5785 Amber Brown2019-07-303-2/+3
| * | | | Update the device list cache when keys/query is called (#5693)Jorik Schellekens2019-07-293-74/+137
| * | | | Fix debian packages for sid being called buster. (#5775)Erik Johnston2019-07-303-1/+8
| |/ / /
| * | | Merge pull request #5780 from matrix-org/baboliver/loopingcall-argsBrendan Abolivier2019-07-292-2/+5
| |\ \ \
| | * | | ChangelogBrendan Abolivier2019-07-291-0/+1
| | * | | Add kwargs and docBrendan Abolivier2019-07-291-2/+4
| | * | | Add ability to pass arguments to looping callsBrendan Abolivier2019-07-291-2/+2
| |/ / /
| * | | Merge branch 'master' into developRichard van der Hoff2019-07-266-4/+38
| |\ \ \ | | | |/ | | |/|
| | * | yet more changelog attribution fixes v1.2.1Richard van der Hoff2019-07-261-2/+2
| | * | correct attributions in changelog release-v1.2.1Richard van der Hoff2019-07-261-1/+4
| | * | correct attributions in changelogRichard van der Hoff2019-07-261-1/+2
| | * | 1.2.1Richard van der Hoff2019-07-265-4/+30
| | * | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1Richard van der Hoff2019-07-263-4/+38
| | |\ \
| | * | | Log when we receive receipt from a different originErik Johnston2019-07-261-13/+22
| | * | | Fix DoS when there is a cycle in redaction eventsRichard van der Hoff2019-07-261-0/+4
| | * | | Merge branch 'rav/redactions/cross_room_id' into release-v1.2.1Richard van der Hoff2019-07-252-0/+28
| | |\ \ \
| * | \ \ \ Merge pull request #5744 from matrix-org/erikj/log_leave_origin_mismatchRichard van der Hoff2019-07-263-4/+38
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Log when we receive a /make_* request from a different originRichard van der Hoff2019-07-263-4/+38
| * | | | | Convert RedactionTestCase to modern test style (#5768)Richard van der Hoff2019-07-262-36/+39
| * | | | | Merge pull request #5767 from matrix-org/rav/redactions/cross_room_idRichard van der Hoff2019-07-252-0/+28
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | log when a redaction attempts to redact an event in a different roomRichard van der Hoff2019-07-252-0/+28
| | | |/ / | | |/| |
| * | | | Fix some error cases in the caching layer. (#5749)Richard van der Hoff2019-07-253-35/+130
| * | | | Merge branch 'master' into developAndrew Morgan2019-07-253-3/+12
| |\| | |
| | * | | 1.2.0 v1.2.0 release-v1.2.0Andrew Morgan2019-07-253-3/+12
| | |/ /
| * | | Merge tag 'v1.2.0rc2' into developAndrew Morgan2019-07-2411-32/+101
| |\| |
| | * | 1.2.0rc2 v1.2.0rc2Andrew Morgan2019-07-243-2/+10
| * | | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatchErik Johnston2019-07-242-13/+23
| |\ \ \
| | * | | Update changelog.d/5743.bugfixErik Johnston2019-07-231-1/+1
| | * | | NewsfileErik Johnston2019-07-231-0/+1
| | * | | Log when we receive receipt from a different originErik Johnston2019-07-231-13/+22
| * | | | Stop trying to fetch events with event_id=None. (#5753)Richard van der Hoff2019-07-244-11/+23
| * | | | Add a prometheus metric for active cache lookups. (#5750)Richard van der Hoff2019-07-243-2/+34
| * | | | Make Jaeger fully configurable (#5694)Jorik Schellekens2019-07-234-4/+46
| * | | | Replace returnValue with return (#5736)Amber Brown2019-07-23177-1514/+1360
| | |_|/ | |/| |
| * | | Opentracing Utils (#5722)Jorik Schellekens2019-07-233-101/+357
| * | | Merge pull request #5732 from matrix-org/erikj/sdnotifyErik Johnston2019-07-2317-14/+67
| |\ \ \ | | |/ / | |/| |
| | * | Also update systemd-with-workers contrib examplesErik Johnston2019-07-232-2/+4
| | * | Update example systemd service fileErik Johnston2019-07-221-1/+3
| | * | Call startup commands as system triggers.Erik Johnston2019-07-2211-11/+29
| | * | NewsfileErik Johnston2019-07-221-0/+1
| | * | Add process hooks to tell systemd our state.Erik Johnston2019-07-222-0/+30
| * | | Merge pull request #5740 from matrix-org/erikj/worker_flakey_testsErik Johnston2019-07-232-1/+8
| |\ \ \
| | * | | NewsfileErik Johnston2019-07-231-0/+1
| | * | | Mark flakey tests as blacklisted for worker modeErik Johnston2019-07-231-1/+7
| |/ / /
* | | | Merge branch 'release-v1.2.0' of github.com:matrix-org/synapse into matrix-or...Andrew Morgan2019-07-2410-31/+92
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix servlet metric names (#5734)Jorik Schellekens2019-07-2410-31/+92
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-07-234-19/+33
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #5738 from matrix-org/erikj/faster_updateErik Johnston2019-07-232-18/+31
| |\ \ \
| | * | | NewsfileErik Johnston2019-07-231-0/+1
| | * | | Speed up current state background update.Erik Johnston2019-07-231-18/+30
| * | | | Merge pull request #5733 from matrix-org/erikj/exlude_sytest_blacklistErik Johnston2019-07-232-1/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | NewsfileErik Johnston2019-07-221-0/+1
| | * | | Don't package sytest-blacklist file.Erik Johnston2019-07-221-1/+1
| |/ / /
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-07-2370-169/+415
|\| | |
| * | | Fix logging in workers (#5729)Amber Brown2019-07-224-1/+32
| * | | Merge pull request #5730 from matrix-org/erikj/cache_versionsErik Johnston2019-07-222-2/+22
| |\ \ \
| | * | | Update changelog.d/5730.miscErik Johnston2019-07-221-1/+1
| | * | | NewsfileErik Johnston2019-07-221-0/+1
| | * | | Cache get_version_string.Erik Johnston2019-07-221-2/+21
| | | |/ | | |/|
| * | | Merge pull request #5731 from matrix-org/jaywink/admin-user-list-user-typeJason Robinson2019-07-222-3/+4
| |\ \ \
| | * | | Add `user_type` to returned fields in admin API user list endpointsJason Robinson2019-07-222-3/+4
| | |/ /
| * | | Fix stack overflow in Keyring (#5724)Richard van der Hoff2019-07-223-80/+42
| |\ \ \
| | * | | changelogRichard van der Hoff2019-07-191-0/+1
| | * | | Add a delay to key lookup lock release to fix stack overflowRichard van der Hoff2019-07-191-2/+8
| | * | | Refactor Keyring._start_key_lookupsRichard van der Hoff2019-07-192-80/+35
| * | | | Merge tag 'v1.2.0rc1' into developAndrew Morgan2019-07-2254-56/+82
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | Make changelog slightly more readable v1.2.0rc1Andrew Morgan2019-07-221-1/+1
| | * | 1.2.0rc1Andrew Morgan2019-07-2254-56/+82
| * | | Demo uses deprecated cli option (#5725)Jorik Schellekens2019-07-222-4/+4
| * | | Merge branch 'release-v1.2.0' into developJorik Schellekens2019-07-225-24/+230
| |\| |
| | * | Opentracing Documentation (#5703)Jorik Schellekens2019-07-225-24/+230
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesAndrew Morgan2019-07-2225-156/+348
|\| | |
| * | | Revert "Remove deprecated 'verbose' cli arg"Jorik Schellekens2019-07-191-3/+4
| * | | Remove deprecated 'verbose' cli argJorik Schellekens2019-07-191-4/+3
| * | | Merge pull request #5720 from matrix-org/erikj/transactions_upsertErik Johnston2019-07-192-0/+21
| |\ \ \
| | * | | NewsfileErik Johnston2019-07-191-0/+1
| | * | | Use upsert when updating destination retry intervalErik Johnston2019-07-191-0/+20
| | | |/ | | |/|
| * | | Merge pull request #5713 from matrix-org/erikj/use_cache_for_filtered_stateErik Johnston2019-07-192-2/+7
| |\ \ \
| | * | | NewsfileErik Johnston2019-07-181-0/+1
| | * | | Delegate to cached version when using get_filtered_current_state_idsErik Johnston2019-07-181-2/+6
| * | | | Merge pull request #5706 from matrix-org/erikj/add_memberships_to_current_stateErik Johnston2019-07-198-41/+195
| |\ \ \ \
| | * | | | LoggingTransaction accepts None for callback lists.Erik Johnston2019-07-193-6/+16
| | * | | | Update comment for new columnErik Johnston2019-07-191-0/+3
| | * | | | NewsfileErik Johnston2019-07-181-0/+1
| | * | | | Use the current_state_events.membership columnErik Johnston2019-07-181-17/+37
| | * | | | Track if current_state_events.membership is up to dateErik Johnston2019-07-181-0/+45
| | * | | | Add background update for current_state_events.membership columnErik Johnston2019-07-182-0/+54
| | * | | | Add membership column to current_state_events table.Erik Johnston2019-07-185-20/+41
| * | | | | Don't accept opentracing data from clients. (#5715)Jorik Schellekens2019-07-192-2/+2
| * | | | | Add 'rel' attribute to default welcome page. (#5695)Neil Johnson2019-07-192-2/+3
| * | | | | Update the coding style doc (#5719)Richard van der Hoff2019-07-192-30/+95
| | |_|/ / | |/| | |
| * | | | Speed up the PostgreSQL unit tests (#5717)Amber Brown2019-07-192-3/+10
| * | | | Remove non-dedicated logging options and command line arguments (#5678)Amber Brown2019-07-193-75/+13
| | |_|/ | |/| |
| * | | towncrierNeil Johnson2019-07-181-0/+1
| * | | enable aggregations support by defaultNeil Johnson2019-07-181-1/+1
| | |/ | |/|
* | | Merge branch 'release-v1.2.0' into matrix-org-hotfixesRichard van der Hoff2019-07-1849-563/+1340
|\| |
| * | Clean up opentracing configuration options (#5712)Richard van der Hoff2019-07-187-63/+96
| * | Support Prometheus_client 0.4.0+ (#5636)Amber Brown2019-07-1820-50/+399
| * | Remove the ability to query relations when the original event was redacted. (...Andrew Morgan2019-07-185-39/+180
| * | Convert synapse.federation.transport.server to async (#5689)Richard van der Hoff2019-07-182-242/+189
| * | Ignore redactions of m.room.create events (#5701)Richard van der Hoff2019-07-175-24/+57
| * | Improve `Depends` specs in debian package. (#5675)Richard van der Hoff2019-07-176-3/+33
| * | More refactoring in `get_events_as_list` (#5707)Richard van der Hoff2019-07-174-27/+198
| * | Fix redaction authentication (#5700)Richard van der Hoff2019-07-172-85/+131
| * | Refactor `get_events_as_list` (#5699)Richard van der Hoff2019-07-172-48/+75
| |/
* | Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixesErik Johnston2019-07-17209-1875/+3557
|\|
| * Merge pull request #5597 from matrix-org/erikj/admin_api_cmdErik Johnston2019-07-168-13/+357
| |\
| | * Remove pointless descriptionErik Johnston2019-07-161-1/+0
| | * Clean up arg name and remove lying commentErik Johnston2019-07-161-7/+5
| | * Fix typo in synapse/app/admin_cmd.pyErik Johnston2019-07-161-1/+1
| | * Fix invoking add_argument from homeserver.pyErik Johnston2019-07-151-1/+1
| | * s/exfiltrate_user_data/export_user_data/Erik Johnston2019-07-151-1/+1
| | * Add FileExfiltrationWriterErik Johnston2019-07-151-1/+69
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_api_cmdErik Johnston2019-07-15293-2140/+3248
| | |\ | | |/ | |/|
| * | Return a different error from Invalid Password when a user is deactivated (#5...Andrew Morgan2019-07-153-0/+26
| * | Merge pull request #5589 from matrix-org/erikj/admin_exfiltrate_dataErik Johnston2019-07-156-7/+423
| |\ \
| | * | Fixup docstringsErik Johnston2019-07-121-7/+5
| | * | pep8Erik Johnston2019-07-051-4/+0
| | * | Remove FileExfiltrationWriterErik Johnston2019-07-051-63/+0
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfi...Erik Johnston2019-07-05217-1407/+1732
| | |\ \
| | * | | Assume key existence. Update docstringsErik Johnston2019-07-052-9/+11
| | * | | Fixup from review comments.Erik Johnston2019-07-042-22/+27
| | * | | Apply comment fixups from code reviewErik Johnston2019-07-031-6/+6
| * | | | Add a `docker` type to the towncrier configuration (#5673)Richard van der Hoff2019-07-127-14/+27
| * | | | Implement access token expiry (#5660)Richard van der Hoff2019-07-1214-31/+253
| * | | | fix typo: backgroud -> backgroundAndrew Morgan2019-07-122-5/+5
| * | | | fix changelog nameRichard van der Hoff2019-07-121-0/+0
| * | | | Update reverse_proxy.rst (#5397)Ulrik Günther2019-07-122-0/+3
| * | | | Add missing space in default logging file format generated by the Docker imag...Slavi Pantaleev2019-07-122-1/+2
| * | | | Upgrade Alpine Linux used in the Docker image (3.8 -> 3.10) (#5619)Slavi Pantaleev2019-07-122-2/+3
| * | | | Add a mechanism for per-test configs (#5657)Richard van der Hoff2019-07-122-1/+55
| * | | | Use /src for checking out synapse during sytests (#5664)Amber Brown2019-07-112-0/+4
| * | | | Improved docs on setting up Postgresql (#5661)Lrizika2019-07-112-4/+16
| * | | | small typo fix (#5655)Andrew Morgan2019-07-112-1/+2
| * | | | Clean up exception handling for access_tokens (#5656)Richard van der Hoff2019-07-116-100/+111
| * | | | Add basic opentracing support (#5544)Jorik Schellekens2019-07-1112-12/+633
| * | | | Inline issue_access_token (#5659)Richard van der Hoff2019-07-113-8/+5
| * | | | Merge pull request #5658 from matrix-org/babolivier/is-jsonBrendan Abolivier2019-07-102-1/+2
| |\ \ \ \
| | * | | | TypoBrendan Abolivier2019-07-101-1/+1
| | * | | | Rename changelog fileBrendan Abolivier2019-07-101-0/+0
| | * | | | Send 3PID bind requests as JSON dataBrendan Abolivier2019-07-102-1/+2
| * | | | | Remove access-token support from RegistrationStore.register (#5642)Richard van der Hoff2019-07-109-79/+30
| |/ / / /
| * | | | Don't bundle aggregations when retrieving the original event (#5654)Andrew Morgan2019-07-102-2/+13
| * | | | Add a linting script (#5627)Andrew Morgan2019-07-102-0/+13
| * | | | Correct pep517 flag in readme (#5651)Bruno Windels2019-07-102-1/+2
| * | | | Merge pull request #5638 from matrix-org/babolivier/invite-jsonBrendan Abolivier2019-07-092-4/+19
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' into babolivier/invite-jsonBrendan Abolivier2019-07-08241-1918/+2403
| | |\ \ \ \
| | * | | | | ChangelogBrendan Abolivier2019-07-081-0/+1
| | * | | | | LintBrendan Abolivier2019-07-081-1/+2
| | * | | | | Use application/json when querying the IS's /store-invite endpointBrendan Abolivier2019-07-081-4/+17
| * | | | | | remove unused and unnecessary check for FederationDeniedError (#5645)Hubert Chathi2019-07-092-4/+2
| * | | | | | Include the original event in /relations (#5626)Andrew Morgan2019-07-094-4/+12
| * | | | | | Merge pull request #5644 from matrix-org/babolivier/profile-allow-selfBrendan Abolivier2019-07-093-0/+52
| |\ \ \ \ \ \
| | * | | | | | LintBrendan Abolivier2019-07-081-2/+2
| | * | | | | | Add test caseBrendan Abolivier2019-07-081-0/+47
| | * | | | | | ChangelogBrendan Abolivier2019-07-081-0/+1
| | * | | | | | Allow newly-registered users to lookup their own profilesBrendan Abolivier2019-07-081-0/+4
| | | |/ / / / | | |/| | | |
| * | | | | | Remove access-token support from RegistrationHandler.register (#5641)Richard van der Hoff2019-07-088-81/+44
| * | | | | | Unblacklist some user_directory sytests (#5637)Richard van der Hoff2019-07-092-4/+1
| * | | | | | Better logging for auto-join. (#5643)Richard van der Hoff2019-07-082-0/+8
| |/ / / / /
| * | | | | Update ModuleApi to avoid register(generate_token=True) (#5640)Richard van der Hoff2019-07-082-8/+57
| * | | | | Factor out some redundant code in the login impl (#5639)Richard van der Hoff2019-07-082-39/+11
| * | | | | Move get_or_create_user to test code (#5628)Richard van der Hoff2019-07-083-60/+60
| * | | | | Add a few more common environment directory names to black exclusion (#5630)Andrew Morgan2019-07-082-0/+3
| * | | | | Add default push rule to ignore reactions (#5623)J. Ryan Stinnett2019-07-052-0/+14
| * | | | | Add origin_server_ts and sender fields to m.replace (#5613)Andrew Morgan2019-07-053-7/+24
| * | | | | Remove support for invite_3pid_guest. (#5625)Richard van der Hoff2019-07-057-196/+3
| | |_|/ / | |/| | |
| * | | | remove dead transaction persist code (#5622)Richard van der Hoff2019-07-054-69/+1
| * | | | Fixes to the federation rate limiter (#5621)Richard van der Hoff2019-07-056-16/+148
| * | | | Make errors about email password resets much clearer (#5616)Andrew Morgan2019-07-052-11/+9
| * | | | Improve the backwards compatibility re-exports of synapse.logging.context (#5...Amber Brown2019-07-054-5/+62
| * | | | Add a sytest blacklist file (#5611)Andrew Morgan2019-07-055-148/+43
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2019-07-043-6/+26
| |\ \ \ \
| | * | | | Update changelog v1.1.0 release-v1.1.0Erik Johnston2019-07-041-0/+10
| | * | | | 1.1.0Erik Johnston2019-07-044-4/+9
| | * | | | Merge pull request #5615 from matrix-org/anoa/fix_changelog_email_resetsErik Johnston2019-07-042-1/+2
| | |\ \ \ \
| | | * | | | Suggest people use a config file for Docker instead of env varsAndrew Morgan2019-07-042-1/+2
| | |/ / / /
| * | | | | Move logging utilities out of the side drawer of util/ and into logging/ (#5606)Amber Brown2019-07-0498-233/+249
| * | | | | Fix 'utime went backwards' errors on daemonization. (#5609)Richard van der Hoff2019-07-033-31/+44
| |/ / / /
| * | | | 1.1.0rc2 v1.1.0rc2Richard van der Hoff2019-07-036-5/+18
| | | | * Use set_defaults(func=) styleErik Johnston2019-07-151-11/+8
| | | | * Move creation of ArgumentParser to callerErik Johnston2019-07-152-11/+8
| | | | * Fix up commentsErik Johnston2019-07-152-3/+3
| | | | * Change add_arguments to be a static methodErik Johnston2019-07-155-5/+39
| | | | * NewsfileErik Johnston2019-07-021-0/+1
| | | | * Add basic admin cmd appErik Johnston2019-07-023-6/+257
| | | |/
| | | * NewsfileErik Johnston2019-07-021-0/+1
| | | * Add basic function to get all data for a user out of synapseErik Johnston2019-07-024-1/+478
* | | | Merge remote-tracking branch 'origin/release-v1.1.0' into matrix-org-hotfixesRichard van der Hoff2019-07-035-6/+35
|\| | |
| * | | Fix a number of "Starting txn from sentinel context" warnings (#5605)Richard van der Hoff2019-07-035-6/+35
* | | | Merge branch 'release-v1.1.0' into matrix-org-hotfixesRichard van der Hoff2019-07-038-43/+59
|\| | |
| * | | Remove SMTP_* env var functionality from docker conf (#5596)Andrew Morgan2019-07-032-19/+1
| * | | Fix media repo breaking (#5593)Amber Brown2019-07-026-24/+58
* | | | Merge branch 'release-v1.1.0' into matrix-org-hotfixesRichard van der Hoff2019-07-02107-323/+542
|\| | |
| * | | tweak changelog v1.1.0rc1Richard van der Hoff2019-07-021-10/+13
| * | | Merge remote-tracking branch 'origin/master' into release-v1.1.0Richard van der Hoff2019-07-023-5/+7
| |\ \ \
| | * \ \ Merge pull request #5552 from matrix-org/rav/github_templatesRichard van der Hoff2019-06-263-5/+7
| | |\ \ \
| | | * | | changelogRichard van der Hoff2019-06-251-0/+1
| | | * | | Update github templatesRichard van der Hoff2019-06-251-2/+3
| | | * | | Update SUPPORT.mdRichard van der Hoff2019-06-251-3/+3
| * | | | | prepare v1.1.0rc1Richard van der Hoff2019-07-0291-94/+106
| * | | | | Complete the SAML2 implementation (#5422)Richard van der Hoff2019-07-027-45/+231
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-07-0155-450/+832
| | |\ \ \ \ \
| | * | | | | | Address review commentsRichard van der Hoff2019-07-011-5/+7
| | * | | | | | rename BaseSSORedirectServlet for consistencyRichard van der Hoff2019-06-271-3/+3
| | * | | | | | update sample configRichard van der Hoff2019-06-271-6/+13
| | * | | | | | cleanupsRichard van der Hoff2019-06-273-11/+18
| | * | | | | | update sample configRichard van der Hoff2019-06-261-0/+13
| | * | | | | | Add support for tracking SAML2 sessions.Richard van der Hoff2019-06-262-3/+56
| | * | | | | | Move all the saml stuff out to a centralised handlerRichard van der Hoff2019-06-264-50/+96
| | * | | | | | Revert redundant changes to static jsRichard van der Hoff2019-06-261-4/+2
| | * | | | | | Merge branch 'develop' into rav/saml2_clientRichard van der Hoff2019-06-26478-11486/+18913
| | |\ \ \ \ \ \
| | * | | | | | | changelogRichard van der Hoff2019-06-111-0/+1
| | * | | | | | | Merge tag 'v1.0.0rc3' into rav/saml2_clientRichard van der Hoff2019-06-116-2/+14
| | |\ \ \ \ \ \ \
| | * | | | | | | | Code cleanups and simplifications.Richard van der Hoff2019-06-116-50/+53
| | * | | | | | | | Merge remote-tracking branch 'origin/develop' into rav/saml2_clientRichard van der Hoff2019-06-10157-1096/+5758
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | SAML2 Improvements and redirect stuffAlexander Trost2019-06-025-2/+55
| * | | | | | | | | | Merge pull request #5587 from matrix-org/erikj/fix_synctlErik Johnston2019-07-022-6/+7
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | NewsfileErik Johnston2019-07-021-0/+1
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-20 00:04:26 +0000