Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | 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 | |
| * | Delete expired url cache data | Erik Johnston | 2017-09-28 | 2 | -4/+129 | |
| * | Fix /joined_members to work with AS users | Erik Johnston | 2017-09-28 | 1 | -2/+1 | |
| * | Fix bug where /joined_members didn't check user was in room | Erik Johnston | 2017-09-27 | 1 | -10/+7 | |
* | | Add remove room API | Erik Johnston | 2017-09-26 | 1 | -0/+11 | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged | Erik Johnston | 2017-09-19 | 3 | -14/+13 | |
|\| | ||||||
| * | Add left section to /keys/changes | Erik Johnston | 2017-09-08 | 1 | -4/+2 | |
| * | Send down device list change notif when member leaves/rejoins room | Erik Johnston | 2017-09-07 | 1 | -1/+2 | |
| * | fix english | hera | 2017-08-04 | 1 | -7/+7 | |
| * | typo | hera | 2017-08-04 | 1 | -1/+1 | |
| * | Reduce spammy log line in synchrotrons | Erik Johnston | 2017-08-02 | 1 | -1/+1 | |
* | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 1 | -9/+9 | |
* | | Fixup | Erik Johnston | 2017-08-11 | 1 | -0/+1 | |
* | | Add bulk group publicised lookup API | Erik Johnston | 2017-08-09 | 1 | -0/+54 | |
* | | Allow update group publicity | Erik Johnston | 2017-08-08 | 1 | -0/+28 | |
* | | Merge pull request #2378 from matrix-org/erikj/group_sync_support | Erik Johnston | 2017-07-21 | 1 | -0/+5 | |
|\ \ | ||||||
| * | | Add groups to sync stream | Erik Johnston | 2017-07-20 | 1 | -0/+5 | |
* | | | Remove spurious content param | Erik Johnston | 2017-07-20 | 1 | -1/+1 | |
* | | | Add update group profile API | Erik Johnston | 2017-07-20 | 1 | -0/+12 | |
|/ / | ||||||
* | | Comments | Erik Johnston | 2017-07-18 | 1 | -1/+3 | |
* | | Comments | Erik Johnston | 2017-07-18 | 1 | -103/+48 | |
* | | Add local group server support | Erik Johnston | 2017-07-17 | 2 | -0/+644 | |
|/ | ||||||
* | split out reducing stuff; just make encode_* static | Krombel | 2017-07-11 | 1 | -35/+27 | |
* | fix test | Krombel | 2017-07-10 | 1 | -1/+3 | |
* | encode sync-response statically; omit empty objects from sync-response | Krombel | 2017-07-10 | 1 | -33/+48 | |
* | Fix bug where pusherpool didn't start and broke some rooms | Erik Johnston | 2017-07-06 | 1 | -8/+6 | |
* | Store URL cache preview downloads seperately | Erik Johnston | 2017-06-23 | 5 | -18/+72 | |
* | Add API to quarantine media | Erik Johnston | 2017-06-19 | 4 | -3/+30 | |
* | Remove unused import | Erik Johnston | 2017-06-19 | 1 | -1/+1 | |
* | Change to create new room and join other users | Erik Johnston | 2017-06-19 | 1 | -6/+53 | |
* | Forget room | Erik Johnston | 2017-06-19 | 1 | -0/+2 | |
* | Add shutdown room API | Erik Johnston | 2017-06-19 | 1 | -1/+66 | |
* | Include users who share room with requester in user directory | Erik Johnston | 2017-06-15 | 1 | -2/+6 | |
* | Throw exception when not retrying when downloading media | Erik Johnston | 2017-06-13 | 1 | -0/+1 | |
* | Add comments | Erik Johnston | 2017-05-31 | 1 | -0/+16 | |
* | Use POST | Erik Johnston | 2017-05-31 | 1 | -1/+1 | |
* | Add REST API | Erik Johnston | 2017-05-31 | 2 | -0/+61 | |
* | Merge pull request #2243 from matrix-org/matthew/fix-url-preview-length-again | Erik Johnston | 2017-05-23 | 1 | -0/+2 | |
|\ | ||||||
| * | actually trim oversize og:description meta | Matthew Hodgson | 2017-05-22 | 1 | -0/+2 | |
* | | Add count of one time keys to sync stream | Erik Johnston | 2017-05-19 | 1 | -0/+1 | |
|/ | ||||||
* | Merge pull request #2221 from psaavedra/sync_timeline_limit_filter_by_name | Erik Johnston | 2017-05-15 | 3 | -0/+20 | |
|\ | ||||||
| * | Fixed syntax nits | Pablo Saavedra | 2017-05-15 | 2 | -5/+6 | |
| * | Fixed implementation errors | Pablo Saavedra | 2017-05-15 | 2 | -3/+7 | |
| * | Configurable maximum number of events requested by /sync and /messages (#2220) | Pablo Saavedra | 2017-05-13 | 3 | -0/+15 | |
* | | Don't log exceptions for NotRetryingDestination | Erik Johnston | 2017-05-15 | 1 | -1/+3 | |
|/ | ||||||
* | Modify register/available to be GET with query param | Luke Barnard | 2017-05-10 | 1 | -5/+4 | |
* | Change register/available to POST (from GET) | Luke Barnard | 2017-05-10 | 1 | -1/+1 | |
* | Merge pull request #2183 from matrix-org/luke/username-availability | Luke Barnard | 2017-05-04 | 1 | -0/+41 | |
|\ | ||||||
| * | Appease the flake8 gods | Luke Barnard | 2017-05-03 | 1 | -5/+10 | |
| * | Implement username availability checker | Luke Barnard | 2017-05-03 | 1 | -0/+36 | |
* | | Add more granular event send metrics | Erik Johnston | 2017-05-02 | 1 | -0/+1 | |
|/ | ||||||
* | Merge pull request #2163 from matrix-org/erikj/fix_invite_state | Erik Johnston | 2017-04-27 | 1 | -0/+1 | |
|\ | ||||||
| * | Comment and remove spurious logging | Erik Johnston | 2017-04-27 | 1 | -1/+0 | |
| * | Fix invite state to always include all events | Erik Johnston | 2017-04-26 | 1 | -0/+2 | |
* | | Merge pull request #2130 from APwhitehat/roomexists | Erik Johnston | 2017-04-27 | 1 | -1/+5 | |
|\ \ | |/ |/| | ||||||
| * | Check that requested room_id exists | Anant Prakash | 2017-04-14 | 1 | -1/+5 | |
* | | Reduce size of joined_user cache | Erik Johnston | 2017-04-25 | 1 | -1/+7 | |
* | | Fix code for reporting old verify keys in synapse | Mark Haines | 2017-04-24 | 1 | -3/+2 | |
* | | m.read_marker -> m.fully_read (#2128) | Luke Barnard | 2017-04-18 | 2 | -5/+5 | |
* | | More null-guard changes | Luke Barnard | 2017-04-12 | 1 | -4/+4 | |
* | | Remove Unused ref to hs | Luke Barnard | 2017-04-12 | 1 | -1/+0 | |
* | | Move a space | Luke Barnard | 2017-04-12 | 1 | -2/+2 | |
* | | flake8 | Luke Barnard | 2017-04-11 | 2 | -3/+3 | |
* | | Finish implementing RM endpoint | Luke Barnard | 2017-04-11 | 3 | -9/+14 | |
* | | Initial commit of RM server-side impl | lukebarnard | 2017-04-11 | 1 | -0/+71 | |
|/ | ||||||
* | Merge pull request #2011 from matrix-org/matthew/turn_allow_guests | Erik Johnston | 2017-03-31 | 1 | -1/+4 | |
|\ | ||||||
| * | add setting (on by default) to support TURN for guests | Matthew Hodgson | 2017-03-15 | 1 | -1/+4 | |
* | | Merge pull request #1986 from matrix-org/matthew/enable_guest_3p | Erik Johnston | 2017-03-31 | 1 | -4/+4 | |
|\ \ | ||||||
| * | | switch to allow_guest=True for authing 3Ps as per PR feedback | Matthew Hodgson | 2017-03-31 | 1 | -0/+8 | |
| * | | enable guest access for the 3pl/3pid APIs | Matthew Hodgson | 2017-03-12 | 1 | -8/+0 | |
* | | | Merge pull request #2057 from matrix-org/rav/missing_yield_2 | Richard van der Hoff | 2017-03-24 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * | | | Add another missing yield on check_device_registered | Richard van der Hoff | 2017-03-23 | 1 | -1/+1 | |
* | | | | Fix token request for addition of phone numbers | David Baker | 2017-03-23 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Don't recreate so many sets | Erik Johnston | 2017-03-16 | 1 | -2/+1 | |
* | | | Remove unused import | Erik Johnston | 2017-03-15 | 1 | -1/+0 | |
* | | | Format presence events on the edges instead of reformatting them multiple times | Erik Johnston | 2017-03-15 | 2 | -6/+16 | |
* | | | Merge pull request #1997 from matrix-org/dbkr/cas_partialdownload | David Baker | 2017-03-15 | 1 | -1/+8 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Handle PartialDownloadError in CAS login | David Baker | 2017-03-14 | 1 | -1/+8 | |
* | | | Merge pull request #1994 from matrix-org/dbkr/msisdn_signin_2 | Erik Johnston | 2017-03-15 | 3 | -42/+297 | |
|\ \ \ | ||||||
| * | | | Use extend instead of += | David Baker | 2017-03-14 | 1 | -4/+4 | |
| * | | | Oops, remove print | David Baker | 2017-03-14 | 1 | -1/+0 | |
| * | | | Fix registration for broken clients | David Baker | 2017-03-13 | 1 | -4/+22 | |
| * | | | Support registration / login with phone number | David Baker | 2017-03-13 | 3 | -42/+280 | |
* | | | | Merge pull request #1992 from matrix-org/rav/fix_media_loop | Richard van der Hoff | 2017-03-14 | 2 | -10/+46 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Address review comments | Richard van der Hoff | 2017-03-14 | 1 | -15/+17 | |
| * | | | Fix routing loop when fetching remote media | Richard van der Hoff | 2017-03-13 | 2 | -4/+38 | |
| |/ / | ||||||
* | | | Implement _simple_delete_many_txn, use it to delete devices | Luke Barnard | 2017-03-13 | 1 | -11/+9 | |
* | | | Flake | Luke Barnard | 2017-03-13 | 1 | -0/+2 | |
* | | | Implement delete_devices API | Luke Barnard | 2017-03-13 | 1 | -0/+47 | |
|/ / | ||||||
* / | Revert "Support registration & login with phone number" | Erik Johnston | 2017-03-13 | 3 | -280/+42 | |
|/ | ||||||
* | Comment when our 3pids would be incomplete | David Baker | 2017-03-08 | 1 | -0/+2 | |
* | Not any more, it doesn't | David Baker | 2017-03-08 | 1 | -1/+0 | |
* | Better error message | David Baker | 2017-03-08 | 1 | -1/+3 | |
* | pep8 | David Baker | 2017-03-08 | 1 | -1/+1 | |
* | Pull out datastore in initialiser | David Baker | 2017-03-08 | 1 | -5/+10 | |
* | Minor fixes from PR feedback | David Baker | 2017-03-08 | 2 | -5/+3 | |
* | Typos | David Baker | 2017-03-08 | 1 | -2/+2 | |
* | Refector out assert_params_in_request | David Baker | 2017-03-08 | 2 | -37/+17 | |
* | Factor out msisdn canonicalisation | David Baker | 2017-03-08 | 3 | -40/+10 | |
* | Fix pep8 | David Baker | 2017-03-08 | 3 | -6/+6 | |
* | Support new login format | David Baker | 2017-03-07 | 1 | -6/+91 | |
* | Add msisdns as 3pids during registration | David Baker | 2017-03-03 | 1 | -0/+47 | |
* | Merge remote-tracking branch 'origin/develop' into dbkr/msisdn_signin | David Baker | 2017-03-01 | 3 | -4/+19 | |
|\ | ||||||
| * | Merge pull request #1945 from jkolo/fix_dynamic_thumbnails_aspect | Erik Johnston | 2017-02-27 | 1 | -0/+3 | |
| |\ | ||||||
| | * | Fix dynamic thumbnails aspect | Jurek | 2017-02-24 | 1 | -0/+3 | |
| * | | Remove unused param | Erik Johnston | 2017-02-20 | 1 | -1/+0 | |
| * | | Merge pull request #1917 from matrix-org/dbkr/make_ban_reasons_work | David Baker | 2017-02-14 | 1 | -0/+5 | |
| |\ \ | ||||||
| | * | | Make kick & ban reasons work | David Baker | 2017-02-14 | 1 | -0/+5 | |
| * | | | Ordering is important on errbacks so add the cleanup func before creating an ... | Kegan Dougal | 2017-02-13 | 1 | -7/+7 | |
| * | | | Pop the txn from the map in case it has already been deleted somehow | Kegan Dougal | 2017-02-13 | 1 | -1/+1 |