summary refs log tree commit diff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-v0.25.1'Richard van der Hoff2017-11-173-2/+10
|\
| * Bump version in __init__.py 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 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
| |\ \
| | * | Add comment about attestationsErik Johnston2017-10-271-0/+22
| * | | Merge pull request #2591 from matrix-org/rav/device_delete_authRichard van der Hoff2017-10-271-5/+8
| |\ \ \
| | * | | Device deletion: check UI auth matches access tokenRichard van der Hoff2017-10-271-5/+8
| * | | | Merge pull request #2589 from matrix-org/rav/as_deactivate_accountRichard van der Hoff2017-10-272-17/+33
| |\ \ \ \
| | * | | | Allow ASes to deactivate their own usersRichard van der Hoff2017-10-272-17/+33
| | | |_|/ | | |/| |
| * | | | Merge pull request #2582 from matrix-org/luke/group-is-publicLuke Barnard2017-10-276-98/+190
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Request is_public from databaseLuke Barnard2017-10-271-1/+3
| | * | | group is dictLuke Barnard2017-10-271-1/+1
| | * | | Create groups with is_public = TrueLuke Barnard2017-10-271-0/+1
| | * | | Fix create_group to pass requester_user_idLuke Barnard2017-10-271-1/+1
| | * | | Correct logic for checking private group membershipLuke Barnard2017-10-271-1/+1
| | * | | Make it workLuke Barnard2017-10-261-1/+1
| | * | | Recreate groups table instead of adding columnLuke Barnard2017-10-261-2/+16
| | * | | Awful hack to get default trueLuke Barnard2017-10-261-1/+2
| | * | | Add groups table to BOOLEAN_COLUMNS in synapse_port_dbLuke Barnard2017-10-261-0/+1
| | * | | Bump schema version to 46Luke Barnard2017-10-261-1/+1
| | * | | delintLuke Barnard2017-10-262-15/+67
| | * | | Add is_public to groups table to allow for private groupsLuke Barnard2017-10-263-95/+116
| * | | | Merge pull request #2586 from matrix-org/rav/frontend_proxy_auth_headerRichard van der Hoff2017-10-272-28/+87
| |\ \ \ \
| | * | | | Docstring for post_urlencoded_get_jsonRichard van der Hoff2017-10-271-0/+11
| | * | | | Front-end proxy: pass through auth headerRichard van der Hoff2017-10-261-0/+7
| | * | | | SimpleHTTPClient: add support for headersRichard van der Hoff2017-10-261-28/+69
| * | | | | Merge pull request #2585 from matrix-org/rav/unstable_to_r0Richard van der Hoff2017-10-271-2/+1
| |\ \ \ \ \
| | * | | | | Support /keys/upload on /r0 as well as /unstableRichard van der Hoff2017-10-261-2/+1
| | |/ / / /
| * | | | | Merge pull request #2584 from matrix-org/rav/fix_httpclient_logcontextsRichard van der Hoff2017-10-271-10/+9
| |\ \ \ \ \
| | * | | | | Fix logcontext leaks in httpclientRichard van der Hoff2017-10-261-10/+9
| | |/ / / /
| * | | | | Merge pull request #2574 from matrix-org/erikj/room_list_fixesErik Johnston2017-10-274-11/+22
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Update room_list.pyErik Johnston2017-10-261-1/+1
| | * | | | Do logcontexts outside ResponseCacheErik Johnston2017-10-255-13/+21
| | * | | | Add logging and fix log contexts for publicRoomsErik Johnston2017-10-252-1/+4
| * | | | | spell out need for libxml2 for lxml to workMatthew Hodgson2017-10-271-1/+3
| * | | | | Merge pull request #2581 from matrix-org/rav/fix_init_with_no_logfileRichard van der Hoff2017-10-261-1/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix error when running synapse with no logfileRichard van der Hoff2017-10-261-1/+5
| | | |_|/ | | |/| |
| * | | | Merge pull request #2579 from krombel/move_unstable_to_r0Richard van der Hoff2017-10-265-27/+13
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | add release endpoints for /thirdpartyKrombel2017-10-261-7/+4
| | * | | register some /unstable endpoints in /r0 as wellKrombel2017-10-264-20/+9
| |/ / /
| * | | Merge pull request #2578 from matrix-org/rav/code_style_importsRichard van der Hoff2017-10-261-46/+113
| |\ \ \
| | * | | Document import rulesRichard van der Hoff2017-10-261-0/+44
| | * | | code_style: more formattingRichard van der Hoff2017-10-261-34/+57
| | * | | code_style.rst: a couple of tidyupsRichard van der Hoff2017-10-261-9/+9
| | |/ /
| * | | Merge pull request #2577 from matrix-org/erikj/fix_portErik Johnston2017-10-261-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix port scriptErik Johnston2017-10-261-0/+1
| |/ / |/| |
| * | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-10-252-1/+9
| |\ \ | |/ / |/| |
* | | Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1Erik Johnston2017-10-2464-159/+219
|\ \ \
| * | | Bump version and changelog release-v0.24.1Erik Johnston2017-10-242-1/+9
| | |/ | |/|
| | * tip for generating tls_fingerprintsMatthew Hodgson2017-10-241-0/+6
| |/
| * Merge pull request #2567 from matrix-org/erikj/group_fed_update_profileErik Johnston2017-10-242-11/+31
| |\
| | * Merge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_...Erik Johnston2017-10-2457-135/+171
| | |\ | | |/ | |/|
| * | Merge pull request #2568 from matrix-org/rav/pep8Richard van der Hoff2017-10-2355-100/+97
| |\ \
| | * | fix vars named `l`Richard van der Hoff2017-10-232-7/+4
| | * | replace 'except:' with 'except Exception:'Richard van der Hoff2017-10-2354-93/+93
| |/ /
| * | Merge pull request #2566 from matrix-org/rav/media_logcontext_leakRichard van der Hoff2017-10-231-1/+4
| |\ \
| | * | Fix a logcontext leak in the media repoRichard van der Hoff2017-10-231-1/+4
| * | | Merge pull request #2561 from matrix-org/rav/id_checkingRichard van der Hoff2017-10-234-34/+70
| |\ \ \ | | |/ / | |/| |
| | * | Validate group ids when parsingRichard van der Hoff2017-10-213-17/+45
| | * | Allow = in mxids and groupidsRichard van der Hoff2017-10-203-5/+4
| | * | Disallow capital letters in useridsRichard van der Hoff2017-10-203-16/+25
| | | * Correctly wire in update group profile over federationErik Johnston2017-10-232-11/+31
| | |/ | |/|
| * | Merge branch 'master' of github.com:matrix-org/synapse into developErik Johnston2017-10-233-1/+45
| |\ \ | |/ / |/| |
* | | Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse v0.24.0Erik Johnston2017-10-2383-571/+6538
|\ \ \
| * | | Bump version and changelog release-v0.24.0Erik Johnston2017-10-232-1/+7
| * | | Correctly bump version v0.24.0-rc1Erik Johnston2017-10-191-1/+1
| * | | Update changelogErik Johnston2017-10-191-0/+1
| * | | Bump version and changelogErik Johnston2017-10-192-1/+36
| | |/ | |/|
* | | Merge pull request #2540 from 4nd3r/patch-1Richard van der Hoff2017-10-161-0/+2
|\ \ \
| * | | make it absolutely clear that Purge History API does not remove all traces of...Ander Punnar2017-10-141-0/+2
|/ / /
| | * Merge pull request #2560 from matrix-org/rav/kill_pointless_methodRichard van der Hoff2017-10-236-12/+8
| |/|
| | * Remove pointless create() methodRichard van der Hoff2017-10-206-12/+8
| |/
| * Merge pull request #2559 from matrix-org/erikj/group_id_validationErik Johnston2017-10-193-3/+46
| |\
| | * Flake8Erik Johnston2017-10-192-6/+4
| | * Add missing file...Erik Johnston2017-10-191-0/+36
| | * Add config to enable group creationErik Johnston2017-10-192-3/+12
| * | Merge pull request #2558 from matrix-org/erikj/group_id_validationErik Johnston2017-10-191-1/+19
| |\|
| | * Enforce sensible group IDsErik Johnston2017-10-191-1/+19
| |/
| * Fix typoErik Johnston2017-10-191-1/+1
| * Fix typo in group attestation handlingErik Johnston2017-10-192-2/+3
| * Merge pull request #2557 from matrix-org/erikj/media_tumbnailsErik Johnston2017-10-191-2/+5
| |\
| | * Fix typo in thumbnail generationErik Johnston2017-10-191-2/+5
| |/
| * Fix typoErik Johnston2017-10-191-1/+1
| * Merge pull request #2553 from matrix-org/rav/fix_500_on_event_sendRichard van der Hoff2017-10-181-1/+0
| |\
| | * Fix 500 error when we get an error handling a PDURichard van der Hoff2017-10-171-1/+0
| * | Merge pull request #2552 from matrix-org/rav/fix_500_on_dodgy_powerlevelsRichard van der Hoff2017-10-171-3/+3
| |\ \ | | |/ | |/|
| | * Fix 500 error when fields missing from power_levels eventRichard van der Hoff2017-10-171-3/+3
| * | Doc some more dynamic Homeserver methodsRichard van der Hoff2017-10-171-0/+8
| * | Merge pull request #2550 from krombel/fix_thumbnail_2548Erik Johnston2017-10-171-2/+2
| |\ \ | | |/ | |/|
| | * fix thumbnailing (#2548)Krombel2017-10-171-2/+2
| * | Improve error handling for missing files (#2551)Richard van der Hoff2017-10-173-17/+33
| * | Merge pull request #2546 from matrix-org/rav/remove_dead_event_injectorRichard van der Hoff2017-10-171-76/+0
| |\ \
| | * | Remove dead classRichard van der Hoff2017-10-171-76/+0
| | |/
| * | Merge pull request #2547 from matrix-org/rav/test_make_deferred_yieldableRichard van der Hoff2017-10-171-0/+38
| |\ \
| | * | Fix name of test_logcontextRichard van der Hoff2017-10-171-0/+0
| | * | Add some tests for make_deferred_yieldableRichard van der Hoff2017-10-171-0/+38
| | |/
| * | Merge pull request #2549 from matrix-org/rav/event_persist_logcontextsRichard van der Hoff2017-10-172-7/+22
| |\ \
| | * | Fix logcontext handling for persist_eventsRichard van der Hoff2017-10-172-7/+22
| | |/
| * | Merge pull request #2545 from matrix-org/dbkr/auto_join_roomsDavid Baker2017-10-173-0/+42
| |\ \ | | |/ | |/|
| | * Fix testDavid Baker2017-10-171-0/+1
| | * pep8David Baker2017-10-171-1/+2
| | * Add config option to auto-join new users to roomsDavid Baker2017-10-162-0/+40
| * | Merge pull request #2544 from matrix-org/luke/groups-invited-usersLuke Barnard2017-10-166-1/+102
| |\ \
| | * | DelintLuke Barnard2017-10-163-1/+3
| | * | Make it work. Warn about lack of user profileLuke Barnard2017-10-161-2/+2
| | * | _create_rererouter for get_invited_users_in_groupLuke Barnard2017-10-161-17/+2
| | * | Merge branch 'develop' into luke/groups-invited-usersLuke Barnard2017-10-161-1/+1
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #2543 from matrix-org/luke/fix-on-group-invite-no-profileLuke Barnard2017-10-161-2/+5
| |\ \ \ | | |_|/ | |/| |
| * | | Merge pull request #2542 from matrix-org/dbkr/room_notif_no_globDavid Baker2017-10-161-1/+1
| |\ \ \
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-09-22 14:42:03 +0000