| Commit message (Expand) | Author | Age | Files | Lines |
* | Use parse_string | Erik Johnston | 2016-09-08 | 1 | -2/+2 |
* | Add server param to /publicRooms | Erik Johnston | 2016-09-08 | 1 | -5/+16 |
* | Add quotes and be explicity about script-src | Erik Johnston | 2016-09-05 | 1 | -1/+2 |
* | Allow PDF to be rendered from media repo | Erik Johnston | 2016-09-05 | 1 | -1/+7 |
* | Fix up the calls to the notifier for device messages | Mark Haines | 2016-09-01 | 1 | -1/+1 |
* | Add a replication stream for direct to device messages | Mark Haines | 2016-08-31 | 1 | -2/+8 |
* | Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device | Mark Haines | 2016-08-26 | 1 | -1/+1 |
|\ |
|
| * | Move ThirdPartyEntityKind into api.constants so the expectation becomes that ... | Paul "LeoNerd" Evans | 2016-08-25 | 1 | -1/+1 |
* | | Merge branch 'develop' into markjh/direct_to_device | Mark Haines | 2016-08-25 | 2 | -4/+21 |
|\| |
|
| * | Merge pull request #1041 from matrix-org/paul/third-party-lookup | Paul Evans | 2016-08-25 | 1 | -2/+20 |
| |\ |
|
| | * | Move static knowledge of protocol metadata into AS handler; cache the result | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -20/+1 |
| | * | Declare 'gitter' known protocol, with user lookup | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -0/+3 |
| | * | Initial hack at the 3PN protocols metadata lookup API | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -0/+34 |
| | * | Move 3PU/3PL lookup APIs into /thirdparty containing entity | Paul "LeoNerd" Evans | 2016-08-24 | 1 | -2/+2 |
| * | | Preserve some logcontexts | Erik Johnston | 2016-08-24 | 1 | -2/+1 |
| |/ |
|
* | | Add some TODOs | Mark Haines | 2016-08-25 | 1 | -0/+4 |
* | | Fix the deduplication of incoming direct-to-device messages | Mark Haines | 2016-08-25 | 1 | -1/+12 |
* | | Add store-and-forward direct-to-device messaging | Mark Haines | 2016-08-25 | 3 | -3/+77 |
|/ |
|
* | Pass through user-supplied content in /join/$room_id | Kegan Dougal | 2016-08-23 | 1 | -0/+1 |
* | Merge branch 'develop' into dbkr/notifications_api | Matthew Hodgson | 2016-08-20 | 2 | -0/+80 |
|\ |
|
| * | Avoid so much copypasta between 3PU and 3PL query by unifying around a ThirdP... | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+7 |
| * | Authenticate 3PE lookup requests | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -0/+6 |
| * | Copypasta the 3PU support code to also do 3PL | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -0/+20 |
| * | Remove TODO note about request fields being strings - they're always strings | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -2/+0 |
| * | Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookup | Paul "LeoNerd" Evans | 2016-08-18 | 11 | -164/+285 |
| |\ |
|
| * | | Ensure that 3PU lookup request fields actually get passed in | Paul "LeoNerd" Evans | 2016-08-18 | 1 | -1/+5 |
| * | | Thread 3PU lookup through as far as the AS API object; which currently noöps it | Paul "LeoNerd" Evans | 2016-08-17 | 1 | -2/+9 |
| * | | Initial empty implementation that just registers an API endpoint handler | Paul "LeoNerd" Evans | 2016-08-17 | 2 | -0/+40 |
* | | | Use tuple comparison | David Baker | 2016-08-18 | 1 | -4/+3 |
* | | | Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api | David Baker | 2016-08-18 | 12 | -165/+286 |
|\ \ \
| | |/
| |/| |
|
| * | | Set `Content-Security-Policy` on media repo | Erik Johnston | 2016-08-17 | 1 | -0/+1 |
| * | | Add None check to _iterate_over_text | Erik Johnston | 2016-08-17 | 1 | -1/+1 |
| * | | Flake8 | Erik Johnston | 2016-08-16 | 1 | -4/+1 |
| * | | Fix up preview URL API. Add tests. | Erik Johnston | 2016-08-16 | 1 | -157/+196 |
| * | | Make synchrotron accept /events | Erik Johnston | 2016-08-12 | 1 | -5/+4 |
| * | | Dont invoke get_handlers fromClientV1RestServlet | Erik Johnston | 2016-08-12 | 9 | -1/+86 |
| |/ |
|
| * | Don't change status_msg on /sync | Will Hunt | 2016-08-10 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/develop' into dbkr/notifications_api | David Baker | 2016-08-11 | 22 | -534/+973 |
|\| |
|
| * | Don't print stack traces when failing to get remote keys | Erik Johnston | 2016-08-10 | 1 | -1/+3 |
| * | Merge pull request #995 from matrix-org/rav/clean_up_cas_login | David Baker | 2016-08-09 | 1 | -125/+33 |
| |\ |
|
| | * | Clean up CAS login code | Richard van der Hoff | 2016-08-08 | 1 | -125/+33 |
| * | | Fix CAS login | Richard van der Hoff | 2016-08-08 | 1 | -0/+1 |
| |/ |
|
| * | Don't include html comments in description | Erik Johnston | 2016-08-05 | 1 | -1/+2 |
| * | Typo | Erik Johnston | 2016-08-04 | 1 | -1/+1 |
| * | Test summarization | Erik Johnston | 2016-08-04 | 1 | -52/+54 |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/xpath_fix | Erik Johnston | 2016-08-04 | 1 | -42/+8 |
| |\ |
|
| | * | Merge branch 'rav/null_default_device_displayname' into develop | Richard van der Hoff | 2016-08-03 | 1 | -3/+1 |
| | |\ |
|
| | | * | Default device_display_name to null | Richard van der Hoff | 2016-08-03 | 1 | -3/+1 |
| | * | | Merge branch 'develop' into rav/refactor_device_query | Mark Haines | 2016-08-03 | 1 | -9/+7 |
| | |\| |
|
| | * | | Move e2e query logic into a handler | Richard van der Hoff | 2016-08-01 | 1 | -39/+7 |
| * | | | Don't infer paragrahs from newlines | Erik Johnston | 2016-08-02 | 1 | -2/+1 |
| * | | | Comment on why we clone | Erik Johnston | 2016-08-02 | 1 | -0/+1 |
| * | | | Spelling. | Erik Johnston | 2016-08-02 | 1 | -3/+3 |
| * | | | Make it actually compile | Erik Johnston | 2016-08-02 | 1 | -1/+1 |
| * | | | Change the way we summarize URLs | Erik Johnston | 2016-08-02 | 1 | -11/+67 |
| | |/
| |/| |
|
| * | | Fix adding emails on registration | David Baker | 2016-07-29 | 1 | -9/+7 |
| |/ |
|
| * | Add r0.1.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -0/+1 |
| * | Add r0.2.0 to the "supported versions" list | Richard van der Hoff | 2016-07-28 | 1 | -1/+4 |
| * | key upload tweaks | Richard van der Hoff | 2016-07-27 | 1 | -7/+5 |
| * | Delete e2e keys on device delete | Richard van der Hoff | 2016-07-27 | 1 | -4/+9 |
| * | Make the device id on e2e key upload optional | Richard van der Hoff | 2016-07-26 | 1 | -12/+35 |
| * | Add `create_requester` function | Richard van der Hoff | 2016-07-26 | 1 | -6/+4 |
| * | Implement updating devices | Richard van der Hoff | 2016-07-26 | 1 | -7/+17 |
| * | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 3 | -8/+29 |
| * | Merge pull request #943 from matrix-org/rav/get_device_api | David Baker | 2016-07-21 | 1 | -0/+25 |
| |\ |
|
| | * | Implement GET /device/{deviceId} | Richard van der Hoff | 2016-07-21 | 1 | -0/+25 |
| * | | Merge pull request #942 from matrix-org/rav/fix_register_deviceid | David Baker | 2016-07-21 | 1 | -11/+10 |
| |\ \
| | |/
| |/| |
|
| | * | Preserve device_id from first call to /register | Richard van der Hoff | 2016-07-21 | 1 | -11/+10 |
| * | | Merge branch 'develop' into rav/get_devices_api | Richard van der Hoff | 2016-07-20 | 1 | -15/+39 |
| |\| |
|
| | * | Register a device_id in the /v2/register flow. | Richard van der Hoff | 2016-07-20 | 1 | -15/+39 |
| * | | GET /devices endpoint | Richard van der Hoff | 2016-07-20 | 3 | -4/+62 |
| |/ |
|
| * | Merge pull request #933 from matrix-org/rav/type_annotations | Richard van der Hoff | 2016-07-20 | 3 | -0/+17 |
| |\ |
|
| | * | Type annotations | Richard van der Hoff | 2016-07-19 | 3 | -0/+17 |
| * | | Merge pull request #932 from matrix-org/rav/register_refactor | David Baker | 2016-07-20 | 2 | -14/+40 |
| |\ \ |
|
| | * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 2 | -14/+40 |
| | |/ |
|
| * | | Merge pull request #922 from matrix-org/erikj/file_api2 | Erik Johnston | 2016-07-20 | 1 | -1/+10 |
| |\ \
| | |/
| |/| |
|
| | * | Add filter param to /messages API | Erik Johnston | 2016-07-14 | 1 | -1/+10 |
| * | | Merge pull request #931 from matrix-org/rav/refactor_register | David Baker | 2016-07-19 | 1 | -78/+102 |
| |\ \ |
|
| | * | | Don't bind email unless threepid contains expected fields | Richard van der Hoff | 2016-07-19 | 1 | -28/+25 |
| | * | | rest/client/v2_alpha/register.py: Refactor flow somewhat. | Richard van der Hoff | 2016-07-19 | 1 | -75/+102 |
| * | | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 2 | -6/+43 |
| |/ / |
|
| * | | Merge pull request #928 from matrix-org/rav/refactor_login | Richard van der Hoff | 2016-07-18 | 1 | -18/+23 |
| |\ \ |
|
| | * | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 1 | -18/+23 |
| * | | | Use body.get to check for 'user' | Will Hunt | 2016-07-16 | 1 | -2/+1 |
| * | | | Fall back to 'username' if 'user' is not given for appservice reg. | Will Hunt | 2016-07-16 | 1 | -3/+5 |
| |/ / |
|
| * | | Merge pull request #921 from matrix-org/erikj/account_deactivate | Erik Johnston | 2016-07-14 | 1 | -0/+44 |
| |\ \ |
|
| | * | | Add hs object | Erik Johnston | 2016-07-14 | 1 | -0/+1 |
| | * | | Only accept password auth | Erik Johnston | 2016-07-14 | 1 | -12/+0 |
| | * | | Add an /account/deactivate endpoint | Erik Johnston | 2016-07-14 | 1 | -0/+55 |
| | |/ |
|
| * | | Merge pull request #918 from negzi/bugfix_for_token_expiry | Erik Johnston | 2016-07-14 | 1 | -1/+1 |
| |\ \
| | |/
| |/| |
|
| | * | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 1 | -1/+1 |
| * | | be more pythonic | David Baker | 2016-07-12 | 1 | -1/+1 |
| * | | on_OPTIONS isn't neccessary | David Baker | 2016-07-12 | 2 | -10/+1 |
| * | | Remove other debug logging | David Baker | 2016-07-12 | 1 | -2/+0 |
| * | | Separate out requestTokens to separate handlers | David Baker | 2016-07-11 | 2 | -65/+93 |
| * | | Oops, remove debug logging | David Baker | 2016-07-11 | 1 | -4/+0 |
| * | | Implement https://github.com/matrix-org/matrix-doc/pull/346/files | David Baker | 2016-07-08 | 1 | -0/+59 |
| |/ |
|
| * | Add rest servlet. Fix SQL. | Erik Johnston | 2016-07-06 | 1 | -0/+1 |
| * | Merge branch 'erikj/shared_secret' into erikj/test2 | Erik Johnston | 2016-07-06 | 1 | -4/+16 |
| |\ |
|
| | * | Check that there are no null bytes in user and passsword | Erik Johnston | 2016-07-06 | 1 | -0/+6 |
| | * | Add null separator to hmac | Erik Johnston | 2016-07-06 | 1 | -0/+2 |
| | * | Add an admin option to shared secret registration | Erik Johnston | 2016-07-05 | 1 | -0/+1 |
| | * | Protect password when registering using shared secret | Erik Johnston | 2016-07-05 | 1 | -4/+7 |
| * | | Add purge_history API | Erik Johnston | 2016-07-05 | 1 | -0/+18 |
| |/ |
|
| * | Fix style violations | Kent Shikama | 2016-07-04 | 1 | -1/+2 |
| * | Use .get() instead of [] to access password_hash | Kent Shikama | 2016-07-04 | 1 | -1/+1 |
| * | Optionally include password hash in createUser endpoint | Kent Shikama | 2016-07-03 | 1 | -1/+3 |
| * | Feature: Add deactivate account admin API | Erik Johnston | 2016-06-30 | 1 | -0/+26 |
| * | Remove race | Erik Johnston | 2016-06-29 | 1 | -11/+0 |
| * | Implement purge_media_cache admin API | Erik Johnston | 2016-06-29 | 3 | -20/+96 |
| * | Track approximate last access time for remote media | Erik Johnston | 2016-06-29 | 1 | -0/+24 |
| * | Remove the legacy v0 content upload API. | Mark Haines | 2016-06-21 | 1 | -110/+2 |
| * | Line lengths | Erik Johnston | 2016-06-15 | 1 | -3/+3 |
| * | Handle floats as img widths | Erik Johnston | 2016-06-15 | 1 | -1/+1 |
| * | Handle og props with not content | Erik Johnston | 2016-06-15 | 1 | -1/+2 |
| * | 502 on /thumbnail when can't contact remote server | Erik Johnston | 2016-06-09 | 1 | -4/+10 |
| * | Remove redundant exception log in /events | Erik Johnston | 2016-06-09 | 1 | -24/+21 |
| * | Don't make rooms visibile by default | Erik Johnston | 2016-06-08 | 1 | -2/+0 |
| * | Log user that is making /publicRooms calls | Erik Johnston | 2016-06-08 | 1 | -0/+7 |
| * | Load push rules in storage layer, so that they get cached | Erik Johnston | 2016-06-03 | 1 | -4/+2 |
| * | Working unsubscribe links going straight to the HS | David Baker | 2016-06-02 | 1 | -1/+3 |
| * | Merge branch 'dbkr/split_out_auth_handler' into dbkr/email_unsubscribe | David Baker | 2016-06-02 | 5 | -10/+11 |
| |\ |
|
| | * | Split out the auth handler | David Baker | 2016-06-02 | 5 | -10/+11 |
| * | | WIP on unsubscribing email notifs without logging in | David Baker | 2016-06-01 | 1 | -1/+54 |
| |/ |
|
| * | Basic, un-cached support for secondary_directory_servers | David Baker | 2016-05-31 | 1 | -1/+2 |
| * | Split out the room list handler | David Baker | 2016-05-31 | 1 | -1/+1 |
* | | Include the ts the notif was received at | David Baker | 2016-05-24 | 1 | -0/+1 |
* | | Actually make the 'read' flag correct | David Baker | 2016-05-23 | 1 | -4/+3 |
* | | Add GET /notifications API | David Baker | 2016-05-23 | 2 | -0/+102 |
|/ |
|
* | Allow clients to specify a server_name to avoid 'No known servers' | Kegan Dougal | 2016-05-19 | 1 | -1/+4 |
* | Move typing handler out of the Handlers object | Mark Haines | 2016-05-17 | 1 | -4/+3 |
* | Move SyncHandler out of the Handlers object | Mark Haines | 2016-05-16 | 1 | -2/+1 |
* | Move the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 4 | -9/+17 |
* | Clean up the blacklist/whitelist handling. | Mark Haines | 2016-05-16 | 1 | -33/+30 |
* | Create user with expiry | Negi Fazeli | 2016-05-13 | 1 | -0/+71 |
* | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-05-10 | 3 | -0/+159 |
|\ |
|
| * | Rename openid/token to openid/request_token | Mark Haines | 2016-05-05 | 1 | -2/+2 |
| * | Add an openidish mechanism for proving to third parties that you own a given ... | Mark Haines | 2016-05-05 | 2 | -0/+98 |
| * | Add timestamp and auto incrementing ID | Erik Johnston | 2016-05-04 | 1 | -0/+2 |
| * | Move event_id to path | Erik Johnston | 2016-05-04 | 1 | -4/+2 |
| * | Add /report endpoint | Erik Johnston | 2016-05-04 | 2 | -0/+61 |
* | | More consistent config naming | David Baker | 2016-05-10 | 1 | -1/+1 |
* | | Add config option to not send email notifs for new users | David Baker | 2016-05-10 | 1 | -1/+4 |
* | | Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs | David Baker | 2016-04-29 | 1 | -0/+1 |
|\| |
|
| * | Fix password reset | David Baker | 2016-04-29 | 1 | -0/+1 |
* | | Add an email pusher for new users | David Baker | 2016-04-29 | 1 | -0/+26 |
|/ |
|
* | Report per request metrics for all of the things using request_handler | Mark Haines | 2016-04-28 | 6 | -7/+9 |
* | Make pyjwt dependency optional | Erik Johnston | 2016-04-25 | 1 | -5/+7 |
* | Merge pull request #687 from nikriek/jwt-fix | Erik Johnston | 2016-04-21 | 1 | -3/+6 |
|\ |
|
| * | Fix issues with JWT login | Niklas Riekenbrauck | 2016-04-21 | 1 | -3/+6 |
* | | Add self.media_repo to PreviewUrlResource | Erik Johnston | 2016-04-19 | 1 | -0/+1 |
* | | _make_dirs was moved to MediaRepository | Erik Johnston | 2016-04-19 | 1 | -1/+1 |
* | | Add store to PreviewUrlResource | Erik Johnston | 2016-04-19 | 1 | -0/+1 |
* | | Reorder imports | Erik Johnston | 2016-04-19 | 1 | -7/+8 |
* | | Move MediaRepository to media_repository module | Erik Johnston | 2016-04-19 | 5 | -489/+496 |
* | | Split out BaseMediaResource into MediaRepository | Erik Johnston | 2016-04-19 | 6 | -138/+180 |
* | | explicitly pass in the charset from Content-Type to lxml to fix cyrillic woes... | Matthew Hodgson | 2016-04-15 | 1 | -6/+18 |
* | | fix cyrillic URL previews by hardcoding all page decoding to UTF-8 for now, r... | Matthew Hodgson | 2016-04-15 | 1 | -16/+8 |
* | | fix urlparse import thinko breaking tiny URLs | Matthew Hodgson | 2016-04-14 | 1 | -5/+5 |
* | | Make v2_alpha reg follow the AS API specification | Kegan Dougal | 2016-04-14 | 1 | -0/+5 |
* | | comment out 2c838f6459db35ad9812a83184d85a06ca5d940a due to risk of https://e... | Matthew Hodgson | 2016-04-14 | 1 | -16/+16 |
* | | Sanitize the optional dependencies for spider API | Erik Johnston | 2016-04-13 | 2 | -27/+3 |
* | | Make the /set part mandatory | David Baker | 2016-04-12 | 1 | -1/+1 |
* | | Mis-named function | David Baker | 2016-04-12 | 1 | -1/+1 |
* | | Split into separate servlet classes | David Baker | 2016-04-12 | 1 | -11/+16 |
* | | Add get endpoint for pushers | David Baker | 2016-04-11 | 1 | -1/+34 |
* | | PEP8 | Erik Johnston | 2016-04-11 | 1 | -1/+0 |
* | | fix typos and needless try/except from PR review | Matthew Hodgson | 2016-04-11 | 1 | -143/+140 |
* | | actually throw meaningful errors | Matthew Hodgson | 2016-04-08 | 1 | -9/+24 |
* | | Fix pep8 warning | Mark Haines | 2016-04-08 | 1 | -3/+4 |
* | | more PR feedback | Matthew Hodgson | 2016-04-08 | 1 | -4/+8 |
* | | Add url_preview_enabled config option to turn on/off preview_url endpoint. de... | Matthew Hodgson | 2016-04-08 | 2 | -18/+64 |
* | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-04-04 | 3 | -36/+133 |
|\| |
|
| * | Use google style doc strings. | Mark Haines | 2016-04-01 | 1 | -36/+43 |
| * | Remove spurious comment | Erik Johnston | 2016-03-30 | 1 | -1/+0 |
| * | Require user to have left room to forget room | Erik Johnston | 2016-03-30 | 1 | -0/+38 |
| * | Add JWT support | Niklas Riekenbrauck | 2016-03-29 | 1 | -0/+53 |
* | | report image size (bytewise) in OG meta | Matthew Hodgson | 2016-04-03 | 1 | -0/+2 |
* | | char encoding | Matthew Hodgson | 2016-04-03 | 1 | -0/+1 |
* | | pep8 | Matthew Hodgson | 2016-04-03 | 2 | -55/+73 |
* | | fix etag typing error. fix timestamp typing error | Matthew Hodgson | 2016-04-03 | 1 | -2/+2 |
* | | rebase all image URLs | Matthew Hodgson | 2016-04-03 | 1 | -4/+4 |
* | | remove stale todo | Matthew Hodgson | 2016-04-03 | 1 | -3/+0 |
* | | Ensure only one download for a given URL is active at a time | Matthew Hodgson | 2016-04-03 | 1 | -1/+18 |
* | | add a persistent cache of URL lookups, and fix up the in-memory one to work | Matthew Hodgson | 2016-04-03 | 1 | -10/+54 |
* | | support gzip compression, and don't pass through error msgs | Matthew Hodgson | 2016-04-02 | 1 | -2/+3 |
* | | how was _respond_default_thumbnail ever meant to work? | Matthew Hodgson | 2016-04-02 | 1 | -0/+2 |
* | | pass back SVGs as their own thumbnails | Matthew Hodgson | 2016-04-02 | 1 | -0/+20 |
* | | handle missing dimensions without crashing | Matthew Hodgson | 2016-04-02 | 1 | -4/+13 |
* | | make meta comparisons case insensitive | Matthew Hodgson | 2016-04-02 | 1 | -2/+2 |
* | | refactor calc_og; spider image URLs; fix xpath; add a (broken) expiringcache;... | Matthew Hodgson | 2016-04-02 | 1 | -81/+121 |
* | | fix assorted redirect, unicode and screenscraping bugs | Matthew Hodgson | 2016-04-01 | 1 | -78/+96 |
* | | handle spidered relative images correctly | Matthew Hodgson | 2016-03-31 | 1 | -2/+12 |
* | | prevent choking on invalid utf-8, and handle image thumbnailing smarter | Matthew Hodgson | 2016-03-31 | 1 | -5/+18 |
* | | synthesise basig OG metadata from pages lacking it | Matthew Hodgson | 2016-03-31 | 1 | -0/+47 |
* | | handle requests with missing content-length headers (e.g. YouTube) | Matthew Hodgson | 2016-03-31 | 1 | -2/+2 |
* | | fix bugs | Matthew Hodgson | 2016-03-29 | 1 | -5/+6 |
* | | debug | Matthew Hodgson | 2016-03-29 | 1 | -3/+2 |
* | | make it work | Matthew Hodgson | 2016-03-29 | 2 | -55/+77 |
* | | make it build | Matthew Hodgson | 2016-03-29 | 1 | -8/+9 |
* | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-03-29 | 2 | -0/+45 |
|\| |
|
| * | Deduplicate identical /sync requests | Mark Haines | 2016-03-24 | 1 | -0/+3 |
| * | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -0/+42 |
* | | Merge branch 'develop' into matthew/preview_urls | Matthew Hodgson | 2016-03-27 | 28 | -661/+466 |
|\| |
|
| * | Merge pull request #652 from matrix-org/erikj/delete_alias | Erik Johnston | 2016-03-18 | 1 | -1/+2 |
| |\ |
|
| | * | Update aliases event after deletion | Erik Johnston | 2016-03-17 | 1 | -1/+2 |
| * | | remove debug logging | David Baker | 2016-03-16 | 1 | -3/+0 |
| * | | Unused import | David Baker | 2016-03-16 | 1 | -1/+0 |
| * | | Make registration idempotent, part 2: be idempotent if the client specifies a... | David Baker | 2016-03-16 | 1 | -5/+17 |
| |/ |
|
| * | take extra return val from check_auth in account too | David Baker | 2016-03-16 | 1 | -1/+1 |
| * | pep8 & remove debug logging | David Baker | 2016-03-16 | 1 | -4/+5 |
| * | Make registration idempotent: if you specify the same session, make it give y... | David Baker | 2016-03-16 | 1 | -1/+26 |
| * | Hook up adding a pusher to the notifier for replication. | Mark Haines | 2016-03-15 | 1 | -0/+6 |
| * | Fix regression where synapse checked whether push rules were valid JSON befor... | Mark Haines | 2016-03-14 | 1 | -2/+2 |
| * | Merge pull request #642 from matrix-org/erikj/logout | Erik Johnston | 2016-03-11 | 2 | -0/+74 |
| |\ |
|
| | * | Implement logout | Erik Johnston | 2016-03-11 | 2 | -0/+74 |
| * | | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 8 | -81/+31 |
| |/ |
|
| * | Fix cache invalidation so deleting access tokens (which we did when changing ... | David Baker | 2016-03-11 | 1 | -1/+1 |
| * | Register endpoint returns refresh_token | blide | 2016-03-10 | 1 | -5/+8 |
| * | Add a parse_json_object function | Mark Haines | 2016-03-09 | 10 | -116/+32 |
| * | Fix relative imports so they work in both py3 and py27 | Mark Haines | 2016-03-08 | 6 | -6/+6 |
| * | Use syntax that works on both py2.7 and py3 | Mark Haines | 2016-03-07 | 1 | -1/+1 |
| * | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 3 | -10/+11 |
| |\ |
|
| | * | Merge pull request #614 from matrix-org/erikj/alias_delete | Erik Johnston | 2016-03-04 | 1 | -3/+0 |
| | |\ |
|
| | | * | Allow alias creators to delete aliases | Erik Johnston | 2016-03-01 | 1 | -3/+0 |
| | * | | Pass whole requester to ratelimiting | Daniel Wagner-Hall | 2016-03-03 | 3 | -7/+11 |
| | |/ |
|
| * | | Hook up the push rules stream to account_data in /sync | Mark Haines | 2016-03-04 | 1 | -1/+1 |
| * | | Move the code for formatting push rules into a separate function | Mark Haines | 2016-03-03 | 1 | -86/+4 |
| * | | Hook up the push rules to the notifier | Mark Haines | 2016-03-03 | 1 | -15/+29 |
| |/ |
|
| * | Add support for changing the actions for default rules | Mark Haines | 2016-02-26 | 1 | -4/+27 |
| * | Fix to appease the PEP8 dragon | Gergely Polonkai | 2016-02-26 | 1 | -1/+3 |
| * | Add error codes for malformed/bad JSON in /login | Gergely Polonkai | 2016-02-26 | 1 | -2/+2 |
| * | Make sure we return a JSON object when returning the values of specif… | Mark Haines | 2016-02-25 | 1 | -1/+3 |
| * | Remove unused get_rule_attr method | Mark Haines | 2016-02-24 | 1 | -8/+0 |
| * | Ignore invalid POST bodies when joining rooms | Daniel Wagner-Hall | 2016-02-24 | 1 | -2/+12 |
| * | Allow third_party_signed to be specified on /join | Daniel Wagner-Hall | 2016-02-23 | 1 | -0/+4 |
| * | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 4 | -28/+35 |
| |\ |
|
| | * | "You are not..." | Erik Johnston | 2016-02-18 | 1 | -1/+1 |
| | * | Initial cut | Erik Johnston | 2016-02-17 | 4 | -28/+35 |
| * | | Remove dead code for setting device specific rules. | Mark Haines | 2016-02-18 | 2 | -88/+8 |
| * | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-17 | 2 | -2/+2 |
| |\| |
|
| | * | client/v1/room: include event_id in response to state event PUT, in accordanc... | Patrik Oldsberg | 2016-02-17 | 1 | -2/+2 |
| | * | Fix typo in request validation for adding push rules. | Mark Haines | 2016-02-16 | 1 | -1/+1 |
| | * | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -15/+3 |
| * | | Some cleanup | Daniel Wagner-Hall | 2016-02-17 | 1 | -3/+3 |
| * | | Branch off member and non member sends | Daniel Wagner-Hall | 2016-02-15 | 1 | -5/+16 |
| * | | Simplify room creation code | Daniel Wagner-Hall | 2016-02-15 | 1 | -15/+3 |
| * | | Reuse update_membership from /join | Daniel Wagner-Hall | 2016-02-15 | 1 | -16/+5 |
| * | | Merge implementation of /join by alias or ID | Daniel Wagner-Hall | 2016-02-15 | 1 | -37/+31 |
| * | | Merge some room joining codepaths | Daniel Wagner-Hall | 2016-02-15 | 1 | -1/+1 |
| |/ |
|