summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | 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 a...Matthew Hodgson2017-11-295-9/+58
* | | | | | | | Fix error when deleting devicesRichard van der Hoff2017-12-051-1/+1
* | | | | | | | Merge pull request #2729 from matrix-org/rav/custom_ui_authRichard van der Hoff2017-12-051-24/+57
|\ \ \ \ \ \ \ \
| * | | | | | | | support custom login types for validating usersRichard van der Hoff2017-12-051-24/+57
|/ / / / / / / /
* | | | | | | | 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 methodRichard van der Hoff2017-12-053-74/+102
|/ / / / / / / /
* | | | | | | | Merge pull request #2727 from matrix-org/rav/refactor_ui_auth_returnRichard van der Hoff2017-12-057-48/+103
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor UI auth implementationRichard van der Hoff2017-12-057-48/+103
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #2716 from matrix-org/rav/federation_client_postRichard van der Hoff2017-12-041-8/+34
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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_tokenRichard van der Hoff2017-11-291-1/+5
| |/ / / / / / /
* | | | | | | | Merge pull request #2722 from matrix-org/rav/delete_device_on_logoutRichard van der Hoff2017-11-2912-64/+226
|\ \ \ \ \ \ \ \
| * | | | | | | | Delete devices in various logout situationsRichard van der Hoff2017-11-295-5/+75
| * | | | | | | | Move set_password into its own handlerRichard van der Hoff2017-11-296-19/+58
| * | | | | | | | Move deactivate_account into its own handlerRichard van der Hoff2017-11-296-22/+61
| * | | | | | | | Remove pushers when deleting access tokensRichard van der Hoff2017-11-293-18/+32
|/ / / / / / / /
* | | | | | | | Merge pull request #2718 from matrix-org/rav/notify_logcontextsRichard van der Hoff2017-11-292-9/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Clear logcontext before starting fed txn queue runnerRichard van der Hoff2017-11-282-9/+18
| |/ / / / / / /
* | | | | | | | Merge pull request #2719 from matrix-org/rav/handle_missing_hashesRichard van der Hoff2017-11-291-3/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix 500 when joining matrix-devRichard van der Hoff2017-11-291-3/+10
| |/ / / / / / /
* | | | | | | | Merge pull request #2715 from matrix-org/luke/group-guest-accessLuke Barnard2017-11-281-11/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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 sql failsRichard van der Hoff2017-11-221-1/+1
| * | | | | | | Check database in has_completed_background_updatesRichard van der Hoff2017-11-223-12/+33
| * | | | | | | Fix error on sqlite 3.7Richard van der Hoff2017-11-215-8/+59
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #2713 from matrix-org/rav/no_upsert_foreverRichard van der Hoff2017-11-271-0/+7
|\ \ \ \ \ \ \
| * | | | | | | 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 lookupRichard van der Hoff2017-11-241-2/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #2710 from matrix-org/rav/remove_dead_codeRichard van der Hoff2017-11-271-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
| |/ / / / / / /
* | | | | | | | Merge pull request #2708 from matrix-org/rav/replication_logcontext_leaksRichard van der Hoff2017-11-271-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix some logcontext leaks in replication resourceRichard van der Hoff2017-11-231-2/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #2707 from matrix-org/rav/fix_urlpreviewRichard van der Hoff2017-11-271-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix OPTIONS on preview_urlRichard van der Hoff2017-11-231-1/+5
| |/ / / / / / /
* | | | | | | | Merge pull request #2705 from matrix-org/rav/improve_tracebacksRichard van der Hoff2017-11-271-3/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Improve tracebacks on exceptionsRichard van der Hoff2017-11-271-3/+9
|/ / / / / / /
* | | | | | | Merge pull request #2701 from matrix-org/rav/one_mediarepo_to_rule_them_allRichard van der Hoff2017-11-226-13/+48
|\ \ \ \ \ \ \
| * | | | | | | Add config option to disable media_repo on main synapseRichard van der Hoff2017-11-224-9/+30
| * | | | | | | Build MediaRepositoryResource as a homeserver dependencyRichard van der Hoff2017-11-224-5/+19
|/ / / / / / /
* | | | | | | Merge pull request #2700 from matrix-org/rav/worker_docsRichard van der Hoff2017-11-211-21/+133
|\ \ \ \ \ \ \
| * | | | | | | Improve documentation of workersRichard van der Hoff2017-11-211-21/+133
| |/ / / / / /
* | | | | | | Merge pull request #2698 from matrix-org/rav/remove_dead_dependenciesRichard van der Hoff2017-11-211-16/+15
|\ \ \ \ \ \ \
| * | | | | | | Clean up dependency listRichard van der Hoff2017-11-211-16/+15
| |/ / / / / /
* | | | | | | 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 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 tablesRichard van der Hoff2017-11-162-5/+51
* | | | | | | 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 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
| | |_|_|_|/ / | |/| | | | |
* | | | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
| * | | | _simple_upsert: retry on IntegrityErrorRichard van der Hoff2017-11-161-6/+29
| * | | | Cleanup in _simple_upsert_txnRichard van der Hoff2017-11-161-16/+17
|/ / / /
* | | | Merge pull request #2661 from matrix-org/rav/statereadstoreRichard van der Hoff2017-11-153-249/+237
|\ \ \ \
| * | | | Pull out bits of StateStore to a mixinRichard van der Hoff2017-11-142-237/+226
| * | | | Revert "Revert "move _state_group_cache to statestore""Richard van der Hoff2017-11-142-13/+12
* | | | | Merge pull request #2677 from matrix-org/rav/spec_r0.3.0Richard van der Hoff2017-11-151-0/+1
|\ \ \ \ \
| * | | | | 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 __PreservingContextDeferred tooRichard van der Hoff2017-11-141-30/+0
| * | | | | | Remove preserve_context_over_{fn, deferred}Richard van der Hoff2017-11-1410-66/+23
* | | | | | | Merge pull request #2650 from matrix-org/dbkr/push_include_content_optionDavid Baker2017-11-152-15/+32
|\ \ \ \ \ \ \
| * | | | | | | Print instead of loggingDavid Baker2017-11-131-11/+4
| * | | | | | | 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
* | | | | | | | Merge pull request #2648 from krombel/update_prometheusRichard van der Hoff2017-11-143-1/+78
|\ \ \ \ \ \ \ \
| * | | | | | | | Make clear that the config has changed since prometheus v2Krombel2017-11-143-2/+35
| * | | | | | | | 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 codeRichard van der Hoff2017-11-141-27/+24
| * | | | | | | | | Add a load of logging to the room_list handlerRichard van der Hoff2017-11-141-0/+13
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #2673 from matrix-org/erikj/fix_port_script_groupsRichard van der Hoff2017-11-141-0/+7
|\ \ \ \ \ \ \ \ \
| | | | | | | | * | 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
| | | | | | | |/ /
| | | | | | | * | 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
| | | | | | | * | | Merge pull request #2679 from jkolo/fix_auth_handlerRichard van der Hoff2017-11-161-1/+1
| | | | | | |/| | | | | | | | |/| | | |
| | | | | | | * | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix tests for Store.__init__ updateRichard van der Hoff2017-11-135-11/+11
| * | | | Make __init__ consitstent across Store heirarchyRichard van der Hoff2017-11-1317-33/+33
* | | | | Merge pull request #2668 from turt2live/travis/whoamiRichard van der Hoff2017-11-141-0/+15
|\ \ \ \ \
| * | | | | Remove redundent callTravis Ralston2017-11-131-2/+0
| * | | | | Add a route for determining who you areTravis Ralston2017-11-121-0/+17
* | | | | | Merge pull request #2669 from matrix-org/rav/cache_urlpreview_failureRichard van der Hoff2017-11-131-41/+47
|\ \ \ \ \ \
| * | | | | | Bit more loggingRichard van der Hoff2017-11-101-0/+2
| * | | | | | Cache failures in url_preview handlerRichard van der Hoff2017-11-101-41/+45
| |/ / / / /
* | | | | | Merge pull request #2663 from matrix-org/rav/invalid_request_utf8Richard van der Hoff2017-11-131-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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
* | | | | | 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
|\ \ \ \ \
| * | | | | Add some more comments appservice user registrationRichard van der Hoff2017-11-101-1/+4
| * | | | | Downcase userids for shared-secret registrationRichard van der Hoff2017-11-102-3/+21
| * | | | | Downcase userid on registrationRichard van der Hoff2017-11-091-1/+7
| * | | | | Revert "Allow upper-case characters in mxids"Richard van der Hoff2017-11-091-3/+3
|/ / / / /
| * / / / Fix 500 on invalid utf-8 in requestRichard van der Hoff2017-11-101-1/+2
|/ / / /
* | | | Merge pull request #2659 from matrix-org/rav/apparently_we_dont_follow_our_ow...Richard van der Hoff2017-11-091-3/+3
|\ \ \ \
| * | | | Allow upper-case characters in mxidsRichard van der Hoff2017-11-091-3/+3
|/ / / /
* | | | 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 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 /deactivateRichard van der Hoff2017-11-091-2/+1
* | | | | Merge pull request #2651 from matrix-org/erikj/update_group_room_settingsErik Johnston2017-11-096-29/+120
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \
| * | | | | 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 in...Ilya Zhuravlev2017-11-021-4/+1
* | | | | | Merge pull request #2637 from spantaleev/avoid-noop-media-deletesErik Johnston2017-11-081-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Avoid no-op media deletesSlavi Pantaleev2017-11-041-0/+6
| |/ / / /
* | | | | Merge pull request #2649 from matrix-org/rav/fix_delta_on_state_resRichard van der Hoff2017-11-083-33/+58
|\ \ \ \ \
| * | | | | s/items/iteritems/Richard van der Hoff2017-11-081-2/+2
| * | | | | Update deltas when doing auth resolutionRichard van der Hoff2017-11-071-3/+7
| * | | | | factor out _update_context_for_auth_eventsRichard van der Hoff2017-11-071-20/+42
| * | | | | move _state_group_cache to statestoreRichard van der Hoff2017-11-072-13/+12
| | |/ / / | |/| | |
* | | | | Merge pull request #2643 from matrix-org/matthew/user_dir_typosMatthew Hodgson2017-11-076-14/+55
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
|\ \ \ \
| * | | | 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
| | |_|/ | |/| |
* | | | Revert "Merge branch 'master' of github.com:matrix-org/synapse into develop"Erik Johnston2017-11-071-1/+10
* | | | 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"Erik Johnston2017-10-271-12/+1
| |/ /
| * | Merge pull request #2596 from matrix-org/erikj/attestation_jitterErik Johnston2017-10-271-1/+12
| |\ \
* | \ \ Merge pull request #2647 from matrix-org/luke/get-group-users-is-privilegedLuke Barnard2017-11-072-3/+4
|\ \ \ \
| * | | | 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 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 LimiterRichard van der Hoff2017-11-071-7/+17
|/ / / /
* | | | 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 saneLuke Barnard2017-11-021-3/+1
* | | | | Merge pull request #2629 from matrix-org/rav/register_inhibit_loginDavid Baker2017-11-021-12/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | support inhibit_login in /registerRichard van der Hoff2017-11-021-12/+16
* | | | | Merge pull request #2628 from matrix-org/rav/module_api_hooksDavid Baker2017-11-021-0/+34
|\ \ \ \ \
| * \ \ \ \ 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 endpointsRichard van der Hoff2017-11-023-0/+74
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2626 from matrix-org/rav/refactor_module_apiDavid Baker2017-11-023-70/+83
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #2625 from matrix-org/rav/named_resource_refactorDavid Baker2017-11-021-46/+64
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Factor out _configure_named_resourceRichard van der Hoff2017-11-021-46/+64
|/ / / / / /
| | * / / / Add more hooks to ModuleApiRichard van der Hoff2017-11-021-0/+34
| |/ / / /
| * / / / Factor _AccountHandler proxy out to ModuleApiRichard van der Hoff2017-11-023-70/+83
|/ / / /
* | | | Merge pull request #2624 from matrix-org/rav/password_provider_notify_logoutDavid Baker2017-11-023-7/+42
|\ \ \ \
| * | | | Notify auth providers on logoutRichard van der Hoff2017-11-013-7/+42
* | | | | Merge pull request #2623 from matrix-org/rav/callbacks_for_auth_providersDavid Baker2017-11-023-7/+20
|\ \ \ \ \
| * | | | | Fix user-interactive password authRichard van der Hoff2017-11-011-1/+3
| * | | | | Allow password_auth_providers to return a callbackRichard van der Hoff2017-11-013-6/+17
| |/ / / /
* | | | | Merge pull request #2622 from matrix-org/rav/db_access_for_auth_providersDavid Baker2017-11-021-0/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Let auth providers get to the databaseRichard van der Hoff2017-10-311-0/+16
* | | | | 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 typesRichard van der Hoff2017-11-012-32/+139
| |/ / / /
* | | | | Merge pull request #2621 from matrix-org/rav/refactor_accesstoken_deleteDavid Baker2017-11-016-27/+62
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/develop' into rav/refactor_accesstoken_d...David Baker2017-11-0115-98/+65
| |\ \ \ \ \
| * | | | | | Move access token deletion into auth handlerRichard van der Hoff2017-11-016-27/+62
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2617 from matrix-org/matthew/auto-displaynameMatthew Hodgson2017-11-011-2/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | switch to setting default displayname in the storage layerMatthew Hodgson2017-11-012-10/+5
| * | | | | automatically set default displayname on registerMatthew Hodgson2017-11-011-1/+8
* | | | | | Merge pull request #2615 from matrix-org/rav/break_auth_device_depDavid Baker2017-11-013-13/+6
|\ \ \ \ \ \
| * | | | | | Break dependency of auth_handler on device_handlerRichard van der Hoff2017-11-013-13/+6
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2613 from matrix-org/rav/kill_refresh_tokensDavid Baker2017-11-016-63/+17
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Apparently this is pythonDavid Baker2017-11-011-1/+1
| * | | | | Log login requestsDavid Baker2017-11-011-0/+10
|/ / / / /
* | | | | Merge pull request #2612 from matrix-org/luke/groups-room-relationship-is-publicLuke Barnard2017-11-016-22/+32
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
* | | | | Merge pull request #2610 from matrix-org/rav/schema_for_pw_providersRichard van der Hoff2017-10-314-0/+90
|\ \ \ \ \
| * | | | | fix testsRichard van der Hoff2017-10-311-0/+1
| * | | | | DB schema interface for password auth providersRichard van der Hoff2017-10-313-0/+89
| |/ / / /
* | | | | 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 tablesDavid Baker2017-10-311-7/+19
|/ / / /
* | | | Merge pull request #2609 from matrix-org/rav/refactor_loginDavid Baker2017-10-312-57/+78
|\ \ \ \
| * | | | Refactor some logic from LoginRestServlet into AuthHandlerRichard van der Hoff2017-10-312-57/+78
* | | | | Merge pull request #2607 from matrix-org/rav/cleanup_ldap_hacksRichard van der Hoff2017-10-311-20/+19
|\ \ \ \ \
| * | | | | Clean up backwards-compat hacks for ldapRichard van der Hoff2017-10-311-20/+19
| |/ / / /
* | | | | Merge pull request #2608 from matrix-org/rav/password_provider_docDavid Baker2017-10-311-0/+39
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Start some documentation on password providersRichard van der Hoff2017-10-311-0/+39
|/ / / /
* | | | 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 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 groupErik Johnston2017-10-271-1/+4
|/ / / /
* | | | Fix bad mergeErik Johnston2017-10-271-1/+3
* | | | Merge branch 'erikj/attestation_jitter' of github.com:matrix-org/synapse into...Erik Johnston2017-10-271-1/+11
|\ \ \ \ | | |_|/ | |/| |
| * | | Add jitter to validity period of attestationsErik Johnston2017-10-271-1/+12
| | |/ | |/|
* | | Merge branch 'erikj/attestation_local_fix' of github.com:matrix-org/synapse i...Erik Johnston2017-10-273-9/+36
|\ \ \
| * | | Import loggerErik Johnston2017-10-271-0/+5
| * | | FixupErik Johnston2017-10-272-5/+5
| * | | Remove incorrect attestationsErik Johnston2017-10-272-0/+19
| * | | Log if we try to do attestations for our own user and groupErik Johnston2017-10-271-2/+8
| * | | Don't generate group attestations for local usersErik Johnston2017-10-271-2/+3
| |/ /
* | | Merge pull request #2595 from matrix-org/erikj/attestation_commnetErik Johnston2017-10-271-0/+22
|\ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-13 07:02:04 +0000