| Commit message (Expand) | Author | Age | Files | Lines |
* | check isort by travis | Krombel | 2018-07-16 | 2 | -3/+3 |
* | 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 | 7 | -74/+42 |
|\ |
|
| * | 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 | 5 | -14/+14 |
| * | Use parse_{int,str} and assert from http.servlet | Krombel | 2018-07-13 | 7 | -75/+43 |
* | | Make auth & transactions more testable (#3499) | Amber Brown | 2018-07-14 | 3 | -6/+5 |
|/ |
|
* | run isort | Amber Brown | 2018-07-09 | 14 | -86/+88 |
* | Attempt to be more performant on PyPy (#3462) | Amber Brown | 2018-06-28 | 2 | -2/+3 |
* | 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 | 1 | -1/+3 |
* | Revert "Merge pull request #3431 from matrix-org/rav/erasure_visibility" | Richard van der Hoff | 2018-06-22 | 1 | -3/+1 |
* | Merge pull request #3431 from matrix-org/rav/erasure_visibility | Erik Johnston | 2018-06-22 | 1 | -1/+3 |
|\ |
|
| * | mark accounts as erased when requested | Richard van der Hoff | 2018-06-12 | 1 | -1/+3 |
* | | Remove run_on_reactor (#3395) | Amber Brown | 2018-06-14 | 1 | -7/+0 |
|/ |
|
* | 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 |
* | Replace some more comparisons with six | Adrian Tschira | 2018-05-19 | 1 | -3/+5 |
* | 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 |
|/ |
|
* | Set Server header in SynapseRequest | Richard van der Hoff | 2018-05-10 | 1 | -1/+0 |
* | Burminate v1auth | Adrian Tschira | 2018-04-30 | 2 | -2/+6 |
* | add guard for None on purge_history api | Krombel | 2018-04-30 | 1 | -1/+14 |
* | Merge pull request #3156 from NotAFile/py3-hmac-bytes | Richard van der Hoff | 2018-04-30 | 1 | -7/+9 |
|\ |
|
| * | Construct HMAC as bytes on py3 | Adrian Tschira | 2018-04-29 | 1 | -7/+9 |
* | | Use six.moves.urlparse | Adrian Tschira | 2018-04-15 | 2 | -5/+6 |
|/ |
|
* | 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 #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 #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 |
* | | | Merge branch 'master' of github.com:matrix-org/synapse into develop | Erik Johnston | 2018-03-19 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | Replace ujson with simplejson | Erik Johnston | 2018-03-15 | 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 | 2 | -12/+14 |
* | | 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 #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 branch 'develop' into travis/admin-list-media | Travis Ralston | 2018-02-01 | 2 | -17/+34 |
|\ \ \ |
|
| * | | | add ?ts massaging for ASes (#2754) | Matthew Hodgson | 2018-01-23 | 1 | -6/+11 |
| * | | | rewrite based on PR feedback: | Matthew Hodgson | 2018-01-19 | 1 | -13/+7 |
| * | | | fix up v1, and improve errors | Matthew Hodgson | 2018-01-19 | 1 | -11/+29 |
| |/ / |
|
* / / | Add an admin route to get all the media in a room | Travis Ralston | 2018-01-20 | 1 | -0/+22 |
|/ / |
|
* | | Add /room/{id}/event/{id} to synapse | Richard van der Hoff | 2018-01-09 | 1 | -3/+26 |
* | | Better logging when login can't find a 3pid | Richard van der Hoff | 2017-12-20 | 1 | -4/+10 |
|/ |
|
* | 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 | 1 | -2/+2 |
* | Move deactivate_account into its own handler | Richard van der Hoff | 2017-11-29 | 1 | -2/+2 |
* | Downcase userids for shared-secret registration | Richard van der Hoff | 2017-11-10 | 1 | -1/+1 |
* | 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 | 1 | -3/+10 |
|\ |
|
| * | Merge pull request #2615 from matrix-org/rav/break_auth_device_dep | David Baker | 2017-11-01 | 1 | -3/+0 |
| |\ |
|
| | * | Break dependency of auth_handler on device_handler | Richard van der Hoff | 2017-11-01 | 1 | -3/+0 |
| * | | Apparently this is python | David Baker | 2017-11-01 | 1 | -1/+1 |
| * | | Log login requests | David Baker | 2017-11-01 | 1 | -0/+10 |
| |/ |
|
* / | Move access token deletion into auth handler | Richard van der Hoff | 2017-11-01 | 2 | -11/+6 |
|/ |
|
* | Refactor some logic from LoginRestServlet into AuthHandler | Richard van der Hoff | 2017-10-31 | 1 | -29/+26 |
* | replace 'except:' with 'except Exception:' | Richard van der Hoff | 2017-10-23 | 4 | -7/+7 |
* | Remove pointless create() method | Richard van der Hoff | 2017-10-20 | 1 | -3/+3 |
* | Merge branch 'develop' into erikj/groups_merged | David Baker | 2017-10-02 | 1 | -10/+6 |
|\ |
|
| * | 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 |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged | Erik Johnston | 2017-09-19 | 1 | -8/+8 |
|\| |
|
| * | fix english | hera | 2017-08-04 | 1 | -7/+7 |
| * | typo | hera | 2017-08-04 | 1 | -1/+1 |
* | | Split out profile handler to fix tests | Erik Johnston | 2017-08-25 | 1 | -9/+9 |
|/ |
|
* | Fix bug where pusherpool didn't start and broke some rooms | Erik Johnston | 2017-07-06 | 1 | -8/+6 |
* | Add API to quarantine media | Erik Johnston | 2017-06-19 | 1 | -0/+25 |
* | 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 |
* | Add more granular event send metrics | Erik Johnston | 2017-05-02 | 1 | -0/+1 |
* | 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 |
|/ |
|
* | 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 |
* | | Don't recreate so many sets | Erik Johnston | 2017-03-16 | 1 | -2/+1 |
* | | Format presence events on the edges instead of reformatting them multiple times | Erik Johnston | 2017-03-15 | 1 | -0/+3 |
* | | 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 |
* | | Support registration / login with phone number | David Baker | 2017-03-13 | 1 | -6/+82 |
|/ |
|
* | Revert "Support registration & login with phone number" | Erik Johnston | 2017-03-13 | 1 | -82/+6 |
* | Not any more, it doesn't | David Baker | 2017-03-08 | 1 | -1/+0 |
* | Minor fixes from PR feedback | David Baker | 2017-03-08 | 1 | -1/+1 |
* | Factor out msisdn canonicalisation | David Baker | 2017-03-08 | 1 | -13/+5 |
* | Fix pep8 | David Baker | 2017-03-08 | 1 | -3/+3 |
* | Support new login format | David Baker | 2017-03-07 | 1 | -6/+91 |
* | Remove unused param | Erik Johnston | 2017-02-20 | 1 | -1/+0 |
* | Make kick & ban reasons work | David Baker | 2017-02-14 | 1 | -0/+5 |
* | admin,storage: added more administrator functionalities | Morteza Araby | 2017-02-02 | 2 | -2/+224 |
* | Fix email push in pusher worker | Erik Johnston | 2017-02-02 | 1 | -1/+4 |
* | Added username and password for turn server | Marvin Steadfast | 2017-01-19 | 1 | -9/+17 |
* | Lowercase all email addresses before querying db | David Baker | 2017-01-18 | 1 | -1/+7 |
* | Linearize updates to membership via PUT /state/ | Erik Johnston | 2017-01-09 | 1 | -11/+17 |
* | Merge pull request #1676 from matrix-org/erikj/room_list | Erik Johnston | 2016-12-12 | 2 | -1/+52 |
|\ |
|
| * | Add new API appservice specific public room list | Erik Johnston | 2016-12-06 | 2 | -1/+52 |
* | | Add /room/<room_id>/joined_members API | Erik Johnston | 2016-12-08 | 1 | -0/+19 |
* | | Add joined_rooms servlet | Erik Johnston | 2016-12-08 | 1 | -0/+17 |
|/ |
|
* | Merge branch 'develop' into rav/no_more_refresh_tokens | Richard van der Hoff | 2016-11-30 | 1 | -12/+0 |
|\ |
|
| * | Stop putting a time caveat on access tokens | Richard van der Hoff | 2016-11-29 | 1 | -12/+0 |
* | | Stop generating refresh tokens | Richard van der Hoff | 2016-11-28 | 1 | -18/+10 |
|/ |
|
* | Clean transactions based on time. Add HttpTransactionCache tests. | Kegan Dougal | 2016-11-14 | 1 | -1/+1 |
* | Move .observe() up to the cache to make things neater | Kegan Dougal | 2016-11-14 | 1 | -24/+6 |
* | Review comments | Kegan Dougal | 2016-11-11 | 3 | -146/+29 |
* | More flake8 | Kegan Dougal | 2016-11-11 | 1 | -1/+3 |
* | Flake8 and fix whoopsie | Kegan Dougal | 2016-11-11 | 1 | -4/+8 |
* | Use ObservableDeferreds instead of Deferreds as they behave as intended | Kegan Dougal | 2016-11-11 | 2 | -30/+31 |
* | Flake8 | Kegan Dougal | 2016-11-10 | 1 | -3/+3 |
* | Store Promise<Response> instead of Response for HTTP API transactions | Kegan Dougal | 2016-11-10 | 3 | -82/+56 |
* | rest/client/v1/register: use the correct requester in createUser | Patrik Oldsberg | 2016-10-06 | 1 | -3/+6 |
* | storage/appservice: make appservice methods only relying on the cache synchro... | Patrik Oldsberg | 2016-10-06 | 1 | -1/+1 |
* | Time out typing over federation | Erik Johnston | 2016-09-23 | 1 | -1/+4 |
* | Support /initialSync in synchrotron worker | Erik Johnston | 2016-09-21 | 2 | -5/+4 |
* | Enable guest access to POST /publicRooms | Erik Johnston | 2016-09-17 | 1 | -2/+2 |
* | Make POST /publicRooms require auth | Erik Johnston | 2016-09-16 | 1 | -2/+1 |
* | Change the way we calculate new_limit in /publicRooms and add POST API | Erik Johnston | 2016-09-15 | 1 | -0/+29 |
* | Remove default public rooms limit | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
* | By default limit /publicRooms to 100 entries | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
* | Pass since/from parameters over federation | Erik Johnston | 2016-09-15 | 1 | -3/+3 |
* | Allow paginating both forwards and backwards | Erik Johnston | 2016-09-15 | 1 | -3/+15 |
* | Remove support for aggregate room lists | Erik Johnston | 2016-09-15 | 1 | -1/+1 |
* | Conform better to the CAS protocol specification | Shell Turner | 2016-09-09 | 1 | -5/+2 |
* | Merge pull request #1096 from matrix-org/markjh/get_access_token | Mark Haines | 2016-09-09 | 3 | -16/+10 |
|\ |
|
| * | Add helper function for getting access_tokens from requests | Mark Haines | 2016-09-09 | 3 | -16/+10 |
* | | Filter returned events for client-facing format | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -2/+3 |
* | | Allow clients to specify the format a room state event is returned in | Paul "LeoNerd" Evans | 2016-09-09 | 1 | -1/+7 |
|/ |
|
* | Use parse_string | Erik Johnston | 2016-09-08 | 1 | -2/+2 |
* | Add server param to /publicRooms | Erik Johnston | 2016-09-08 | 1 | -5/+16 |
* | Pass through user-supplied content in /join/$room_id | Kegan Dougal | 2016-08-23 | 1 | -0/+1 |
* | 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 |
* | 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 |
|/ |
|
* | Implement deleting devices | Richard van der Hoff | 2016-07-26 | 1 | -3/+10 |
* | Merge pull request #933 from matrix-org/rav/type_annotations | Richard van der Hoff | 2016-07-20 | 2 | -0/+8 |
|\ |
|
| * | Type annotations | Richard van der Hoff | 2016-07-19 | 2 | -0/+8 |
* | | Merge pull request #932 from matrix-org/rav/register_refactor | David Baker | 2016-07-20 | 1 | -1/+3 |
|\ \ |
|
| * | | Further registration refactoring | Richard van der Hoff | 2016-07-19 | 1 | -1/+3 |
| |/ |
|
* | | 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 |
* | | Add device_id support to /login | Richard van der Hoff | 2016-07-18 | 1 | -3/+36 |
* | | Refactor login flow | Richard van der Hoff | 2016-07-18 | 1 | -18/+23 |
* | | Bug fix: expire invalid access tokens | Negar Fazeli | 2016-07-13 | 1 | -1/+1 |
|/ |
|
* | 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 |
* | Implement purge_media_cache admin API | Erik Johnston | 2016-06-29 | 1 | -0/+32 |
* | 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 | 1 | -5/+6 |
|\ |
|
| * | Split out the auth handler | David Baker | 2016-06-02 | 1 | -5/+6 |
* | | 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 |
* | 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 the presence handler out of the Handlers object | Mark Haines | 2016-05-16 | 2 | -7/+15 |
* | Create user with expiry | Negi Fazeli | 2016-05-13 | 1 | -0/+71 |
* | 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 |
* | | 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 |
|/ |
|
* | 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 |
* | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -0/+42 |
* | Update aliases event after deletion | Erik Johnston | 2016-03-17 | 1 | -1/+2 |
* | 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 | 1 | -0/+72 |
|\ |
|
| * | Implement logout | Erik Johnston | 2016-03-11 | 1 | -0/+72 |
* | | Use parse_json_object_from_request to parse JSON out of request bodies | Mark Haines | 2016-03-11 | 3 | -22/+13 |
|/ |
|
* | Add a parse_json_object function | Mark Haines | 2016-03-09 | 6 | -83/+21 |
* | 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 | 2 | -22/+22 |
|\ |
|
| * | "You are not..." | Erik Johnston | 2016-02-18 | 1 | -1/+1 |
| * | Initial cut | Erik Johnston | 2016-02-17 | 2 | -22/+22 |
* | | 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 |
|/ |
|
* | Revert "Merge two of the room join codepaths" | Daniel Wagner-Hall | 2016-02-12 | 1 | -13/+55 |
* | Merge two of the room join codepaths | Daniel Wagner-Hall | 2016-02-12 | 1 | -55/+13 |
* | Catch the exceptions thrown by twisted when you write to a closed connection | Mark Haines | 2016-02-12 | 1 | -4/+6 |
* | Revert "Reject additional path segments" | Daniel Wagner-Hall | 2016-02-09 | 3 | -6/+6 |
* | Reject additional path segments | Daniel Wagner-Hall | 2016-02-08 | 3 | -6/+6 |
* | Merge pull request #557 from matrix-org/dbkr/profile_dont_return_null | David Baker | 2016-02-04 | 1 | -6/+17 |
|\ |
|
| * | No braces here | David Baker | 2016-02-03 | 1 | -1/+1 |
| * | Don't return null if profile display name / avatar url isn't set: omit them i... | David Baker | 2016-02-03 | 1 | -6/+17 |
* | | Remove old log line | Erik Johnston | 2016-02-03 | 1 | -2/+0 |
|/ |
|
* | Rename config field to reflect yaml name | Daniel Wagner-Hall | 2016-02-03 | 1 | -2/+2 |
* | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 3 | -4/+5 |
* | Fix adding push rules relative to other rules | Mark Haines | 2016-01-27 | 1 | -5/+10 |
* | Add missing yield in push_rules set enabled | Mark Haines | 2016-01-25 | 1 | -2/+2 |
* | Allow non-guests to peek on rooms using /events | Daniel Wagner-Hall | 2016-01-20 | 2 | -4/+3 |
* | Take a deepcopy of push rules before mutating them | Erik Johnston | 2016-01-19 | 1 | -1/+3 |
* | Use static for const dicts | Erik Johnston | 2016-01-18 | 1 | -1/+7 |
* | Remove internal ids | Erik Johnston | 2016-01-18 | 1 | -0/+4 |
* | Require unbanning before other membership changes | Daniel Wagner-Hall | 2016-01-15 | 1 | -39/+12 |