Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Fix worker TLS (#4492) | Amber Brown | 2019-01-28 | 7 | -48/+48 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Fix UPSERTs on SQLite 3.24+ (#4477) | Amber Brown | 2019-01-28 | 3 | -12/+20 | |
* | | | | | | | Change return syntax in doc string | Andrew Morgan | 2019-01-28 | 1 | -1/+1 | |
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg... | Andrew Morgan | 2019-01-28 | 15 | -107/+342 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | docstrings for _RoutingResult | Richard van der Hoff | 2019-01-28 | 1 | -0/+36 | |
| * | | | | | | Handle IP literals explicitly | Richard van der Hoff | 2019-01-28 | 1 | -0/+19 | |
| * | | | | | | MatrixFederationAgent: factor out routing logic | Richard van der Hoff | 2019-01-28 | 1 | -18/+62 | |
| * | | | | | | Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487) | Richard van der Hoff | 2019-01-28 | 1 | -11/+12 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #4470 from matrix-org/erikj/require_format_version | Erik Johnston | 2019-01-25 | 11 | -82/+205 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Replace missed usages of FrozenEvent | Erik Johnston | 2019-01-25 | 3 | -10/+14 | |
| | * | | | | | Require event format version to parse or create events | Erik Johnston | 2019-01-25 | 8 | -72/+191 | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_nat... | Erik Johnston | 2019-01-25 | 7 | -6/+99 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Fix quoting for allowed_local_3pids example config (#4476) | Richard van der Hoff | 2019-01-25 | 1 | -3/+3 | |
| | * | | | | | | Fix Host header sent by MatrixFederationAgent (#4468) | Richard van der Hoff | 2019-01-25 | 2 | -1/+10 | |
| | * | | | | | | Don't require sqlite3 when using postgres (#4466) | Andrew Morgan | 2019-01-25 | 1 | -2/+1 | |
| * | | | | | | | Disable native upserts for sqlite, as they don't work | Erik Johnston | 2019-01-25 | 1 | -3/+7 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | Reuse predecessor method | Andrew Morgan | 2019-01-28 | 1 | -12/+8 | |
* | | | | | | | Fixes | Andrew Morgan | 2019-01-25 | 1 | -39/+39 | |
* | | | | | | | Clean up direct_rooms access | Andrew Morgan | 2019-01-25 | 1 | -3/+3 | |
* | | | | | | | Use python magic | Andrew Morgan | 2019-01-25 | 1 | -2/+1 | |
* | | | | | | | Destructure account data tuple before use | Andrew Morgan | 2019-01-25 | 1 | -3/+3 | |
* | | | | | | | Remove unnecessary null check | Andrew Morgan | 2019-01-25 | 1 | -7/+6 | |
* | | | | | | | Move room_tag declaration to be closer to its use | Andrew Morgan | 2019-01-25 | 1 | -4/+5 | |
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg... | Andrew Morgan | 2019-01-25 | 38 | -409/+1140 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Merge pull request #4415 from matrix-org/anoa/full_search_upgraded_rooms | Andrew Morgan | 2019-01-25 | 3 | -0/+85 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-org/synap... | Andrew Morgan | 2019-01-24 | 3 | -3/+3 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Apply suggestions from code review | Richard van der Hoff | 2019-01-24 | 2 | -2/+2 | |
| | | * | | | | | Update synapse/api/filtering.py | Richard van der Hoff | 2019-01-24 | 1 | -1/+1 | |
| | * | | | | | | Remove redundant create event None check | Andrew Morgan | 2019-01-24 | 1 | -3/+0 | |
| | |/ / / / / | ||||||
| | * | | | | | Do not return in a deferred function | Andrew Morgan | 2019-01-22 | 1 | -3/+3 | |
| | * | | | | | Ensure new filter is actually created | Andrew Morgan | 2019-01-22 | 2 | -2/+1 | |
| | * | | | | | Fix a bug with single-room search searching all rooms | Andrew Morgan | 2019-01-22 | 3 | -35/+51 | |
| | * | | | | | Search for messages across predecessor rooms | Andrew Morgan | 2019-01-18 | 3 | -0/+73 | |
| * | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/msc_1813 | Erik Johnston | 2019-01-25 | 30 | -364/+920 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge pull request #4448 from matrix-org/erikj/get_pdu_versions | Erik Johnston | 2019-01-24 | 4 | -13/+66 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Review comments | Erik Johnston | 2019-01-24 | 2 | -1/+7 | |
| | | * | | | | | | Add room_version param to get_pdu | Erik Johnston | 2019-01-23 | 4 | -13/+60 | |
| | | | |_|_|/ / | | | |/| | | | | ||||||
| | * | | | | | | Merge pull request #4405 from matrix-org/erikj/fixup_rejecting_invites | Erik Johnston | 2019-01-24 | 4 | -39/+34 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Update make_membership_event docs | Erik Johnston | 2019-01-24 | 1 | -2/+5 | |
| | | * | | | | | | Remove unecessary setting of outlier bit | Erik Johnston | 2019-01-24 | 1 | -2/+0 | |
| | | * | | | | | | Use term 'out of band membership' instead | Erik Johnston | 2019-01-24 | 3 | -9/+10 | |
| | | * | | | | | | Clarify the invite flows | Erik Johnston | 2019-01-23 | 3 | -7/+24 | |
| | | * | | | | | | Remove unnecessary '_sign_event' | Erik Johnston | 2019-01-23 | 2 | -15/+8 | |
| | | * | | | | | | Store rejected remote invite events as outliers | Erik Johnston | 2019-01-23 | 3 | -38/+21 | |
| | | |/ / / / / | ||||||
| | * | | | | | | Merge pull request #4437 from matrix-org/erikj/event_format_version_v2 | Erik Johnston | 2019-01-24 | 5 | -4/+48 | |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||||
| | * | | | | | | Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fix | Andrew Morgan | 2019-01-24 | 1 | -2/+12 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Change default timeout value from 0 to None | Andrew Morgan | 2019-01-24 | 1 | -1/+1 | |
| | | * | | | | | | Use self.clock instead of datetime | Andrew Morgan | 2019-01-24 | 1 | -4/+3 | |
| | | * | | | | | | isort | Andrew Morgan | 2019-01-24 | 1 | -1/+1 | |
| | | * | | | | | | lint | Andrew Morgan | 2019-01-24 | 1 | -1/+2 | |
| | | * | | | | | | Time out filtered room dir queries after 60s | Andrew Morgan | 2019-01-24 | 1 | -2/+12 | |
| | * | | | | | | | Merge pull request #4464 from matrix-org/rav/fix_srv_lookup | Richard van der Hoff | 2019-01-24 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | Look up the right SRV record | Richard van der Hoff | 2019-01-24 | 1 | -1/+2 | |
| | * | | | | | | | | Fix UnboundLocalError in post_urlencoded_get_json (#4460) | Richard van der Hoff | 2019-01-24 | 1 | -2/+3 | |
| | |/ / / / / / / | ||||||
| | * | | | | | | | Merge pull request #4435 from matrix-org/neilj/fix_threepid_auth_check | Neil Johnson | 2019-01-24 | 3 | -8/+12 | |
| | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | move guard out of is_threepid_reserved and into register.py | Neil Johnson | 2019-01-22 | 2 | -6/+5 | |
| | | * | | | | | | | Fix None guard in config.server.is_threepid_reserved | Neil Johnson | 2019-01-22 | 3 | -7/+12 | |
| | * | | | | | | | | Merge pull request #4458 from matrix-org/dbkr/public_baseurl_doc | Neil Johnson | 2019-01-24 | 1 | -1/+5 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Clarify docs for public_baseurl | David Baker | 2019-01-24 | 1 | -1/+5 | |
| | | | |/ / / / / / | | | |/| | | | | | | ||||||
| | * / | | | | | | | Fix UPSERT check (#4459) | Amber Brown | 2019-01-24 | 1 | -5/+28 | |
| | |/ / / / / / / | ||||||
| | * | | | | | | | Use native UPSERTs where possible (#4306) | Amber Brown | 2019-01-24 | 7 | -30/+212 | |
| | * | | | | | | | Don't send IP addresses as SNI (#4452) | Richard van der Hoff | 2019-01-24 | 1 | -3/+12 | |
| | | |_|/ / / / | | |/| | | | | | ||||||
| | * | | | | | | Merge pull request #4445 from matrix-org/anoa/user_dir_develop_backport | Andrew Morgan | 2019-01-23 | 1 | -0/+6 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Add metric for user dir current event stream position | Andrew Morgan | 2019-01-23 | 1 | -0/+6 | |
| | * | | | | | | | Merge pull request #4428 from matrix-org/rav/matrix_federation_agent | Richard van der Hoff | 2019-01-23 | 4 | -232/+240 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | | * | | | | | | put resolve_service in an object | Richard van der Hoff | 2019-01-22 | 2 | -63/+86 | |
| | | * | | | | | | Require that service_name be a byte string | Richard van der Hoff | 2019-01-22 | 1 | -4/+4 | |
| | | * | | | | | | Kill off matrix_federation_endpoint | Richard van der Hoff | 2019-01-22 | 2 | -145/+0 | |
| | | * | | | | | | Make MatrixFederationClient use MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 1 | -27/+10 | |
| | | * | | | | | | MatrixFederationAgent | Richard van der Hoff | 2019-01-22 | 2 | -0/+147 | |
| | * | | | | | | | Fixup removal of duplicate `user_ips` rows (#4432) | Erik Johnston | 2019-01-23 | 1 | -1/+5 | |
| | * | | | | | | | Support ACME for certificate provisioning (#4384) | Amber Brown | 2019-01-23 | 6 | -35/+296 | |
| | | |_|_|_|/ / | | |/| | | | | | ||||||
| * | | | | | | | Review comments | Erik Johnston | 2019-01-24 | 2 | -2/+4 | |
| * | | | | | | | Implement MSC 1813 - Add room version to make APIs | Erik Johnston | 2019-01-23 | 4 | -8/+40 | |
| | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | isort | Erik Johnston | 2019-01-23 | 2 | -4/+2 | |
| * | | | | | | Add support for persisting event format versions | Erik Johnston | 2019-01-23 | 5 | -4/+50 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #4434 from matrix-org/erikj/fix_user_ips_dedup | Erik Johnston | 2019-01-22 | 1 | -26/+35 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| | * | | | | Refactor to rewrite the SQL instead | Erik Johnston | 2019-01-22 | 1 | -13/+16 | |
| | * | | | | Don't shadow params | Erik Johnston | 2019-01-22 | 1 | -4/+3 | |
| | * | | | | Fix bug when removing duplicate rows from user_ips | Erik Johnston | 2019-01-22 | 1 | -13/+20 | |
| * | | | | | Merge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registration | Neil Johnson | 2019-01-22 | 2 | -11/+14 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| | * | | | | fix line length | Neil Johnson | 2019-01-21 | 1 | -1/+3 | |
| | * | | | | Config option to disable requesting MSISDN on registration | Neil Johnson | 2019-01-21 | 2 | -11/+12 | |
* | | | | | | Move tag and direct state copying into separate function | Andrew Morgan | 2019-01-25 | 1 | -43/+63 | |
* | | | | | | lint | Andrew Morgan | 2019-01-22 | 1 | -1/+3 | |
* | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/dm_room_upg... | Andrew Morgan | 2019-01-22 | 2 | -172/+7 | |
|\| | | | | | ||||||
| * | | | | | Make key fetches use regular federation client (#4426) | Richard van der Hoff | 2019-01-22 | 2 | -172/+7 | |
* | | | | | | Prevent duplicate room IDs in m.direct | Andrew Morgan | 2019-01-22 | 1 | -10/+9 | |
* | | | | | | Fix comments | Andrew Morgan | 2019-01-22 | 1 | -2/+2 | |
* | | | | | | Join logic covers both room creator and arbitrary users | Andrew Morgan | 2019-01-22 | 1 | -33/+0 | |
* | | | | | | tags, m.direct copying over correctly | Andrew Morgan | 2019-01-22 | 2 | -11/+62 | |
* | | | | | | Fix typos | Andrew Morgan | 2019-01-22 | 3 | -13/+13 | |
* | | | | | | Migrating dm and room tags work for migrator | Andrew Morgan | 2019-01-22 | 1 | -2/+13 | |
* | | | | | | Prevent crash on user who doesn't have any direct rooms | Andrew Morgan | 2019-01-22 | 1 | -1/+1 | |
* | | | | | | Preserve DM status of a room on upgrade | Andrew Morgan | 2019-01-22 | 1 | -0/+19 | |
* | | | | | | Fix typo | Andrew Morgan | 2019-01-22 | 1 | -2/+2 | |
|/ / / / / | ||||||
* | | | | | Refactor and bugfix for resove_service (#4427) | Richard van der Hoff | 2019-01-22 | 3 | -72/+141 | |
* | | | | | Require ECDH key exchange & remove dh_params (#4429) | Amber Brown | 2019-01-22 | 2 | -42/+4 | |
| |/ / / |/| | | | ||||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_v2_inv... | Erik Johnston | 2019-01-21 | 10 | -111/+84 | |
|\| | | | ||||||
| * | | | Merge pull request #4390 from matrix-org/erikj/versioned_fed_apis | Erik Johnston | 2019-01-21 | 3 | -68/+73 | |
| |\ \ \ | ||||||
| * | | | | Migrate encryption state on room upgrade (#4411) | Andrew Morgan | 2019-01-21 | 2 | -0/+2 | |
| * | | | | Fix race when persisting create event (#4404) | Erik Johnston | 2019-01-18 | 1 | -1/+12 | |
| * | | | | Remove redundant WrappedConnection (#4409) | Richard van der Hoff | 2019-01-18 | 2 | -86/+19 | |
| * | | | | Fix incorrect logcontexts after a Deferred was cancelled (#4407) | Richard van der Hoff | 2019-01-17 | 2 | -3/+12 | |
| | |/ / | |/| | | ||||||
| * | | | sign_request -> build_auth_headers (#4408) | Richard van der Hoff | 2019-01-17 | 2 | -15/+17 | |
| * | | | Changing macaroon_secret_key no longer logs you out (#4387) | Richard van der Hoff | 2019-01-16 | 1 | -3/+0 | |
| * | | | don't store more remote device lists if they have more than 1K devices (#4397) | Richard van der Hoff | 2019-01-16 | 1 | -0/+19 | |
| * | | | Depend on pymacaroons >= 0.13.0 instead on pymacaroons-pynacl | Andrej Shadura | 2019-01-16 | 1 | -1/+1 | |
| * | | | Use msgpack instead of msgpack-python | Andrej Shadura | 2019-01-16 | 1 | -1/+1 | |
| * | | | ALL_USER_TYPES should be a tuple | Neil Johnson | 2019-01-15 | 1 | -1/+1 | |
* | | | | Add /v2/invite federation API | Erik Johnston | 2019-01-15 | 3 | -6/+41 | |
| |/ / |/| | | ||||||
* | | | Add groundwork for new versions of federation APIs | Erik Johnston | 2019-01-15 | 3 | -68/+73 | |
|/ / | ||||||
* | | Remove duplicates in the user_ips table and add an index (#4370) | Amber Brown | 2019-01-12 | 2 | -4/+160 | |
* | | Merge remote-tracking branch 'origin/master' into develop | Amber Brown | 2019-01-11 | 3 | -41/+30 | |
|\ \ | ||||||
| * | | version | Amber Brown | 2019-01-11 | 1 | -1/+1 | |
| * | | Merge branch rav/macaroon_key_fix_0.34 into rav/macaroon_key_fix_0.34.1 | Richard van der Hoff | 2019-01-10 | 2 | -40/+29 | |
| |\ \ | ||||||
| | * | | Revert "Fix macaroon_secret_key fallback logic" | Richard van der Hoff | 2019-01-10 | 1 | -3/+3 | |
| | * | | Merge branch 'rav/macaroon_key_fix' into rav/macaroon_key_fix_0.34 | Richard van der Hoff | 2019-01-10 | 2 | -43/+32 | |
| | |\ \ | ||||||
| | | * | | Fix macaroon_secret_key fallback logic | Richard van der Hoff | 2019-01-10 | 1 | -3/+3 | |
| | | * | | Skip macaroon check for access tokens in the db | Richard van der Hoff | 2019-01-10 | 1 | -38/+27 | |
| | | * | | Fix fallback to signing key for macaroon-secret-key | Richard van der Hoff | 2019-01-10 | 1 | -2/+2 | |
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2019-01-09 | 1 | -1/+1 | |
|\| | | | | ||||||
| * | | | | 0.34.1 v0.34.1 | Richard van der Hoff | 2019-01-09 | 1 | -1/+1 | |
| * | | | | Merge branch 'develop' into release-v0.34.1 | Erik Johnston | 2019-01-09 | 2 | -6/+11 | |
| |\ \ \ \ | ||||||
| * | | | | | 0.34.1rc1 | Richard van der Hoff | 2019-01-08 | 1 | -1/+1 | |
* | | | | | | Merge pull request #4368 from matrix-org/erikj/better_errors | Erik Johnston | 2019-01-09 | 1 | -68/+73 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Fixup docstrings for matrixfederationclient | Erik Johnston | 2019-01-09 | 1 | -68/+73 | |
| | |/ / / / | |/| | | | | ||||||
* / | | | | | Fix adding new rows instead of updating them if one of the key values is a NU... | Amber Brown | 2019-01-09 | 1 | -1/+9 | |
|/ / / / / | ||||||
* | | | | | Use RequestSendFailed when fail to parse content type headers | Erik Johnston | 2019-01-08 | 1 | -5/+5 | |
* | | | | | Don't log stack traces for HTTP error responses | Erik Johnston | 2019-01-08 | 1 | -1/+6 | |
|/ / / / | ||||||
* | | | | Refactor request sending to have better excpetions (#4358) | Erik Johnston | 2019-01-08 | 4 | -41/+108 | |
* | | | | Fix synapse.config.__main__ on python 3 (#4356) | Amber Brown | 2019-01-08 | 1 | -1/+1 | |
* | | | | Add GET account data routes (#4303) | Travis Ralston | 2019-01-07 | 1 | -1/+33 | |
* | | | | Check jinja version for consent resource (#4327) | Richard van der Hoff | 2019-01-07 | 3 | -28/+74 | |
* | | | | fix the check for whether `is_url` to match all the other ones in codebase (#... | Michael Telatynski | 2019-01-06 | 1 | -3/+8 | |
* | | | | fix NPE in /messages by checking if all events were filtered out (#4330) | Matthew Hodgson | 2019-01-02 | 1 | -10/+11 | |
* | | | | Ensure synchrotrons can access is_support_user in the storage layer | Neil Johnson | 2019-01-02 | 1 | -25/+25 | |
* | | | | Remove v1 only REST APIs now we don't ship matrix console (#4334) | Amber Brown | 2018-12-29 | 4 | -445/+0 | |
* | | | | Log roomid along with Unknown room (#4297) | Will Hunt | 2018-12-24 | 1 | -1/+1 | |
* | | | | Merge pull request #4307 from matrix-org/erikj/v2_rooms | Richard van der Hoff | 2018-12-24 | 2 | -1/+5 | |
|\ \ \ \ | ||||||
| * | | | | Add v2 room version | Erik Johnston | 2018-12-18 | 2 | -1/+5 | |
* | | | | | Return well_known in /login response (#4319) | Richard van der Hoff | 2018-12-24 | 1 | -7/+11 | |
* | | | | | Add a script to generate a clean config file (#4315) | Richard van der Hoff | 2018-12-22 | 9 | -46/+89 | |
* | | | | | Fix indentation in default config (#4313) | Richard van der Hoff | 2018-12-22 | 1 | -35/+35 | |
* | | | | | Fix IP URL previews on Python 3 (#4215) | Amber Brown | 2018-12-22 | 3 | -171/+255 | |
* | | | | | Make the dependencies more like a standard Python project and hook up the opt... | Amber Brown | 2018-12-22 | 3 | -147/+90 | |
* | | | | | Merge branch 'master' into develop | Richard van der Hoff | 2018-12-20 | 1 | -1/+1 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Prepare 0.34 release | Richard van der Hoff | 2018-12-20 | 1 | -1/+1 | |
| * | | | | Debian packaging via dh_virtualenv | Richard van der Hoff | 2018-12-20 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Debian packaging via dh_virtualenv (#4285) | Richard van der Hoff | 2018-12-20 | 2 | -2/+2 | |
| * | | | | | Add 'sandbox' to CSP for media repo (#4284) | David Baker | 2018-12-20 | 1 | -1/+2 | |
| * | | | | | Improved welcome page (#4294) | Nad Chishtie | 2018-12-14 | 1 | -25/+62 | |
| * | | | | | Settings Fix deleting e2e room keys on xenial (#4295) | Amber Brown | 2018-12-14 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Fixed line length | Nathan Pennie | 2018-12-19 | 1 | -1/+5 | |
* | | | | | Fix the variable names used for account_data | Nathan Pennie | 2018-12-19 | 1 | -3/+3 | |
* | | | | | ensure can report mau stats when hs.config.mau_stats_only is set (#4305) | Neil Johnson | 2018-12-18 | 1 | -1/+1 | |
* | | | | | create support user (#4141) | Neil Johnson | 2018-12-14 | 10 | -33/+159 | |
* | | | | | Settings Fix deleting e2e room keys on xenial (#4295) | Amber Brown | 2018-12-14 | 1 | -1/+1 | |
* | | | | | Improved welcome page (#4294) | Nad Chishtie | 2018-12-14 | 1 | -25/+62 | |
* | | | | | Merge branch 'release-v0.34.0' into develop | Richard van der Hoff | 2018-12-11 | 5 | -51/+68 | |
|\| | | | | ||||||
| * | | | | 0.34.0rc2 v0.34.0rc2 | Richard van der Hoff | 2018-12-11 | 1 | -1/+1 | |
| * | | | | Merge pull request #4290 from matrix-org/rav/remove_webclient | Richard van der Hoff | 2018-12-11 | 3 | -50/+38 | |
| |\ \ \ \ | ||||||
| | * | | | | Stop installing Matrix Console by default | Richard van der Hoff | 2018-12-11 | 3 | -50/+38 | |
| * | | | | | Merge pull request #4289 from matrix-org/rav/welcome_page | Richard van der Hoff | 2018-12-11 | 2 | -0/+29 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Add a welcome page to the static resources | Richard van der Hoff | 2018-12-11 | 2 | -0/+29 | |
| | |/ / / / | ||||||
| * / / / / | Prepare 0.34.0rc1 | Richard van der Hoff | 2018-12-04 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Add 'sandbox' to CSP for media repo (#4284) | David Baker | 2018-12-11 | 1 | -1/+2 | |
* | | | | | Move imports to one line | Will Hunt | 2018-12-10 | 1 | -4/+1 | |
* | | | | | Use `send_cors` | Will Hunt | 2018-12-10 | 1 | -4/+1 | |
* | | | | | changelog & isort | Will Hunt | 2018-12-09 | 1 | -1/+5 | |
* | | | | | Make /config more CORS-y | Will Hunt | 2018-12-09 | 1 | -1/+3 | |
* | | | | | Initialise user displayname from SAML2 data (#4272) | Richard van der Hoff | 2018-12-07 | 4 | -14/+37 | |
* | | | | | Implement SAML2 authentication (#4267) | Richard van der Hoff | 2018-12-07 | 7 | -2/+256 | |
* | | | | | Factor SSO success handling out of CAS login (#4264) | Richard van der Hoff | 2018-12-07 | 3 | -31/+153 | |
* | | | | | Rip out half-implemented m.login.saml2 support (#4265) | Richard van der Hoff | 2018-12-06 | 5 | -154/+3 | |
| |_|_|/ |/| | | | ||||||
* | | | | drop undocumented dependency on dateutil (#4266) | Richard van der Hoff | 2018-12-06 | 1 | -7/+6 | |
* | | | | Implement .well-known handling (#4262) | Richard van der Hoff | 2018-12-05 | 3 | -0/+81 | |
|/ / / | ||||||
* | | | Add an option to enable recording IPs for appservice users (#3831) | Travis Ralston | 2018-12-04 | 2 | -9/+25 | |
* | | | Fix non-ASCII pushrules (#4248) | Amber Brown | 2018-12-04 | 1 | -12/+23 | |
* | | | Add an option to disable search for homeservers which may not be interested i... | Travis Ralston | 2018-12-04 | 3 | -1/+20 | |
* | | | add more detail to logging regarding "More than one row matched" error (#4234) | Ben Parsons | 2018-12-04 | 1 | -6/+6 | |
* | | | Fix UnicodeDecodeError when postgres is not configured in english (#4253) | Richard van der Hoff | 2018-12-04 | 2 | -8/+46 | |
* | | | Merge pull request #4244 from aaronraimist/drop-sent-txt | Richard van der Hoff | 2018-12-04 | 6 | -74/+3 | |
|\ \ \ | ||||||
| * | | | Drop sent_transactions | Aaron Raimist | 2018-12-01 | 6 | -74/+3 | |
* | | | | Merge pull request #4250 from matrix-org/hawkowl/pusher-remove-py3 | Richard van der Hoff | 2018-12-04 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | fix type error | Amber Brown | 2018-12-03 | 1 | -1/+1 | |
* | | | | | Run the AS senders as background processes (#4189) | Richard van der Hoff | 2018-12-04 | 1 | -12/+24 | |
|/ / / / | ||||||
* / / / | Workaround for non-ascii event ids (#4241) | Richard van der Hoff | 2018-12-03 | 1 | -1/+3 | |
|/ / / | ||||||
* | | | Neilj/fix autojoin (#4223) | Neil Johnson | 2018-11-28 | 3 | -2/+24 | |
* | | | Neilj/fix mau initial reserved users (#4211) | Neil Johnson | 2018-11-28 | 1 | -2/+3 | |
* | | | Support m.login.sso (#4220) | Richard van der Hoff | 2018-11-27 | 4 | -52/+49 | |
* | | | Ignore __pycache__ directories in schema delta dir | Richard van der Hoff | 2018-11-20 | 1 | -1/+1 | |
* | | | Remove riot.im from the list of trusted Identity Servers in the default confi... | Neil Johnson | 2018-11-20 | 1 | -1/+3 | |
* | | | Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixes | Richard van der Hoff | 2018-11-20 | 1 | -2/+3 | |
|\ \ \ | ||||||
| * | | | Fix logcontext leak in EmailPusher | Richard van der Hoff | 2018-11-19 | 1 | -2/+3 | |
* | | | | Merge remote-tracking branch 'origin/master' into develop | Amber Brown | 2018-11-19 | 1 | -1/+1 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | version | Amber Brown | 2018-11-19 | 1 | -1/+1 | |
| * | | | release 0.33.9rc1 v0.33.9rc1 github/release-v0.33.9 release-v0.33.9 | Neil Johnson | 2018-11-14 | 1 | -1/+1 | |
* | | | | Fix fallback auth on Python 3 (#4197) | Amber Brown | 2018-11-19 | 1 | -22/+16 | |
| |/ / |/| | | ||||||
* | | | Remove duplicate slashes in generated consent URLs | Travis Ralston | 2018-11-15 | 2 | -3/+3 | |
* | | | Fix Content-Disposition in media repository (#4176) | Amber Brown | 2018-11-15 | 3 | -90/+110 | |
* | | | Add option to track MAU stats (but not limit people) (#3830) | Travis Ralston | 2018-11-15 | 3 | -35/+47 | |
* | | | Use <meta> tags to discover the per-page encoding of html previews (#4183) | Amber Brown | 2018-11-15 | 1 | -9/+22 | |
|/ / | ||||||
* | | Add a test for the public T&Cs form | Richard van der Hoff | 2018-11-14 | 1 | -1/+1 | |
* | | Fix an internal server error when viewing the public privacy policy | Richard van der Hoff | 2018-11-14 | 1 | -4/+7 | |
* | | Merge pull request #4113 from matrix-org/dbkr/e2e_backup_versions_are_numbers | David Baker | 2018-11-14 | 2 | -2/+70 | |
|\ \ | ||||||
| * \ | Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backup_versions_a... | David Baker | 2018-11-09 | 47 | -416/+763 | |
| |\ \ | ||||||
| * | | | pep8 | David Baker | 2018-11-09 | 1 | -1/+2 | |
| * | | | add docs | David Baker | 2018-11-09 | 1 | -1/+4 | |
| * | | | Remove unnecessary str() | David Baker | 2018-11-09 | 1 | -1/+1 | |
| * | | | Cast to int here too | David Baker | 2018-10-30 | 1 | -0/+5 | |
| * | | | Cast bacjup version to int when querying | David Baker | 2018-10-30 | 1 | -1/+6 | |
| * | | | Convert version back to a string | David Baker | 2018-10-30 | 1 | -0/+1 | |
| * | | | Try & make it work on postgres | David Baker | 2018-10-30 | 1 | -2/+2 | |
| * | | | Make e2e backup versions numeric in the DB | David Baker | 2018-10-29 | 3 | -2/+55 | |
* | | | | Merge pull request #4166 from matrix-org/erikj/drop_unknown_events | Erik Johnston | 2018-11-09 | 2 | -89/+74 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Remove hack to support rejoining rooms | Erik Johnston | 2018-11-09 | 1 | -74/+42 | |
| * | | | Simplify to always drop events if server isn't in the room | Erik Johnston | 2018-11-09 | 1 | -14/+9 | |
| * | | | Update synapse/federation/federation_server.py | Richard van der Hoff | 2018-11-09 | 1 | -1/+1 | |
| * | | | Update synapse/federation/federation_server.py | Richard van der Hoff | 2018-11-09 | 1 | -1/+1 | |
| * | | | Drop PDUs of unknown rooms | Erik Johnston | 2018-11-08 | 1 | -1/+23 | |
* | | | | Merge pull request #4164 from matrix-org/erikj/fix_device_comparison | Erik Johnston | 2018-11-08 | 1 | -1/+4 | |
|\ \ \ \ | ||||||
| * | | | | Lets convert bytes to unicode instead | Erik Johnston | 2018-11-08 | 1 | -5/+3 | |
| * | | | | Fix noop checks when updating device keys | Erik Johnston | 2018-11-08 | 1 | -0/+5 | |
| |/ / / | ||||||
* | | | | fix parse_string docstring | Richard van der Hoff | 2018-11-08 | 1 | -5/+4 | |
* | | | | Fix encoding error for consent form on python3 | hera | 2018-11-08 | 1 | -1/+3 | |
|/ / / | ||||||
* | | | Fix URL preview bugs (type error when loading cache from db, content-type inc... | Amber Brown | 2018-11-08 | 2 | -10/+20 | |
* | | | Add config variables for enabling terms auth and the policy name (#4142) | Travis Ralston | 2018-11-06 | 4 | -3/+21 | |
* | | | handle empty backups according to latest spec proposal (#4123) | Hubert Chathi | 2018-11-05 | 2 | -10/+33 | |
* | | | Tests for user consent resource (#4140) | Amber Brown | 2018-11-06 | 1 | -1/+1 | |
* | | | Add helpers for getting prev and auth events (#4139) | Erik Johnston | 2018-11-06 | 8 | -44/+60 | |
* | | | Set the encoding to UTF8 in the default logconfig (#4138) | Amber Brown | 2018-11-03 | 1 | -0/+1 | |
* | | | Merge pull request #4137 from matrix-org/erikj/clean_up_events | Erik Johnston | 2018-11-02 | 3 | -7/+4 | |
|\ \ \ | ||||||
| * | | | Clean up event accesses and tests | Erik Johnston | 2018-11-02 | 3 | -7/+4 | |
* | | | | Fix typing being reset causing infinite syncs (#4127) | Amber Brown | 2018-11-03 | 2 | -4/+24 | |
* | | | | Merge pull request #4132 from matrix-org/rav/fix_device_list_locking | Richard van der Hoff | 2018-11-02 | 3 | -11/+128 | |
|\ \ \ \ | ||||||
| * | | | | Add unique indexes to a couple of tables | Richard van der Hoff | 2018-11-02 | 3 | -6/+88 | |
| * | | | | Remove redundant database locks for device list updates | Richard van der Hoff | 2018-11-02 | 1 | -5/+40 | |
* | | | | | Merge pull request #4133 from matrix-org/travis/fix-terms-auth | Richard van der Hoff | 2018-11-02 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix logic error that prevented guests from seeing the privacy policy | Travis Ralston | 2018-11-01 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #4135 from matrix-org/erikj/fix_state_res_none | Erik Johnston | 2018-11-02 | 1 | -0/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix None exception in state res v2 | Erik Johnston | 2018-11-02 | 1 | -0/+4 | |
| |/ / / | ||||||
* | | | | Merge pull request #4004 from matrix-org/travis/login-terms | Travis Ralston | 2018-11-01 | 5 | -17/+135 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Include a version query string arg for the consent route | Travis Ralston | 2018-10-31 | 2 | -3/+8 | |
| * | | | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-31 | 45 | -879/+1761 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-24 | 46 | -503/+1136 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'develop' into travis/login-terms | Travis Ralston | 2018-10-18 | 21 | -106/+472 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | pep8 | Travis Ralston | 2018-10-15 | 3 | -14/+3 | |
| * | | | | | | Ensure the terms params are actually provided | Travis Ralston | 2018-10-15 | 1 | -0/+1 | |
| * | | | | | | Python is hard | Travis Ralston | 2018-10-15 | 1 | -5/+6 |