Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Split MessageHandler into read only and writers | Erik Johnston | 2018-07-18 | 2 | -15/+13 | |
|/ | ||||||
* | Refactor REST API tests to use explicit reactors (#3351) | Amber Brown | 2018-07-17 | 1 | -1/+1 | |
* | rerun isort with latest version | Krombel | 2018-07-16 | 1 | -13/+3 | |
* | check isort by travis | Krombel | 2018-07-16 | 5 | -9/+19 | |
* | Fix develop because I broke it :( (#3535) | Amber Brown | 2018-07-14 | 1 | -2/+2 | |
* | Merge pull request #3534 from krombel/use_parse_and_asserts_from_servlet | Amber Brown | 2018-07-14 | 14 | -139/+92 | |
|\ | ||||||
| * | fix sytests | Amber Brown | 2018-07-14 | 1 | -1/+1 | |
| * | add changelog | Krombel | 2018-07-13 | 1 | -1/+1 | |
| * | rename assert_params_in_request to assert_params_in_dict | Krombel | 2018-07-13 | 9 | -30/+30 | |
| * | Use parse_{int,str} and assert from http.servlet | Krombel | 2018-07-13 | 13 | -132/+85 | |
* | | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 7 | -35/+31 | |
|/ | ||||||
* | Merge branch 'develop' into rav/enforce_report_api | Richard van der Hoff | 2018-07-12 | 51 | -339/+338 | |
|\ | ||||||
| * | run isort | Amber Brown | 2018-07-09 | 50 | -307/+288 | |
| * | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 5 | -5/+8 | |
| * | update doc for deactivate API | Matthew Hodgson | 2018-06-26 | 1 | -1/+1 | |
| * | add GDPR erase param to deactivate API | Matthew Hodgson | 2018-06-26 | 1 | -1/+12 | |
| * | Revert "Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibili... | Erik Johnston | 2018-06-25 | 2 | -3/+14 | |
| * | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" | Richard van der Hoff | 2018-06-22 | 2 | -14/+3 | |
| * | Merge pull request #3431 from matrix-org/rav/erasure_visibility | Erik Johnston | 2018-06-22 | 2 | -3/+14 | |
| |\ | ||||||
| | * | mark accounts as erased when requested | Richard van der Hoff | 2018-06-12 | 2 | -3/+14 | |
| * | | Pass around the reactor explicitly (#3385) | Amber Brown | 2018-06-22 | 2 | -3/+7 | |
| * | | Remove run_on_reactor (#3395) | Amber Brown | 2018-06-14 | 3 | -17/+0 | |
| |/ | ||||||
| * | Merge pull request #3276 from matrix-org/dbkr/unbind | David Baker | 2018-06-11 | 1 | -3/+10 | |
| |\ | ||||||
| | * | Merge remote-tracking branch 'origin/develop' into dbkr/unbind | David Baker | 2018-05-24 | 1 | -3/+5 | |
| | |\ | ||||||
| | * | | pep8 | David Baker | 2018-05-24 | 1 | -1/+1 | |
| | * | | Unbind 3pids when they're deleted too | David Baker | 2018-05-24 | 1 | -3/+10 | |
| * | | | fix log | Richard van der Hoff | 2018-06-07 | 1 | -1/+1 | |
| * | | | Fix event-purge-by-ts admin API | Richard van der Hoff | 2018-06-07 | 1 | -6/+4 | |
| * | | | Consistently use six's iteritems and wrap lazy keys/values in list() if they'... | Amber Brown | 2018-05-31 | 1 | -1/+1 | |
* | | | | Enforce the specified API for report_event | Richard van der Hoff | 2018-05-31 | 1 | -2/+23 | |
|/ / / | ||||||
* | | | Merge pull request #3244 from NotAFile/py3-six-4 | Amber Brown | 2018-05-24 | 1 | -1/+2 | |
|\ \ \ | ||||||
| * | | | replace some iteritems with six | Adrian Tschira | 2018-05-19 | 1 | -1/+2 | |
* | | | | Merge pull request #3247 from NotAFile/py3-misc | Amber Brown | 2018-05-24 | 1 | -3/+5 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | py3-ize url preview | Adrian Tschira | 2018-05-19 | 1 | -3/+5 | |
| |/ / | ||||||
* | | | Merge pull request #3243 from NotAFile/py3-six-3 | Erik Johnston | 2018-05-24 | 1 | -3/+5 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Replace some more comparisons with six | Adrian Tschira | 2018-05-19 | 1 | -3/+5 | |
| |/ | ||||||
* | | Add a 'has_consented' template var to consent forms | Richard van der Hoff | 2018-05-22 | 1 | -3/+14 | |
* | | Enable auto-escaping for the consent templates | Richard van der Hoff | 2018-05-22 | 1 | -1/+4 | |
* | | Stub out ServerNoticesSender on the workers | Richard van der Hoff | 2018-05-22 | 1 | -0/+4 | |
* | | Move consent config parsing into ConsentConfig | Richard van der Hoff | 2018-05-22 | 1 | -5/+3 | |
* | | Rename 'version' param on user consent config | Richard van der Hoff | 2018-05-22 | 1 | -1/+1 | |
* | | Fix logcontext leak in HttpTransactionCache | Richard van der Hoff | 2018-05-21 | 1 | -25/+21 | |
* | | Stop the transaction cache caching failures | Richard van der Hoff | 2018-05-21 | 1 | -9/+13 | |
|/ | ||||||
* | Merge pull request #3221 from matrix-org/erikj/purge_token | Erik Johnston | 2018-05-18 | 1 | -7/+10 | |
|\ | ||||||
| * | Make purge_history operate on tokens | Erik Johnston | 2018-05-15 | 1 | -7/+10 | |
* | | Move RoomCreationHandler out of synapse.handlers.Handlers | Richard van der Hoff | 2018-05-17 | 2 | -5/+4 | |
* | | Merge pull request #3213 from matrix-org/rav/consent_handler | Richard van der Hoff | 2018-05-16 | 2 | -0/+210 | |
|\ \ | |/ |/| | ||||||
| * | ConsentResource to gather policy consent from users | Richard van der Hoff | 2018-05-15 | 2 | -0/+210 | |
* | | Set Server header in SynapseRequest | Richard van der Hoff | 2018-05-10 | 9 | -14/+1 | |
|/ | ||||||
* | Remove redundant request_handler decorator | Richard van der Hoff | 2018-05-10 | 5 | -29/+38 | |
* | notifications: Convert next_token to string according to the spec | Konstantinos Sideris | 2018-05-05 | 1 | -1/+1 | |
* | Merge pull request #3161 from NotAFile/remove-v1auth | Richard van der Hoff | 2018-05-03 | 2 | -2/+6 | |
|\ | ||||||
| * | Burminate v1auth | Adrian Tschira | 2018-04-30 | 2 | -2/+6 | |
* | | Fix logcontext leak in media repo | Richard van der Hoff | 2018-05-02 | 2 | -1/+4 | |
|/ | ||||||
* | add guard for None on purge_history api | Krombel | 2018-04-30 | 1 | -1/+14 | |
* | Merge pull request #3155 from NotAFile/py3-bytes-1 | Richard van der Hoff | 2018-04-30 | 1 | -3/+3 | |
|\ | ||||||
| * | more bytes strings | Adrian Tschira | 2018-04-29 | 1 | -3/+3 | |
* | | Merge pull request #3140 from matrix-org/rav/use_run_in_background | Richard van der Hoff | 2018-04-30 | 1 | -2/+3 | |
|\ \ | ||||||
| * | | Merge remote-tracking branch 'origin/develop' into rav/use_run_in_background | Richard van der Hoff | 2018-04-27 | 1 | -2/+7 | |
| |\| | ||||||
| * | | Use run_in_background in preference to preserve_fn | Richard van der Hoff | 2018-04-27 | 1 | -2/+3 | |
* | | | Merge pull request #3156 from NotAFile/py3-hmac-bytes | Richard van der Hoff | 2018-04-30 | 2 | -11/+15 | |
|\ \ \ | ||||||
| * | | | Construct HMAC as bytes on py3 | Adrian Tschira | 2018-04-29 | 2 | -11/+15 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #3108 from NotAFile/py3-six-urlparse | Richard van der Hoff | 2018-04-30 | 4 | -7/+8 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 4 | -7/+8 | |
| |/ | ||||||
* / | Improve exception handling for background processes | Richard van der Hoff | 2018-04-27 | 1 | -2/+7 | |
|/ | ||||||
* | Merge pull request #3079 from matrix-org/erikj/limit_concurrent_sends | Erik Johnston | 2018-04-10 | 1 | -6/+1 | |
|\ | ||||||
| * | Use create_and_send_nonmember_event everywhere | Erik Johnston | 2018-04-09 | 1 | -6/+1 | |
* | | Merge pull request #2996 from krombel/allow_auto_join_rooms | Richard van der Hoff | 2018-04-10 | 1 | -32/+0 | |
|\ \ | ||||||
| * \ | Merge branch 'develop' of into allow_auto_join_rooms | Krombel | 2018-03-28 | 3 | -3/+3 | |
| |\ \ | ||||||
| * | | | move handling of auto_join_rooms to RegisterHandler | Krombel | 2018-03-14 | 1 | -32/+0 | |
* | | | | Merge pull request #3061 from NotAFile/add-some-byte-strings | Richard van der Hoff | 2018-04-09 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Add b prefixes to some strings that are bytes in py3 | Adrian Tschira | 2018-04-04 | 1 | -2/+2 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #3073 from NotAFile/use-six-reraise | Richard van der Hoff | 2018-04-09 | 1 | -1/+3 | |
|\ \ \ \ | ||||||
| * | | | | Replace old-style raise with six.reraise | Adrian Tschira | 2018-04-06 | 1 | -1/+3 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #2938 from dklug/develop | Richard van der Hoff | 2018-04-09 | 1 | -1/+4 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Return 401 for invalid access_token on logout | dklug | 2018-03-02 | 1 | -1/+4 | |
* | | | | Merge pull request #2986 from jplatte/join_reponse_room_id | Richard van der Hoff | 2018-04-05 | 1 | -1/+6 | |
|\ \ \ \ | ||||||
| * | | | | Add room_id to the response of `rooms/{roomId}/join` | Jonas Platte | 2018-03-13 | 1 | -1/+6 | |
| | |_|/ | |/| | | ||||||
* | | | | Use "/settings/" (plural) | Luke Barnard | 2018-04-05 | 1 | -1/+1 | |
* | | | | Use join_policy API instead of joinable | Luke Barnard | 2018-04-03 | 1 | -6/+6 | |
* | | | | This should probably be a PUT | David Baker | 2018-03-28 | 1 | -1/+1 | |
* | | | | Add joinability for groups | David Baker | 2018-03-28 | 1 | -0/+28 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-19 | 2 | -2/+2 | |
|\ \ \ | ||||||
| * | | | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 3 | -3/+3 | |
* | | | | Replace some ujson with simplejson to make it work | Erik Johnston | 2018-03-16 | 1 | -1/+1 | |
| |/ / |/| | | ||||||
* | | | RoomMembershipRestServlet doesn't handle /forget | Erik Johnston | 2018-03-13 | 1 | -1/+1 | |
* | | | Add transactional API to history purge | Richard van der Hoff | 2018-03-12 | 1 | -3/+35 | |
* | | | Provide a means to pass a timestamp to purge_history | Richard van der Hoff | 2018-03-05 | 1 | -3/+55 | |
| |/ |/| | ||||||
* | | Move RoomMemberHandler out of Handlers | Erik Johnston | 2018-03-01 | 3 | -13/+15 | |
* | | Make store_file use store_into_file | Erik Johnston | 2018-02-14 | 1 | -26/+11 | |
* | | Merge pull request #2854 from matrix-org/erikj/event_create_worker | Erik Johnston | 2018-02-13 | 1 | -1/+0 | |
|\ \ | ||||||
| * | | Add event_creator worker | Erik Johnston | 2018-02-07 | 1 | -1/+0 | |
* | | | Fix typos in purge api & doc | Richard van der Hoff | 2018-02-13 | 1 | -3/+1 | |
* | | | Merge pull request #2857 from matrix-org/erikj/upload_store | Erik Johnston | 2018-02-12 | 1 | -0/+6 | |
|\ \ \ | ||||||
| * | | | Tell storage providers about new file so they can upload | Erik Johnston | 2018-02-07 | 1 | -0/+6 | |
| |/ / | ||||||
* | | | Merge pull request #2858 from matrix-org/rav/purge_updates | Richard van der Hoff | 2018-02-09 | 1 | -1/+10 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | delete_local_events for purge_history | Richard van der Hoff | 2018-02-09 | 1 | -1/+10 | |
* | | | Update copyright | Erik Johnston | 2018-02-06 | 2 | -0/+2 | |
* | | | Update places where we create events | Erik Johnston | 2018-02-05 | 2 | -9/+11 | |
* | | | Merge pull request #2791 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-02-05 | 3 | -12/+47 | |
|\ \ \ | ||||||
| * | | | Use better file consumer | Erik Johnston | 2018-01-18 | 1 | -5/+10 | |
| * | | | Ensure media is in local cache before thumbnailing | Erik Johnston | 2018-01-18 | 3 | -10/+40 | |
* | | | | Merge pull request #2845 from matrix-org/rav/urlcache_error_handling | Richard van der Hoff | 2018-02-02 | 1 | -21/+34 | |
|\ \ \ \ | ||||||
| * | | | | Handle url_previews with no content-type | Richard van der Hoff | 2018-02-02 | 1 | -21/+34 | |
* | | | | | Merge branch 'develop' into travis/admin-list-media | Travis Ralston | 2018-02-01 | 6 | -30/+138 | |
|\| | | | | ||||||
| * | | | | fix thinko on 3pid whitelisting | Matthew Hodgson | 2018-01-24 | 1 | -2/+2 | |
| * | | | | add ?ts massaging for ASes (#2754) | Matthew Hodgson | 2018-01-23 | 1 | -6/+11 | |
| * | | | | Add federation_domain_whitelist option (#2820) | Matthew Hodgson | 2018-01-22 | 2 | -2/+25 | |
| * | | | | Merge pull request #2813 from matrix-org/matthew/registrations_require_3pid | Matthew Hodgson | 2018-01-22 | 3 | -22/+102 | |
| |\ \ \ \ | ||||||
| | * | | | | fix typo (thanks sytest) | Matthew Hodgson | 2018-01-19 | 1 | -1/+1 | |
| | * | | | | oops, check all login types | Matthew Hodgson | 2018-01-19 | 1 | -14/+11 | |
| | * | | | | trailing commas | Matthew Hodgson | 2018-01-19 | 2 | -7/+7 | |
| | * | | | | rewrite based on PR feedback: | Matthew Hodgson | 2018-01-19 | 4 | -76/+43 | |
| | * | | | | fix up v1, and improve errors | Matthew Hodgson | 2018-01-19 | 3 | -19/+53 | |
| | * | | | | fix pep8 | Matthew Hodgson | 2018-01-19 | 1 | -2/+1 | |
| | * | | | | add registrations_require_3pid | Matthew Hodgson | 2018-01-19 | 3 | -13/+96 | |
| | | |/ / | | |/| | | ||||||
* | / | | | Add an admin route to get all the media in a room | Travis Ralston | 2018-01-20 | 1 | -0/+22 | |
|/ / / / | ||||||
* | | | | Merge pull request #2814 from matrix-org/rav/fix_urlcache_thumbs | Richard van der Hoff | 2018-01-19 | 1 | -0/+8 | |
|\ \ \ \ | ||||||
| * | | | | Use the right path for url_preview thumbnails | Richard van der Hoff | 2018-01-19 | 1 | -0/+8 | |
| |/ / / | ||||||
* | | | | Fix storage provider bug introduced when renamed to store_local | Erik Johnston | 2018-01-18 | 1 | -1/+1 | |
* | | | | Merge pull request #2812 from matrix-org/erikj/media_storage_provider_config | Erik Johnston | 2018-01-18 | 2 | -20/+27 | |
|\ \ \ \ | ||||||
| * | | | | Missing staticmethod | Erik Johnston | 2018-01-18 | 1 | -0/+1 | |
| * | | | | Fixup comments | Erik Johnston | 2018-01-18 | 1 | -2/+2 | |
| * | | | | Make storage providers more configurable | Erik Johnston | 2018-01-18 | 2 | -20/+26 | |
| | |/ / | |/| | | ||||||
* | | | | Fix typo in thumbnail resource causing access times to be incorrect | Erik Johnston | 2018-01-18 | 1 | -2/+2 | |
| |/ / |/| | | ||||||
* | | | Update last access time when thumbnails are viewed | Erik Johnston | 2018-01-17 | 1 | -0/+2 | |
* | | | Keep track of last access time for local media | Erik Johnston | 2018-01-17 | 1 | -7/+25 | |
|/ / | ||||||
* | | Add docstring | Erik Johnston | 2018-01-17 | 1 | -1/+1 | |
* | | Use local vars | Erik Johnston | 2018-01-16 | 1 | -6/+2 | |
* | | Change _generate_thumbnails to take media_type | Erik Johnston | 2018-01-16 | 2 | -7/+10 | |
* | | Move setting of file_id up to caller | Erik Johnston | 2018-01-16 | 2 | -13/+14 | |
* | | Fix typo | Erik Johnston | 2018-01-16 | 1 | -7/+10 | |
* | | Fix up log lines | Erik Johnston | 2018-01-16 | 2 | -7/+10 | |
* | | Correctly use server_name/file_id when generating/fetching remote thumbnails | Erik Johnston | 2018-01-16 | 2 | -5/+8 | |
* | | Log when we respond with 404 | Erik Johnston | 2018-01-16 | 2 | -1/+8 | |
* | | Fix thumbnailing remote files | Erik Johnston | 2018-01-16 | 2 | -2/+30 | |
* | | Merge pull request #2767 from matrix-org/erikj/media_storage_refactor | Erik Johnston | 2018-01-16 | 7 | -346/+843 | |
|\ \ | ||||||
| * | | Fix up comments | Erik Johnston | 2018-01-12 | 2 | -7/+16 | |
| * | | Correctly reraise exception | Erik Johnston | 2018-01-12 | 1 | -2/+4 | |
| * | | Make Responder a context manager | Erik Johnston | 2018-01-12 | 2 | -9/+10 | |
| * | | Add missing class var | Erik Johnston | 2018-01-12 | 1 | -0/+3 | |
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/media_stor... | Erik Johnston | 2018-01-12 | 1 | -3/+26 | |
| |\ \ | ||||||
| * | | | Remove unnecessary condition | Erik Johnston | 2018-01-12 | 1 | -4/+1 | |
| * | | | Remove unused variables | Erik Johnston | 2018-01-12 | 1 | -3/+0 | |
| * | | | Make class var local | Erik Johnston | 2018-01-12 | 1 | -3/+3 | |
| * | | | Comments | Erik Johnston | 2018-01-12 | 3 | -15/+65 | |
| * | | | Add StorageProvider concept | Erik Johnston | 2018-01-09 | 3 | -9/+162 | |
| * | | | Make PreviewUrlResource use MediaStorage | Erik Johnston | 2018-01-09 | 2 | -8/+14 | |
| * | | | Make ThumbnailResource use MediaStorage | Erik Johnston | 2018-01-09 | 2 | -48/+68 | |
| * | | | Use MediaStorage for remote media | Erik Johnston | 2018-01-09 | 2 | -136/+156 | |
| * | | | Use MediaStorage for local files | Erik Johnston | 2018-01-09 | 2 | -119/+73 | |
| * | | | Add MediaStorage class | Erik Johnston | 2018-01-09 | 1 | -0/+198 | |
| * | | | Add some helper classes | Erik Johnston | 2018-01-09 | 1 | -0/+73 | |
| * | | | Split out add_file_headers | Erik Johnston | 2018-01-09 | 1 | -28/+42 | |
* | | | | Reinstate media download on thumbnail request | Richard van der Hoff | 2018-01-12 | 1 | -0/+5 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #2766 from matrix-org/rav/room_event | Richard van der Hoff | 2018-01-11 | 1 | -3/+26 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Add /room/{id}/event/{id} to synapse | Richard van der Hoff | 2018-01-09 | 1 | -3/+26 | |
* | | | Remove dead TODO | Erik Johnston | 2018-01-09 | 1 | -2/+0 | |
* | | | Remove dead code related to default thumbnails | Erik Johnston | 2018-01-09 | 1 | -73/+3 | |
|/ / | ||||||
* / | Better logging when login can't find a 3pid | Richard van der Hoff | 2017-12-20 | 1 | -4/+10 | |
|/ | ||||||
* | Fix error when deleting devices | Richard van der Hoff | 2017-12-05 | 1 | -1/+1 | |
* | Factor out a validate_user_via_ui_auth method | Richard van der Hoff | 2017-12-05 | 2 | -74/+59 | |
* | Refactor UI auth implementation | Richard van der Hoff | 2017-12-05 | 4 | -27/+51 | |
* | Delete devices in various logout situations | Richard van der Hoff | 2017-11-29 | 1 | -2/+25 | |
* | Move set_password into its own handler | Richard van der Hoff | 2017-11-29 | 2 | -3/+4 | |
* | Move deactivate_account into its own handler | Richard van der Hoff | 2017-11-29 | 2 | -5/+6 | |
* | Allow guest access to group APIs for reading | Luke Barnard | 2017-11-28 | 1 | -11/+11 | |
* | Merge pull request #2697 from matrix-org/rav/fix_urlcache_index_error | Richard van der Hoff | 2017-11-27 | 1 | -3/+7 | |
|\ | ||||||
| * | Check database in has_completed_background_updates | Richard van der Hoff | 2017-11-22 | 1 | -1/+1 | |
| * | Fix error on sqlite 3.7 | Richard van der Hoff | 2017-11-21 | 1 | -3/+7 | |
* | | Fix OPTIONS on preview_url | Richard van der Hoff | 2017-11-23 | 1 | -1/+5 | |
|/ | ||||||
* | Declare support for r0.3.0 | Richard van der Hoff | 2017-11-15 | 1 | -0/+1 | |
* | Merge pull request #2668 from turt2live/travis/whoami | Richard van der Hoff | 2017-11-14 | 1 | -0/+15 | |
|\ | ||||||
| * | Remove redundent call | Travis Ralston | 2017-11-13 | 1 | -2/+0 | |
| * | Add a route for determining who you are | Travis Ralston | 2017-11-12 | 1 | -0/+17 | |
* | | Bit more logging | Richard van der Hoff | 2017-11-10 | 1 | -0/+2 | |
* | | Cache failures in url_preview handler | Richard van der Hoff | 2017-11-10 | 1 | -41/+45 | |
|/ | ||||||
* | Add some more comments appservice user registration | Richard van der Hoff | 2017-11-10 | 1 | -1/+4 | |
* | Downcase userids for shared-secret registration | Richard van der Hoff | 2017-11-10 | 2 | -3/+21 | |
* | Downcase userid on registration | Richard van der Hoff | 2017-11-09 | 1 | -1/+7 | |
* | Register group servlet | Erik Johnston | 2017-11-09 | 1 | -0/+1 | |
* | Have an explicit API to update room config | Erik Johnston | 2017-11-08 | 1 | -0/+27 | |
* | Revert "Modify group room association API to allow modification of is_public" | Erik Johnston | 2017-11-08 | 1 | -2/+2 | |
* | Merge pull request #2576 from maximevaillancourt/exclude-noscript-url-preview | Matthew Hodgson | 2017-11-07 | 1 | -1/+8 | |
|\ | ||||||
| * | Ignore noscript tags when generating URL previews | Maxime Vaillancourt | 2017-10-25 | 1 | -1/+8 | |
* | | support inhibit_login in /register | Richard van der Hoff | 2017-11-02 | 1 | -12/+16 | |
* | | Allow password_auth_providers to return a callback | Richard van der Hoff | 2017-11-01 | 1 | -1/+4 | |
* | | Merge remote-tracking branch 'origin/develop' into rav/refactor_accesstoken_d... | David Baker | 2017-11-01 | 3 | -6/+12 | |
|\ \ | ||||||
| * \ | Merge pull request #2615 from matrix-org/rav/break_auth_device_dep | David Baker | 2017-11-01 | 2 | -4/+0 | |
| |\ \ | ||||||
| | * | | Break dependency of auth_handler on device_handler | Richard van der Hoff | 2017-11-01 | 2 | -4/+0 | |
| * | | | Apparently this is python | David Baker | 2017-11-01 | 1 | -1/+1 | |
| * | | | Log login requests | David Baker | 2017-11-01 | 1 | -0/+10 | |
| * | | | Modify group room association API to allow modification of is_public | Luke Barnard | 2017-10-31 | 1 | -2/+2 | |
| |/ / | ||||||
* / / | Move access token deletion into auth handler | Richard van der Hoff | 2017-11-01 | 3 | -22/+10 | |
|/ / | ||||||
* | | Refactor some logic from LoginRestServlet into AuthHandler | Richard van der Hoff | 2017-10-31 | 1 | -29/+26 | |
* | | Merge pull request #2591 from matrix-org/rav/device_delete_auth | Richard van der Hoff | 2017-10-27 | 1 | -5/+8 | |
|\ \ | ||||||
| * | | Device deletion: check UI auth matches access token | Richard van der Hoff | 2017-10-27 | 1 | -5/+8 | |
* | | | Merge pull request #2589 from matrix-org/rav/as_deactivate_account | Richard van der Hoff | 2017-10-27 | 1 | -16/+32 | |
|\ \ \ | ||||||
| * | | | Allow ASes to deactivate their own users | Richard van der Hoff | 2017-10-27 | 1 | -16/+32 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2582 from matrix-org/luke/group-is-public | Luke Barnard | 2017-10-27 | 1 | -40/+53 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | delint | Luke Barnard | 2017-10-26 | 1 | -4/+17 | |
| * | | Add is_public to groups table to allow for private groups | Luke Barnard | 2017-10-26 | 1 | -40/+40 | |
| |/ | ||||||
* | | add release endpoints for /thirdparty | Krombel | 2017-10-26 | 1 | -7/+4 | |
* | | register some /unstable endpoints in /r0 as well | Krombel | 2017-10-26 | 4 | -20/+9 | |
|/ | ||||||
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 11 | -16/+16 | |
* | Fix a logcontext leak in the media repo | Richard van der Hoff | 2017-10-23 | 1 | -1/+4 | |
* | Remove pointless create() method | Richard van der Hoff | 2017-10-20 | 2 | -4/+4 | |
* | Fix typo in thumbnail generation | Erik Johnston | 2017-10-19 | 1 | -2/+5 | |
* | Merge pull request #2550 from krombel/fix_thumbnail_2548 | Erik Johnston | 2017-10-17 | 1 | -2/+2 | |
|\ | ||||||
| * | fix thumbnailing (#2548) | Krombel | 2017-10-17 | 1 | -2/+2 | |
* | | Merge pull request #2545 from matrix-org/dbkr/auto_join_rooms | David Baker | 2017-10-17 | 1 | -0/+34 | |
|\ \ | |/ |/| | ||||||
| * | Add config option to auto-join new users to rooms | David Baker | 2017-10-16 | 1 | -0/+34 | |
* | | Delint | Luke Barnard | 2017-10-16 | 1 | -0/+1 | |
* | | Implement GET /groups/$groupId/invited_users | Luke Barnard | 2017-10-16 | 1 | -0/+21 | |
|/ | ||||||
* | Add try/finally block to close t_byte_source | Erik Johnston | 2017-10-13 | 1 | -24/+41 | |
* | Remove old comment | Erik Johnston | 2017-10-13 | 1 | -1/+0 | |
* | Don't reuse source but instead copy from primary media store to backup | Erik Johnston | 2017-10-13 | 2 | -22/+9 | |
* | PEP8 | Erik Johnston | 2017-10-13 | 1 | -1/+1 | |
* | Move type into key | Erik Johnston | 2017-10-13 | 1 | -3/+3 | |
* | Comment | Erik Johnston | 2017-10-13 | 1 | -1/+1 | |
* | Remove spurious addition | Erik Johnston | 2017-10-13 | 1 | -4/+0 | |
* | Don't needlessly rename variable | Erik Johnston | 2017-10-13 | 1 | -13/+13 | |
* | Add paths back in... | Erik Johnston | 2017-10-13 | 1 | -4/+4 | |
* | Remove unnecessary diff | Erik Johnston | 2017-10-13 | 1 | -3/+1 | |
* | Make things be absolute paths again | Erik Johnston | 2017-10-13 | 1 | -7/+7 | |
* | s/write_to_file/write_to_file_and_backup/ | Erik Johnston | 2017-10-13 | 1 | -5/+5 | |
* | Fix up | Erik Johnston | 2017-10-13 | 2 | -43/+32 | |
* | Fix up thumbnailing function | Erik Johnston | 2017-10-13 | 3 | -75/+73 | |
* | Fix typo | Erik Johnston | 2017-10-13 | 1 | -1/+1 | |
* | Fix up comments | Erik Johnston | 2017-10-13 | 1 | -2/+26 | |
* | Move makedirs to thread | Erik Johnston | 2017-10-13 | 1 | -2/+1 | |
* | Use make_deferred_yieldable | Erik Johnston | 2017-10-13 | 1 | -7/+7 | |
* | Fix comments | Erik Johnston | 2017-10-12 | 2 | -1/+4 | |
* | Don't close prematurely.. | Erik Johnston | 2017-10-12 | 1 | -2/+5 | |
* | getvalue closes buffer | Erik Johnston | 2017-10-12 | 1 | -11/+10 | |
* | Get len before close | Erik Johnston | 2017-10-12 | 1 | -6/+11 | |
* | Don't close file prematurely | Erik Johnston | 2017-10-12 | 2 | -8/+18 | |
* | Copy everything to backup | Erik Johnston | 2017-10-12 | 4 | -76/+148 | |
* | Typo | Erik Johnston | 2017-10-12 | 1 | -1/+1 | |
* | Remove dead code | Erik Johnston | 2017-10-12 | 1 | -3/+0 | |
* | Fix typos | Erik Johnston | 2017-10-12 | 1 | -20/+26 | |
* | Fix typo | Erik Johnston | 2017-10-12 | 1 | -1/+1 | |
* | Basic implementation of backup media store | Erik Johnston | 2017-10-12 | 3 | -126/+113 | |
* | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 3 | -23/+196 | |
|\ | ||||||
| * | Only log if we've removed media | Erik Johnston | 2017-09-28 | 1 | -2/+4 | |
| * | Clear up expired url cache every 10s | Erik Johnston | 2017-09-28 | 1 | -1/+1 | |
| * | Actually assign result to variable | Erik Johnston | 2017-09-28 | 1 | -1/+1 | |
| * | Fix typo in url cache expiry timer | Erik Johnston | 2017-09-28 | 1 | -1/+1 | |
| * | Support new and old style media id formats | Erik Johnston | 2017-09-28 | 1 | -31/+81 | |
| * | Change expires column to expires_ts | Erik Johnston | 2017-09-28 | 1 | -2/+2 |