summary refs log tree commit diff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of github.com:matrix-org/synapse into ↵Erik Johnston2017-12-0773-820/+1776
|\ | | | | | | erikj/createroom_content
| * Merge pull request #2723 from matrix-org/matthew/search-all-local-usersMatthew Hodgson2017-12-0511-37/+234
| |\ | | | | | | Add all local users to the user_directory and optionally search them
| | * fix StoreError syntaxMatthew Hodgson2017-12-051-1/+1
| | |
| | * speed up the rate of initial spam for usersMatthew Hodgson2017-12-041-11/+12
| | |
| | * better docMatthew Hodgson2017-12-041-1/+4
| | |
| | * try make tests work a bit more...Matthew Hodgson2017-12-041-0/+12
| | |
| | * erik told me toMatthew Hodgson2017-12-041-1/+1
| | |
| | * fix pep8 and testsMatthew Hodgson2017-12-043-8/+6
| | |
| | * switch to a simpler 'search_all_users' button as per review feedbackMatthew Hodgson2017-12-045-37/+30
| | |
| | * Merge branch 'develop' into matthew/search-all-local-usersMatthew Hodgson2017-11-3032-200/+633
| | |\
| | * | specify default user_directory_include_patternMatthew Hodgson2017-11-301-0/+1
| | | |
| | * | remove null constraint on user_dir.room_idMatthew Hodgson2017-11-301-0/+35
| | | |
| | * | fix alternation operator for FTS4 - how did this ever work!?Matthew Hodgson2017-11-301-1/+1
| | | |
| | * | fix thinkos galoreMatthew Hodgson2017-11-303-20/+41
| | | |
| | * | kick the user_directory index when new users registerMatthew Hodgson2017-11-291-0/+8
| | | |
| | * | untested WIP but might actually workMatthew Hodgson2017-11-296-20/+96
| | | |
| | * | Add user_directory_include_pattern config param to expand search results to ↵Matthew Hodgson2017-11-295-9/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional users Initial commit; this doesn't work yet - the LIKE filtering seems too aggressive. It also needs _do_initial_spam to be aware of prepopulating the whole user_directory_search table with all users... ...and it needs a handle_user_signup() or something to be added so that new signups get incrementally added to the table too. Committing it here as a WIP
| * | | Fix error when deleting devicesRichard van der Hoff2017-12-051-1/+1
| | | | | | | | | | | | | | | | This was introduced in d7ea8c4 / PR #2728
| * | | Merge pull request #2729 from matrix-org/rav/custom_ui_authRichard van der Hoff2017-12-051-24/+57
| |\ \ \ | | | | | | | | | | support custom login types for validating users
| | * | | support custom login types for validating usersRichard van der Hoff2017-12-051-24/+57
| |/ / / | | | | | | | | | | | | | | | | Wire the custom login type support from password providers into the UI-auth user-validation flows.
| * | | Merge pull request #2728 from matrix-org/rav/validate_user_via_ui_authRichard van der Hoff2017-12-053-74/+102
| |\ \ \ | | | | | | | | | | Factor out a validate_user_via_ui_auth method
| | * | | Factor out a validate_user_via_ui_auth methodRichard van der Hoff2017-12-053-74/+102
| |/ / / | | | | | | | | | | | | Collect together all the places that validate a logged-in user via UI auth.
| * | | Merge pull request #2727 from matrix-org/rav/refactor_ui_auth_returnRichard van der Hoff2017-12-057-48/+103
| |\ \ \ | | | | | | | | | | Refactor UI auth implementation
| | * | | Refactor UI auth implementationRichard van der Hoff2017-12-057-48/+103
| | | |/ | | |/| | | | | | | | | | | | | Instead of returning False when auth is incomplete, throw an exception which can be caught with a wrapper.
| * | | Merge pull request #2716 from matrix-org/rav/federation_client_postRichard van der Hoff2017-12-041-8/+34
| |\ \ \ | | |/ / | |/| | federation_client script: Support for posting content
| | * | federation_client script: Support for posting contentRichard van der Hoff2017-11-281-8/+34
| | | |
| * | | Merge pull request #2721 from matrix-org/rav/get_user_by_access_token_commentsRichard van der Hoff2017-11-291-1/+5
| |\ \ \ | | | | | | | | | | Improve comments on get_user_by_access_token
| | * | | Improve comments on get_user_by_access_tokenRichard van der Hoff2017-11-291-1/+5
| | |/ / | | | | | | | | | | | | because I have to reverse-engineer this every time.
| * | | Merge pull request #2722 from matrix-org/rav/delete_device_on_logoutRichard van der Hoff2017-11-2912-64/+226
| |\ \ \ | | | | | | | | | | Delete devices and pushers on logouts etc
| | * | | Delete devices in various logout situationsRichard van der Hoff2017-11-295-5/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we delete devices whenever a user is logged out due to any of the following situations: * /logout * /logout_all * change password * deactivate account (by the user or by an admin) * invalidate access token from a dynamic module Fixes #2672.
| | * | | Move set_password into its own handlerRichard van der Hoff2017-11-296-19/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-functional refactoring to move set_password. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop.
| | * | | Move deactivate_account into its own handlerRichard van der Hoff2017-11-296-22/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-functional refactoring to move deactivate_account. This means that we'll be able to properly deactivate devices and access tokens without introducing a dependency loop.
| | * | | Remove pushers when deleting access tokensRichard van der Hoff2017-11-293-18/+32
| |/ / / | | | | | | | | | | | | | | | | Whenever an access token is invalidated, we should remove the associated pushers.
| * | | Merge pull request #2718 from matrix-org/rav/notify_logcontextsRichard van der Hoff2017-11-292-9/+18
| |\ \ \ | | | | | | | | | | Clear logcontext before starting fed txn queue runner
| | * | | Clear logcontext before starting fed txn queue runnerRichard van der Hoff2017-11-282-9/+18
| | |/ / | | | | | | | | | | | | | | | | These processes take a long time compared to the request, so there is lots of "Entering|Restoring dead context" in the logs. Let's try to shut it up a bit.
| * | | Merge pull request #2719 from matrix-org/rav/handle_missing_hashesRichard van der Hoff2017-11-291-3/+10
| |\ \ \ | | | | | | | | | | Fix 500 when joining matrix-dev
| | * | | Fix 500 when joining matrix-devRichard van der Hoff2017-11-291-3/+10
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | matrix-dev has an event (`$/6ANj/9QWQyd71N6DpRQPf+SDUu11+HVMeKSpMzBCwM:zemos.net`) which has no `hashes` member. Check for missing `hashes` element in events.
| * | | Merge pull request #2715 from matrix-org/luke/group-guest-accessLuke Barnard2017-11-281-11/+11
| |\ \ \ | | |/ / | |/| | Allow guest access to group APIs for reading
| | * | Allow guest access to group APIs for readingLuke Barnard2017-11-281-11/+11
| |/ /
| * | Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_errorRichard van der Hoff2017-11-276-17/+89
| |\ \ | | | | | | | | Fix error on sqlite 3.7
| | * | fix sql failsRichard van der Hoff2017-11-221-1/+1
| | | |
| | * | Check database in has_completed_background_updatesRichard van der Hoff2017-11-223-12/+33
| | | | | | | | | | | | | | | | so that the right thing happens on workers.
| | * | Fix error on sqlite 3.7Richard van der Hoff2017-11-215-8/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the url_cache index on local_media_repository as a background update, so that we can detect whether we are on sqlite or not and create a partial or complete index accordingly. To avoid running the cleanup job before we have built the index, add a bailout which will defer the cleanup if the bg updates are still running. Fixes https://github.com/matrix-org/synapse/issues/2572.
| * | | Merge pull request #2713 from matrix-org/rav/no_upsert_foreverRichard van der Hoff2017-11-271-0/+7
| |\ \ \ | | | | | | | | | | Avoid retrying forever on IntegrityError
| | * | | Avoid retrying forever on IntegrityErrorRichard van der Hoff2017-11-271-0/+7
| | | | |
| * | | | Merge pull request #2711 from matrix-org/rav/fix_dns_errhandlerRichard van der Hoff2017-11-271-2/+4
| |\ \ \ \ | | | | | | | | | | | | Fix error handling on dns lookup
| | * | | | Fix error handling on dns lookupRichard van der Hoff2017-11-241-2/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | pass the right arguments to the errback handler Fixes "TypeError('eb() takes exactly 2 arguments (1 given)',)"
| * | | | Merge pull request #2710 from matrix-org/rav/remove_dead_codeRichard van der Hoff2017-11-271-2/+1
| |\ \ \ \ | | | | | | | | | | | | Tiny code cleanups
| | * | | | Add a comment which might save some confusionRichard van der Hoff2017-11-241-0/+1
| | | | | |
| | * | | | Remove dead sync_callbackRichard van der Hoff2017-11-241-2/+0
| | |/ / / | | | | | | | | | | | | | | | This is never used; let's remove it to stop confusing things.
| * | | | Merge pull request #2708 from matrix-org/rav/replication_logcontext_leaksRichard van der Hoff2017-11-271-2/+4
| |\ \ \ \ | | | | | | | | | | | | Fix some logcontext leaks in replication resource
| | * | | | Fix some logcontext leaks in replication resourceRichard van der Hoff2017-11-231-2/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | The @measure_func annotations rely on the wrapped function respecting the logcontext rules. Add the necessary yields to make this work.
| * | | | Merge pull request #2707 from matrix-org/rav/fix_urlpreviewRichard van der Hoff2017-11-271-1/+5
| |\ \ \ \ | | | | | | | | | | | | Fix OPTIONS on preview_url
| | * | | | Fix OPTIONS on preview_urlRichard van der Hoff2017-11-231-1/+5
| | |/ / / | | | | | | | | | | | | | | | Fixes #2706
| * | | | Merge pull request #2705 from matrix-org/rav/improve_tracebacksRichard van der Hoff2017-11-271-3/+9
| |\ \ \ \ | | |/ / / | |/| | | Improve tracebacks on exceptions
| | * | | Improve tracebacks on exceptionsRichard van der Hoff2017-11-271-3/+9
| |/ / / | | | | | | | | | | | | | | | | Use failure.Failure to recover our failure, which will give us a useful stacktrace, unlike the rethrown exception.
| * | | Merge pull request #2701 from matrix-org/rav/one_mediarepo_to_rule_them_allRichard van der Hoff2017-11-226-13/+48
| |\ \ \ | | | | | | | | | | Try to avoid having multiple PreviewUrlResource instances
| | * | | Add config option to disable media_repo on main synapseRichard van der Hoff2017-11-224-9/+30
| | | | | | | | | | | | | | | | | | | | ... to stop us doing the cache cleanup jobs on the master.
| | * | | Build MediaRepositoryResource as a homeserver dependencyRichard van der Hoff2017-11-224-5/+19
| |/ / / | | | | | | | | | | | | | | | | | | | | This avoids the scenario where we have four different PreviewUrlResources configured on a single app, each of which have their own caches and cache clearing jobs.
| * | | Merge pull request #2700 from matrix-org/rav/worker_docsRichard van der Hoff2017-11-211-21/+133
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * Improve documentation of workers Fixes https://github.com/matrix-org/synapse/issues/2554
| | * | | Improve documentation of workersRichard van der Hoff2017-11-211-21/+133
| | |/ / | | | | | | | | | | | | Fixes https://github.com/matrix-org/synapse/issues/2554
| * | | Merge pull request #2698 from matrix-org/rav/remove_dead_dependenciesRichard van der Hoff2017-11-211-16/+15
| |\ \ \ | | | | | | | | | | Clean up dependency list
| | * | | Clean up dependency listRichard van der Hoff2017-11-211-16/+15
| | |/ / | | | | | | | | | | | | | | | | remove those that aren't used at all, and replace the ones that don't have builders with simple getters rather than dynamically-generated methods.
| * | | Merge pull request #2689 from matrix-org/rav/unlock_account_data_upsertRichard van der Hoff2017-11-211-36/+49
| |\ \ \ | | |_|/ | |/| | Avoid locking account_data tables for upserts
| | * | Avoid locking account_data tables for upsertsRichard van der Hoff2017-11-161-36/+49
| | | |
| * | | sanity checksMatthew Hodgson2017-11-211-1/+4
| | |/ | |/|
| * | don't double-invite in sync_room_to_group.plMatthew Hodgson2017-11-191-3/+6
| | |
| * | Merge pull request #2688 from matrix-org/rav/unlock_more_upsertRichard van der Hoff2017-11-172-5/+51
| |\ \ | | | | | | | | Avoid locking for upsert on pushers tables
| | * | Avoid locking for upsert on pushers tablesRichard van der Hoff2017-11-162-5/+51
| | | | | | | | | | | | | | | | | | | | * replace the upsert into deleted_pushers with an insert * no need to lock for upsert on pusher_throttle
| * | | Merge branch 'master' into developRichard van der Hoff2017-11-172-1/+9
| |\ \ \
| * \ \ \ Merge pull request #2686 from matrix-org/luke/as-flairLuke Barnard2017-11-174-1/+49
| |\ \ \ \ | | | | | | | | | | | | Add automagical AS Publicised Group(s)
| | * | | | Add extra space before inline commentLuke Barnard2017-11-161-1/+1
| | | | | |
| | * | | | Extract group_id from the dict for multiple useLuke Barnard2017-11-161-4/+5
| | | | | |
| | * | | | Fix testsLuke Barnard2017-11-161-0/+1
| | | | | |
| | * | | | Remove unused GROUP_ID_REGEXLuke Barnard2017-11-161-2/+0
| | | | | |
| | * | | | Document get_groups_for_userLuke Barnard2017-11-161-0/+6
| | | | | |
| | * | | | Flake8Luke Barnard2017-11-161-1/+1
| | | | | |
| | * | | | Use a generator instead of a listLuke Barnard2017-11-161-2/+2
| | | | | |
| | * | | | Make sure we check AS groups for lookup on bulkLuke Barnard2017-11-161-0/+5
| | | | | |
| | * | | | Check group_id belongs to this domainLuke Barnard2017-11-162-3/+12
| | | | | |
| | * | | | Add automagical AS Publicised Group(s)Luke Barnard2017-11-162-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | via registration file "users" namespace: ```YAML ... namespaces: users: - exclusive: true regex: '.*luke.*' group_id: '+all_the_lukes:hsdomain' ... ``` This is part of giving App Services their own groups for matching users. With this, ghost users will be given the appeareance that they are in a group and that they have publicised the fact, but _only_ from the perspective of the `get_publicised_groups_for_user` API.
| * | | | | typoMatthew Hodgson2017-11-171-1/+1
| | | | | |
| * | | | | quick and dirty room membership<->group membership sync scriptMatthew Hodgson2017-11-171-0/+39
| | |_|_|/ | |/| | |
| * | | | Fix auth handler #2678Jurek2017-11-161-1/+1
| | |_|/ | |/| |
| * | | Merge pull request #2684 from matrix-org/rav/unlock_upsertRichard van der Hoff2017-11-162-49/+74
| |\ \ \ | | |/ / | |/| | Start work on avoiding table locks for upserts
| | * | Fix broken ref to IntegrityErrorRichard van der Hoff2017-11-161-1/+1
| | | |
| | * | Avoid locking `pushers` table on upsertRichard van der Hoff2017-11-161-27/+28
| | | | | | | | | | | | | | | | | | | | Now that _simple_upsert will retry on IntegrityError, we don't need to lock the table.
| | * | _simple_upsert: retry on IntegrityErrorRichard van der Hoff2017-11-161-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | wrap the call to _simple_upsert_txn in a loop so that we retry on an integrityerror: this means we can avoid locking the table provided there is an unique index.
| | * | Cleanup in _simple_upsert_txnRichard van der Hoff2017-11-161-16/+17
| |/ / | | | | | | | | | Bail out early to reduce indentation
| * | Merge pull request #2661 from matrix-org/rav/statereadstoreRichard van der Hoff2017-11-153-249/+237
| |\ \ | | | | | | | | Pull out bits of StateStore to a mixin
| | * | Pull out bits of StateStore to a mixinRichard van der Hoff2017-11-142-237/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... so that we don't need to secretly gut-wrench it for use in the slaved stores. I haven't done the other stores yet, but we should. I'm tired of the workers breaking every time we tweak the stores because I forgot to gut-wrench the right method. fixes https://github.com/matrix-org/synapse/issues/2655.
| | * | Revert "Revert "move _state_group_cache to statestore""Richard van der Hoff2017-11-142-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We're going to fix this properly on this branch, so that the _state_group_cache can end up in StateGroupReadStore. This reverts commit ab335edb023d66cd0be439e045b10ca104b73cb5.
| * | | Merge pull request #2677 from matrix-org/rav/spec_r0.3.0Richard van der Hoff2017-11-151-0/+1
| |\ \ \ | | | | | | | | | | Declare support for r0.3.0
| | * | | Declare support for r0.3.0Richard van der Hoff2017-11-151-0/+1
| | | | |
| * | | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-11-151-0/+8
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcsRichard van der Hoff2017-11-1510-96/+23
| |\ \ \ \ | | | | | | | | | | | | Remove preserve_context_over_{fn, deferred}
| | * | | | Remove __PreservingContextDeferred tooRichard van der Hoff2017-11-141-30/+0
| | | | | |
| | * | | | Remove preserve_context_over_{fn, deferred}Richard van der Hoff2017-11-1410-66/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both of these functions ae known to leak logcontexts. Replace the remaining calls to them and kill them off.
| * | | | | Merge pull request #2650 from matrix-org/dbkr/push_include_content_optionDavid Baker2017-11-152-15/+32
| |\ \ \ \ \ | | | | | | | | | | | | | | Rename redact_content option to include_content
| | * | | | | Print instead of loggingDavid Baker2017-11-131-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | because we had to wait until the logger was set up
| | * | | | | Make the commented config have the defaultDavid Baker2017-11-091-1/+1
| | | | | | |
| | * | | | | better commentsDavid Baker2017-11-081-2/+5
| | | | | | |
| | * | | | | Log if any of the old config flags are setDavid Baker2017-11-081-2/+24
| | | | | | |
| | * | | | | Rename redact_content option to include_contentDavid Baker2017-11-082-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The redact_content option never worked because it read the wrong config section. The PR introducing it (https://github.com/matrix-org/synapse/pull/2301) had feedback suggesting the name be changed to not re-use the term 'redact' but this wasn't incorporated. This reanmes the option to give it a less confusing name, and also means that people who've set the redact_content option won't suddenly see a behaviour change when upgrading synapse, but instead can set include_content if they want to. This PR also updates the wording of the config comment to clarify that this has no effect on event_id_only push. Includes https://github.com/matrix-org/synapse/pull/2422
| * | | | | | Merge pull request #2648 from krombel/update_prometheusRichard van der Hoff2017-11-143-1/+78
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | update prometheus-config to new format
| | * | | | | | Make clear that the config has changed since prometheus v2Krombel2017-11-143-2/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This restores the config that is usable for prometheus pre v2.0.0 The new config only works for Prometheus v2+
| | * | | | | | update prometheus-config to new formatKrombel2017-11-072-23/+67
| | | | | | | |
| * | | | | | | Merge pull request #2671 from matrix-org/rav/room_list_fixesRichard van der Hoff2017-11-141-20/+30
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Reshuffle room list request code
| | * | | | | | | Reshuffle room list request codeRichard van der Hoff2017-11-141-27/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm not entirely sure if this will actually help anything, but it simplifies the code and might give further clues about why room list search requests are blowing out the get_current_state_ids caches.
| | * | | | | | | Add a load of logging to the room_list handlerRichard van der Hoff2017-11-141-0/+13
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | So we can see what it gets up to.
| * | | | | | | Merge pull request #2673 from matrix-org/erikj/fix_port_script_groupsRichard van der Hoff2017-11-141-0/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add new boolean columns to port script
* | | | | | | | | Copy dict in update_membership tooErik Johnston2017-12-071-0/+4
| | | | | | | | |
* | | | | | | | | PEP8Erik Johnston2017-11-281-1/+1
| | | | | | | | |
* | | | | | | | | Fix wrong avatars when inviting multiple users when creating roomErik Johnston2017-11-281-5/+5
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | We reused the `content` dictionary between invite requests, which meant they could end up reusing the profile info for a previous user
* | | | | | | | Merge branch 'release-v0.25.1'Richard van der Hoff2017-11-173-2/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Bump version in __init__.py v0.25.1 github/release-v0.25.1 release-v0.25.1Richard van der Hoff2017-11-171-1/+1
| | | | | | | | |
| * | | | | | | | Prep changelog for v0.25.1Richard van der Hoff2017-11-171-0/+8
| | | | | | | | |
| * | | | | | | | Fix auth handler #2678Jurek2017-11-171-1/+1
| | | | | | | | |
* | | | | | | | | Revert "Merge pull request #2679 from jkolo/fix_auth_handler"Richard van der Hoff2017-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR was against master, not develop :( This reverts commit 203058a027193b6a07a148319a9a728bf7f8420c, reversing changes made to 552f123bea1014680ab798b7e34cd1b23424a189.
* | | | | | | | | Merge pull request #2679 from jkolo/fix_auth_handlerRichard van der Hoff2017-11-161-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Fix auth handler
| * | | | | | | | Fix auth handler #2678Jurek2017-11-151-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'release-v0.25.0' of github.com:matrix-org/synapse v0.25.0Erik Johnston2017-11-1585-689/+1783
|\| | | | | | |
| * | | | | | | Bump changelog github/release-v0.25.0 release-v0.25.0Erik Johnston2017-11-151-0/+8
| | |/ / / / / | |/| | | | |
| * | | | | | Less s'sErik Johnston2017-11-141-2/+2
| | | | | | |
| * | | | | | Add new boolean columns to port scriptErik Johnston2017-11-141-0/+7
| |/ / / / /
| * | | | / Bump version and changelog v0.25.0-rc1Erik Johnston2017-11-142-1/+51
| | |_|_|/ | |/| | |
| * | | | Merge pull request #2658 from matrix-org/rav/store_heirarchy_initRichard van der Hoff2017-11-1422-44/+44
| |\ \ \ \ | | |/ / / | |/| | | Make __init__ consistent across Store hierarchy
| | * | | Fix tests for Store.__init__ updateRichard van der Hoff2017-11-135-11/+11
| | | | | | | | | | | | | | | | | | | | Fix the test to pass the right number of args to the Store constructors
| | * | | Make __init__ consitstent across Store heirarchyRichard van der Hoff2017-11-1317-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add db_conn parameters to the `__init__` methods of the *Store classes, so that they are all consistent, which makes the multiple inheritance work correctly (and so that we can later extract mixins which can be used in the slavedstores)
| * | | | Merge pull request #2668 from turt2live/travis/whoamiRichard van der Hoff2017-11-141-0/+15
| |\ \ \ \ | | | | | | | | | | | | Add a route for determining who you are
| | * | | | Remove redundent callTravis Ralston2017-11-131-2/+0
| | | | | | | | | | | | | | | | | | Signed-off-by: Travis Ralston <travpc@gmail.com>
| | * | | | Add a route for determining who you areTravis Ralston2017-11-121-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Useful for applications which may have an access token, but no idea as to who owns it. Signed-off-by: Travis Ralston <travpc@gmail.com>
| * | | | | Merge pull request #2669 from matrix-org/rav/cache_urlpreview_failureRichard van der Hoff2017-11-131-41/+47
| |\ \ \ \ \ | | | | | | | | | | | | | | Cache failures in url_preview handler
| | * | | | | Bit more loggingRichard van der Hoff2017-11-101-0/+2
| | | | | | |
| | * | | | | Cache failures in url_preview handlerRichard van der Hoff2017-11-101-41/+45
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Reshuffle the caching logic in the url_preview handler so that failures are cached (and to generally simplify things and fix the logcontext leaks).
| * | | | | Merge pull request #2663 from matrix-org/rav/invalid_request_utf8Richard van der Hoff2017-11-131-1/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Fix 500 on invalid utf-8 in request
| | * | | | Merge branch 'develop' into rav/invalid_request_utf8Richard van der Hoff2017-11-136-18/+46
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Revert "move _state_group_cache to statestore"Erik Johnston2017-11-132-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f5cf3638e9c6086e1c33ddad8eda9298cf53a58e.
| * | | | | Up cache size of get_global_account_data_by_type_for_userErik Johnston2017-11-131-1/+1
| | |/ / / | |/| | |
| * | | | Merge pull request #2662 from matrix-org/rav/fix_mxids_againRichard van der Hoff2017-11-103-5/+32
| |\ \ \ \ | | | | | | | | | | | | Downcase userid on registration
| | * | | | Add some more comments appservice user registrationRichard van der Hoff2017-11-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Explain why we don't validate userids registered via app services
| | * | | | Downcase userids for shared-secret registrationRichard van der Hoff2017-11-102-3/+21
| | | | | |
| | * | | | Downcase userid on registrationRichard van der Hoff2017-11-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force username to lowercase before attempting to register https://github.com/matrix-org/synapse/issues/2660
| | * | | | Revert "Allow upper-case characters in mxids"Richard van der Hoff2017-11-091-3/+3
| |/ / / / | | | | | | | | | | | | | | | This reverts commit b70b64690330c25cbd04c1b2cacf8276b566efc8.
| | * / / Fix 500 on invalid utf-8 in requestRichard van der Hoff2017-11-101-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If somebody sends us a request where the the body is invalid utf-8, we should return a 400 rather than a 500. (json.loads throws a UnicodeError in this situation) We might as well catch all Exceptions here: it seems very unlikely that we would get a request that *isn't caused by invalid json.
| * | | Merge pull request #2659 from ↵Richard van der Hoff2017-11-091-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | matrix-org/rav/apparently_we_dont_follow_our_own_spec_now Allow upper-case characters in mxids
| | * | | Allow upper-case characters in mxidsRichard van der Hoff2017-11-091-3/+3
| |/ / / | | | | | | | | | | | | Because we're never going to be able to fix this :'(
| * | | Fix typoErik Johnston2017-11-091-1/+1
| | | |
| * | | Register group servletErik Johnston2017-11-091-0/+1
| | | |
| * | | Merge pull request #2657 from matrix-org/erikj/group_visibility_namespaceLuke Barnard2017-11-091-9/+19
| |\ \ \ | | | | | | | | | | Namespace visibility options for groups
| | * | | Namespace visibility options for groupsErik Johnston2017-11-091-9/+19
| |/ / /
| * | | Merge pull request #2656 from matrix-org/rav/fix_deactivateRichard van der Hoff2017-11-091-2/+1
| |\ \ \ | | | | | | | | | | Fix 'NoneType' not iterable in /deactivate
| | * | | Fix 'NoneType' not iterable in /deactivateRichard van der Hoff2017-11-091-2/+1
| | | | | | | | | | | | | | | | | | | | make sure we actually return a value from user_delete_access_tokens
| * | | | Merge pull request #2651 from matrix-org/erikj/update_group_room_settingsErik Johnston2017-11-096-29/+120
| |\ \ \ \ | | | | | | | | | | | | Change so that update group room visibility isn't an upsert
| | * | | | Add bracketsErik Johnston2017-11-091-2/+4
| | | | | |
| | * | | | Have an explicit API to update room configErik Johnston2017-11-086-1/+100
| | | | | |
| | * | | | Revert "Modify group room association API to allow modification of is_public"Erik Johnston2017-11-086-32/+22
| |/ / / /
| * | | | Merge pull request #2631 from xyzz/fix_appservice_event_backlogErik Johnston2017-11-082-8/+13
| |\ \ \ \ | | | | | | | | | | | | Fix appservices being backlogged and not receiving new events due to a bug in notify_interested_services
| | * | | | Remove useless assignment in notify_interested_servicesIlya Zhuravlev2017-11-071-1/+0
| | | | | |
| | * | | | Fix appservice tests to account for new behavior of notify_interested_servicesIlya Zhuravlev2017-11-021-3/+12
| | | | | |
| | * | | | Fix appservices being backlogged and not receiving new events due to a bug ↵Ilya Zhuravlev2017-11-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | in notify_interested_services
| * | | | | Merge pull request #2637 from spantaleev/avoid-noop-media-deletesErik Johnston2017-11-081-0/+6
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Avoid no-op media deletes
| | * | | | Avoid no-op media deletesSlavi Pantaleev2017-11-041-0/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are no media entries to delete, avoid creating transactions, prepared statements and unnecessary log entries. Signed-off-by: Slavi Pantaleev <slavi@devture.com>
| * | | | Merge pull request #2649 from matrix-org/rav/fix_delta_on_state_resRichard van der Hoff2017-11-083-33/+58
| |\ \ \ \ | | | | | | | | | | | | Fix bug in state group storage
| | * | | | s/items/iteritems/Richard van der Hoff2017-11-081-2/+2
| | | | | |
| | * | | | Update deltas when doing auth resolutionRichard van der Hoff2017-11-071-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where the persisted state groups were different to those actually being used after auth resolution.
| | * | | | factor out _update_context_for_auth_eventsRichard van der Hoff2017-11-071-20/+42
| | | | | | | | | | | | | | | | | | | | | | | | This is duplicated, so let's factor it out before fixing it
| | * | | | move _state_group_cache to statestoreRichard van der Hoff2017-11-072-13/+12
| | | |/ / | | |/| | | | | | | | | | | | this is internal to statestore, so let's keep it there.
| * | | | Merge pull request #2643 from matrix-org/matthew/user_dir_typosMatthew Hodgson2017-11-076-14/+55
| |\ \ \ \ | | |/ / / | |/| | | Fix various embarrassing typos around user_directory and add some doc.
| | * | | create new indexes before dropping old ones to keep safetynet in placeMatthew Hodgson2017-11-071-2/+4
| | | | |
| | * | | s/users_in_pubic_room/users_in_public_rooms/gMatthew Hodgson2017-11-041-2/+2
| | | | |
| | * | | s/users_in_pubic_room/users_in_public_rooms/gMatthew Hodgson2017-11-042-10/+32
| | | | |
| | * | | fix copyright....Matthew Hodgson2017-11-041-1/+1
| | | | |
| | * | | s/popualte/populate/Matthew Hodgson2017-11-041-1/+1
| | | | |
| | * | | s/intial/initial/Matthew Hodgson2017-11-041-2/+2
| | | | |
| | * | | simplify instructions for regenerating user_dirMatthew Hodgson2017-11-041-0/+17
| | |/ /
| * | | Merge pull request #2636 from farialima/me-masterErik Johnston2017-11-071-13/+8
| |\ \ \ | | | | | | | | | | Fix for #2635: correctly update rooms avatar/display name when modified by admin
| | * | | removed unused import flagged by flake8aFrancois Granade2017-11-031-1/+0
| | | | |
| | * | | Fix for issue 2635: correctly update rooms avatar/display name when modified ↵Francois Granade2017-11-031-12/+8
| |/ / / |/| | | | | | | | | | | by admin
| * | | Revert "Merge branch 'master' of github.com:matrix-org/synapse into develop"Erik Johnston2017-11-071-1/+10
| | | | | | | | | | | | | | | | | | | | This reverts commit f9b255cd62fe724e16b2222f6af623b2d39282ab, reversing changes made to 1bd654dabde776bbb7ee365c115b307cd6a110b8.
| * | | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-11-071-10/+1
| |\ \ \ | |/ / / |/| | / | | |/ | |/|
* | | Merge pull request #2598 from matrix-org/revert-2596-erikj/attestation_jitterErik Johnston2017-10-271-12/+1
|\ \ \ | | | | | | | | Revert "Add jitter to validity period of attestations"
| * | | Revert "Add jitter to validity period of attestations"Erik Johnston2017-10-271-12/+1
|/ / /
* | | Merge pull request #2596 from matrix-org/erikj/attestation_jitterErik Johnston2017-10-271-1/+12
|\ \ \ | | | | | | | | Add jitter to validity period of attestations
| | * \ Merge pull request #2647 from matrix-org/luke/get-group-users-is-privilegedLuke Barnard2017-11-072-3/+4
| | |\ \ | | | | | | | | | | Return whether a user is an admin within a group
| | | * | Remember to pick is_admin out of the dbLuke Barnard2017-11-071-1/+1
| | | | |
| | | * | Return whether a user is an admin within a groupLuke Barnard2017-11-071-2/+3
| | |/ /
| | * | Merge pull request #2576 from maximevaillancourt/exclude-noscript-url-previewMatthew Hodgson2017-11-071-1/+8
| | |\ \ | | | | | | | | | | Ignore <noscript> tags when generating URL preview descriptions
| | | * | Ignore noscript tags when generating URL previewsMaxime Vaillancourt2017-10-251-1/+8
| | | | |
| | * | | Merge pull request #2646 from matrix-org/rav/logging_for_limiterRichard van der Hoff2017-11-071-7/+17
| | |\ \ \ | | | |_|/ | | |/| | Logging and logcontext fixes for Limiter
| | | * | Logging and logcontext fixes for LimiterRichard van der Hoff2017-11-071-7/+17
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some logging to the Limiter in a similar spirit to the Linearizer, to help debug issues. Also fix a logcontext leak. Also refactor slightly to avoid throwing exceptions.
| | * | Merge pull request #2630 from matrix-org/luke/fix-rooms-in-groupDavid Baker2017-11-021-3/+1
| | |\ \ | | | | | | | | | | Make the get_rooms_in_group API more sane
| | | * | Make the get_rooms_in_group API more saneLuke Barnard2017-11-021-3/+1
| | | | | | | | | | | | | | | | | | | | Return entries with is_public = True when they're public and is_public = False otherwise.
| | * | | Merge pull request #2629 from matrix-org/rav/register_inhibit_loginDavid Baker2017-11-021-12/+16
| | |\ \ \ | | | |/ / | | |/| | support inhibit_login in /register
| | | * | support inhibit_login in /registerRichard van der Hoff2017-11-021-12/+16
| | | | | | | | | | | | | | | | | | | | Allow things to pass inhibit_login when registering to ... inhibit logins.
| | * | | Merge pull request #2628 from matrix-org/rav/module_api_hooksDavid Baker2017-11-021-0/+34
| | |\ \ \ | | | | | | | | | | | | Add more hooks to ModuleApi
| | | * \ \ Merge remote-tracking branch 'origin/develop' into rav/module_api_hooksDavid Baker2017-11-023-45/+137
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #2627 from matrix-org/rav/custom_rest_endpointsDavid Baker2017-11-023-0/+74
| | |\ \ \ \ | | | | | | | | | | | | | | Add a hook for custom rest endpoints
| | | * | | | Add a hook for custom rest endpointsRichard van der Hoff2017-11-023-0/+74
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | Let the user specify custom modules which can be used for implementing extra endpoints.
| | * | | | Merge pull request #2626 from matrix-org/rav/refactor_module_apiDavid Baker2017-11-023-70/+83
| | |\ \ \ \ | | | | | | | | | | | | | | Factor _AccountHandler proxy out to ModuleApi
| | * \ \ \ \ Merge pull request #2625 from matrix-org/rav/named_resource_refactorDavid Baker2017-11-021-46/+64
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | Factor out _configure_named_resource
| | | * | | | Factor out _configure_named_resourceRichard van der Hoff2017-11-021-46/+64
| | |/ / / / | | | | | | | | | | | | | | | | | | This was a bit of a code vomit, so let's factor it out to preserve some sanity
| | | | * / Add more hooks to ModuleApiRichard van der Hoff2017-11-021-0/+34
| | | |/ / | | | | | | | | | | | | | | | add `get_user_by_req` and `invalidate_access_token`
| | | * / Factor _AccountHandler proxy out to ModuleApiRichard van der Hoff2017-11-023-70/+83
| | |/ / | | | | | | | | | | | | | | | | We're going to need to use this from places that aren't password auth, so let's move it to a proper class.
| | * | Merge pull request #2624 from matrix-org/rav/password_provider_notify_logoutDavid Baker2017-11-023-7/+42
| | |\ \ | | | | | | | | | | Notify auth providers on logout
| | | * | Notify auth providers on logoutRichard van der Hoff2017-11-013-7/+42
| | | | | | | | | | | | | | | | | | | | Provide a hook by which auth providers can be notified of logouts.
| | * | | Merge pull request #2623 from matrix-org/rav/callbacks_for_auth_providersDavid Baker2017-11-023-7/+20
| | |\ \ \ | | | | | | | | | | | | Allow password_auth_providers to return a callback
| | | * | | Fix user-interactive password authRichard van der Hoff2017-11-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | this got broken in the previous commit
| | | * | | Allow password_auth_providers to return a callbackRichard van der Hoff2017-11-013-6/+17
| | | |/ / | | | | | | | | | | | | | | | ... so that they have a way to record access tokens.
| | * | | Merge pull request #2622 from matrix-org/rav/db_access_for_auth_providersDavid Baker2017-11-021-0/+16
| | |\ \ \ | | | |/ / | | |/| | Let auth providers get to the database
| | | * | Let auth providers get to the databaseRichard van der Hoff2017-10-311-0/+16
| | | | | | | | | | | | | | | | | | | | Somewhat open to abuse, but also somewhat unavoidable :/
| | * | | Merge pull request #2620 from matrix-org/rav/auth_non_passwordRichard van der Hoff2017-11-012-32/+139
| | |\ \ \ | | | | | | | | | | | | Let password auth providers handle arbitrary login types
| | | * | | Let password auth providers handle arbitrary login typesRichard van der Hoff2017-11-012-32/+139
| | | |/ / | | | | | | | | | | | | | | | | | | | | Provide a hook where password auth providers can say they know about other login types, and get passed the relevant parameters
| | * | | Merge pull request #2621 from matrix-org/rav/refactor_accesstoken_deleteDavid Baker2017-11-016-27/+62
| | |\ \ \ | | | | | | | | | | | | Move access token deletion into auth handler
| | | * \ \ Merge remote-tracking branch 'origin/develop' into ↵David Baker2017-11-0115-98/+65
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | rav/refactor_accesstoken_delete
| | | * | | | Move access token deletion into auth handlerRichard van der Hoff2017-11-016-27/+62
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also move duplicated deactivation code into the auth handler. I want to add some hooks when we deactivate an access token, so let's bring it all in here so that there's somewhere to put it.
| | * | | | Merge pull request #2617 from matrix-org/matthew/auto-displaynameMatthew Hodgson2017-11-011-2/+4
| | |\ \ \ \ | | | |_|/ / | | |/| | | automatically set default displayname on register
| | | * | | switch to setting default displayname in the storage layerMatthew Hodgson2017-11-012-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | to avoid clobbering guest user displaynames on registration
| | | * | | automatically set default displayname on registerMatthew Hodgson2017-11-011-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid leaking ugly MXIDs and cluttering up the timeline with displayname changes as well as membership joins for autojoin rooms (e.g. the status autojoin rooms), automatically set the displayname to match the localpart of the mxid upon registration.
| | * | | | Merge pull request #2615 from matrix-org/rav/break_auth_device_depDavid Baker2017-11-013-13/+6
| | |\ \ \ \ | | | | | | | | | | | | | | Break dependency of auth_handler on device_handler
| | | * | | | Break dependency of auth_handler on device_handlerRichard van der Hoff2017-11-013-13/+6
| | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm going to need to make the device_handler depend on the auth_handler, so I need to break this dependency to avoid a cycle. It turns out that the auth_handler was only using the device_handler in one place which was an edge case which we can more elegantly handle by throwing an error rather than fixing it up.
| | * | | | Merge pull request #2613 from matrix-org/rav/kill_refresh_tokensDavid Baker2017-11-016-63/+17
| | |\ \ \ \ | | | | | | | | | | | | | | Remove the last vestiges of refresh_tokens
| | | * | | | Fix tests for refresh_token removalRichard van der Hoff2017-11-011-3/+3
| | | | | | |
| | | * | | | Remove the last vestiges of refresh_tokensRichard van der Hoff2017-10-315-60/+14
| | | |/ / /
| | * | | | Merge pull request #2618 from matrix-org/dbkr/log_login_requestsDavid Baker2017-11-011-0/+10
| | |\ \ \ \ | | | |_|/ / | | |/| | | Log login requests
| | | * | | Apparently this is pythonDavid Baker2017-11-011-1/+1
| | | | | |
| | | * | | Log login requestsDavid Baker2017-11-011-0/+10
| | |/ / / | | | | | | | | | | | | | | | Carefully though, to avoid logging passwords
| | * | | Merge pull request #2612 from matrix-org/luke/groups-room-relationship-is-publicLuke Barnard2017-11-016-22/+32
| | |\ \ \ | | | |/ / | | |/| | Modify group room association API to allow modification of is_public
| | | * | Leave `is_public` as required argument of update_room_group_associationLuke Barnard2017-11-011-1/+1
| | | | |
| | | * | Update docs for updating room group associationLuke Barnard2017-11-012-2/+2
| | | | |
| | | * | Flake8Luke Barnard2017-10-312-5/+9
| | | | |
| | | * | Modify group room association API to allow modification of is_publicLuke Barnard2017-10-316-19/+25
| | | | | | | | | | | | | | | | | | | | also includes renamings to make things more consistent.
| | * | | Merge pull request #2610 from matrix-org/rav/schema_for_pw_providersRichard van der Hoff2017-10-314-0/+90
| | |\ \ \ | | | | | | | | | | | | DB schema interface for password auth providers
| | | * | | fix testsRichard van der Hoff2017-10-311-0/+1
| | | | | |
| | | * | | DB schema interface for password auth providersRichard van der Hoff2017-10-313-0/+89
| | | |/ / | | | | | | | | | | | | | | | | | | | | Provide an interface by which password auth providers can register db schema files to be run at startup
| | * | | Merge pull request #2611 from matrix-org/dbkr/port_script_drop_nulsRichard van der Hoff2017-10-311-7/+19
| | |\ \ \ | | | |/ / | | |/| | Make the port script drop NUL values in all tables
| | | * | Make the port script drop NUL values in all tablesDavid Baker2017-10-311-7/+19
| | |/ / | | | | | | | | | | | | | | | | | | | | Postgres doesn't support NULs in strings so it makes the script throw an exception and stop if any values contain \0. Drop them with appropriate warning.
| | * | Merge pull request #2609 from matrix-org/rav/refactor_loginDavid Baker2017-10-312-57/+78
| | |\ \ | | | | | | | | | | Refactor some logic from LoginRestServlet into AuthHandler
| | | * | Refactor some logic from LoginRestServlet into AuthHandlerRichard van der Hoff2017-10-312-57/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm going to need some more flexibility in handling login types in password auth providers, so as a first step, move some stuff from LoginRestServlet into AuthHandler. In particular, we pass everything other than SAML, JWT and token logins down to the AuthHandler, which now has responsibility for checking the login type and fishing the password out of the login dictionary, as well as qualifying the user_id if need be. Ideally SAML, JWT and token would go that way too, but there's no real need for it right now and I'm trying to minimise impact. This commit *should* be non-functional.
| | * | | Merge pull request #2607 from matrix-org/rav/cleanup_ldap_hacksRichard van der Hoff2017-10-311-20/+19
| | |\ \ \ | | | | | | | | | | | | Clean up backwards-compat hacks for ldap
| | | * | | Clean up backwards-compat hacks for ldapRichard van der Hoff2017-10-311-20/+19
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try to make the backwards-compat flows follow the same code paths as the modern impl. This commit should be non-functional.
| | * | | Merge pull request #2608 from matrix-org/rav/password_provider_docDavid Baker2017-10-311-0/+39
| | |\ \ \ | | | |/ / | | |/| | Start some documentation on password providers
| | | * | Start some documentation on password providersRichard van der Hoff2017-10-311-0/+39
| | |/ / | | | | | | | | | | | | Document the existing interface, before I start adding new stuff.
| | * | Merge pull request #2605 from matrix-org/luke/fix-group-creation-error-wordingRichard van der Hoff2017-10-301-1/+1
| | |\ \ | | | | | | | | | | Fix wording on group creation error
| | | * | Fix wording on group creation errorLuke Barnard2017-10-301-1/+1
| | |/ /
| | * | fix typoMatthew Hodgson2017-10-291-1/+1
| | | |
| | * | move url_previews to MD as RST does my head inMatthew Hodgson2017-10-291-0/+2
| | | |
| | * | Merge pull request #2599 from matrix-org/erikj/groups_inviteErik Johnston2017-10-271-1/+4
| | |\ \ | | | | | | | | | | Fix typo when checking if user is invited to group
| | | * | Fix typo when checking if user is invited to groupErik Johnston2017-10-271-1/+4
| | |/ /
| | * | Fix bad mergeErik Johnston2017-10-271-1/+3
| | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-23 18:08:25 +0000