Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow rejecting invites | Daniel Wagner-Hall | 2015-10-20 | 1 | -2/+2 |
| | | | | | This is done by using the same /leave flow as you would use if you had already accepted the invite and wanted to leave. | ||||
* | Move NullSource out of synapse and into tests since it is only used by the tests | Mark Haines | 2015-09-22 | 1 | -1/+17 |
| | |||||
* | Merge pull request #276 from ↵ | Mark Haines | 2015-09-21 | 1 | -7/+7 |
|\ | | | | | | | | | matrix-org/markjh/history_for_rooms_that_have_been_left SPEC-216: Allow users to view the history of rooms that they have left. | ||||
| * | Allow users to GET individual state events for rooms that they have left | Mark Haines | 2015-09-10 | 1 | -5/+5 |
| | | |||||
| * | Allow users that have left the room to view the member list from the point ↵ | Mark Haines | 2015-09-09 | 1 | -2/+2 |
| | | | | | | | | they left | ||||
* | | s/user_id/user/g for consistency | Daniel Wagner-Hall | 2015-09-01 | 4 | -11/+11 |
| | | |||||
* | | Attempt to validate macaroons | Daniel Wagner-Hall | 2015-08-26 | 5 | -25/+22 |
|/ | | | | | | | | | | | | | A couple of weird caveats: * If we can't validate your macaroon, we fall back to checking that your access token is in the DB, and ignoring the failure * Even if we can validate your macaroon, we still have to hit the DB to get the access token ID, which we pretend is a device ID all over the codebase. This mostly adds the interesting code, and points out the two pieces we need to delete (and necessary conditions) in order to fix the above caveats. | ||||
* | Stop looking up "admin", which we never read | Daniel Wagner-Hall | 2015-08-25 | 4 | -11/+0 |
| | |||||
* | Remove completely unused concepts from codebase | Daniel Wagner-Hall | 2015-08-25 | 4 | -11/+0 |
| | | | | | | | | | | Removes device_id and ClientInfo device_id is never actually written, and the matrix.org DB has no non-null entries for it. Right now, it's just cluttering up code. This doesn't remove the columns from the database, because that's fiddly. | ||||
* | Merge branch 'develop' into refresh | Daniel Wagner-Hall | 2015-08-20 | 1 | -1/+2 |
|\ | | | | | | | | | Conflicts: synapse/rest/client/v1/login.py | ||||
| * | Fix tests | David Baker | 2015-08-04 | 1 | -1/+2 |
| | | |||||
* | | s/by_token/by_access_token/g | Daniel Wagner-Hall | 2015-08-20 | 5 | -23/+23 |
|/ | | | | We're about to have two kinds of token, access and refresh | ||||
* | Use the same reg paths as register v1 for ASes. | Kegan Dougal | 2015-07-29 | 1 | -1/+3 |
| | | | | Namely this means using registration_handler.appservice_register. | ||||
* | Fix v2_alpha registration. Add unit tests. | Kegan Dougal | 2015-07-28 | 1 | -0/+132 |
| | | | | | | | | V2 Registration forced everyone (including ASes) to create a password for a user, when ASes should be able to omit passwords. Also unbreak AS registration in general which checked too early if the given username was claimed by an AS; it was checked before knowing if the AS was the one doing the registration! Add unit tests for AS reg, user reg and disabled_registration flag. | ||||
* | Fix test. | Erik Johnston | 2015-07-07 | 1 | -1/+11 |
| | |||||
* | Add receipts_key to StreamToken | Erik Johnston | 2015-07-02 | 1 | -2/+2 |
| | |||||
* | Fix the presence tests | Mark Haines | 2015-05-22 | 1 | -2/+2 |
| | |||||
* | Merge pull request #157 from matrix-org/markjh/presence_performance | Mark Haines | 2015-05-22 | 1 | -0/+3 |
|\ | | | | | Improve presence performance in loadtest | ||||
| * | Fix the presence tests | Mark Haines | 2015-05-20 | 1 | -0/+3 |
| | | |||||
* | | Oops, get_rooms_for_user returns a namedtuple, not a room_id | Mark Haines | 2015-05-21 | 1 | -1/+6 |
|/ | |||||
* | Discard unused NotifierUserStreams | Mark Haines | 2015-05-13 | 1 | -0/+1 |
| | |||||
* | Don't bother checking for updates if the stream token hasn't advanced for a user | Mark Haines | 2015-05-13 | 1 | -5/+10 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-28 | 4 | -13/+13 |
|\ | |||||
| * | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 1 | -2/+5 |
| |\ | |||||
| * | | Fix tests | David Baker | 2015-03-24 | 4 | -13/+13 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-17 | 1 | -2/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | Various minor fixes to unit-test structure around typing notifications | Paul "LeoNerd" Evans | 2015-04-15 | 1 | -2/+4 |
| | | | |||||
| * | | Have TypingNotificationEventSource.get_new_events_for_user() return a ↵ | Paul "LeoNerd" Evans | 2015-04-15 | 1 | -1/+2 |
| |/ | | | | | | | deferred, for consistency and extensibility | ||||
* / | Make work in both Maria and SQLite. Fix tests | Erik Johnston | 2015-04-01 | 1 | -9/+0 |
|/ | |||||
* | Fix tests | Erik Johnston | 2015-03-09 | 1 | -4/+4 |
| | |||||
* | Fix unit tests | Kegan Dougal | 2015-02-27 | 1 | -0/+3 |
| | |||||
* | Update tests | Erik Johnston | 2015-02-19 | 1 | -0/+1 |
| | |||||
* | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 6 | -141/+34 |
|\ | |||||
| * | Factor out some of the common homeserver setup code into a | Mark Haines | 2015-02-11 | 6 | -141/+34 |
| | | | | | | | | setup_test_homeserver function in utils. | ||||
* | | Modify auth.get_user_by_req for authing appservices directly. | Kegan Dougal | 2015-02-09 | 2 | -1/+6 |
|/ | | | | | | Add logic to map the appservice token to the autogenned appservice user ID. Add unit tests for all forms of get_user_by_req (user/appservice, valid/bad/missing tokens) | ||||
* | Merge in auth changes from develop | Mark Haines | 2015-01-29 | 1 | -0/+1 |
| | |||||
* | Merge changes from develop | Mark Haines | 2015-01-29 | 4 | -2/+12 |
|\ | |||||
| * | Merge pull request #36 from matrix-org/device_id_from_access_token | Mark Haines | 2015-01-28 | 4 | -2/+12 |
| |\ | | | | | | | Extract the device id and token id from the access token when autheniticating users | ||||
| | * | Extract the id token of the token when authing users, include the token and ↵ | Mark Haines | 2015-01-28 | 3 | -0/+10 |
| | | | | | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events | ||||
| | * | Return the device_id from get_auth_by_req | Mark Haines | 2015-01-28 | 2 | -2/+2 |
| | | | |||||
* | | | More unit-testing of REST errors | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -1/+35 |
| | | | |||||
* | | | Move storage of user filters into real datastore layer; now have to mock it ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 2 | -3/+27 |
| | | | | | | | | | | | | out in the REST-level tests | ||||
* | | | Use new V2AlphaRestTestCase | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -38/+2 |
| | | | |||||
* | | | Merge branch 'develop' into client_v2_filter | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+45 |
|\| | | |||||
| * | | Initial cut of a shared base class for REST unit tests | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+45 |
| |/ | |||||
* | | Minor changes to v2_alpha filter REST test to allow the setUp method to be ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -5/+7 |
| | | | | | | | | shareable | ||||
* | | Initial trivial REST test of v2_alpha filter API | Paul "LeoNerd" Evans | 2015-01-26 | 1 | -0/+74 |
|/ | |||||
* | Create (empty) v2_alpha REST tests directory | Paul "LeoNerd" Evans | 2015-01-26 | 1 | -0/+15 |
| | |||||
* | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 4 | -24/+24 |
| | |||||
* | Merge rest servlets into the client json resource object | Mark Haines | 2015-01-23 | 2 | -4/+9 |
| | |||||
* | Move client rest tests back under rest | Mark Haines | 2015-01-22 | 9 | -0/+2156 |
| | |||||
* | Move client v1 api rest servlets into a "client/v1" directory | Mark Haines | 2015-01-22 | 7 | -2128/+0 |
| | |||||
* | Check that setting typing notification still works after explicit timeout at ↵ | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -1/+50 |
| | | | | REST layer - SYN-230 | ||||
* | Update tests | Kegan Dougal | 2015-01-07 | 1 | -1/+1 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-15 | 2 | -4/+115 |
|\ | | | | | | | | | Conflicts: tests/handlers/test_room.py | ||||
| * | Send list of typing user IDs as 'user_ids' list within 'content', so that ↵ | Paul "LeoNerd" Evans | 2014-12-12 | 1 | -1/+3 |
| | | | | | | | | m.typing stream events have a toplevel content, for consistency with others | ||||
| * | Move typing-notification REST tests into their own .py file | Paul "LeoNerd" Evans | 2014-12-11 | 2 | -83/+113 |
| | | |||||
| * | Actually unit-test the event stream around REST typing tests | Paul "LeoNerd" Evans | 2014-12-11 | 1 | -0/+14 |
| | | |||||
| * | Initial hack at unit tests of room typing REST API | Paul "LeoNerd" Evans | 2014-12-11 | 1 | -3/+68 |
| | | |||||
* | | Fix test. | Erik Johnston | 2014-12-12 | 1 | -1/+1 |
| | | |||||
* | | Fix stream test. Make sure we add join to auth_events for invitiations | Erik Johnston | 2014-12-12 | 1 | -4/+0 |
|/ | |||||
* | Fix tests from prev commit | Erik Johnston | 2014-11-19 | 1 | -1/+0 |
| | |||||
* | Include room members' presence in room initialSync | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -0/+14 |
| | |||||
* | Include 'messages' snapshot in room initialSync | Paul "LeoNerd" Evans | 2014-11-18 | 1 | -0/+4 |
| | |||||
* | Merge branch 'develop' into room-initial-sync | Paul "LeoNerd" Evans | 2014-11-17 | 3 | -150/+182 |
|\ | | | | | | | | | Conflicts: synapse/handlers/message.py | ||||
| * | Only allow people in a room to look up room state. | Erik Johnston | 2014-11-11 | 1 | -8/+8 |
| | | |||||
| * | Fix rest.test_rooms | Erik Johnston | 2014-11-11 | 1 | -90/+113 |
| | | |||||
| * | Fix rest.test_events. Convert to use SQLiteMemoryDbPool | Erik Johnston | 2014-11-10 | 1 | -10/+5 |
| | | |||||
| * | Don't execute empty tests. Formatting. | Erik Johnston | 2014-11-05 | 1 | -17/+28 |
| | | |||||
| * | Sign outgoing PDUs. | Mark Haines | 2014-10-16 | 3 | -11/+36 |
| | | |||||
* | | Include room membership in room initialSync | Paul "LeoNerd" Evans | 2014-11-10 | 1 | -0/+1 |
| | | |||||
* | | Put room state in room initialSync output - I guess this is right; I really ↵ | Paul "LeoNerd" Evans | 2014-11-10 | 1 | -0/+35 |
| | | | | | | | | can't find any other tests similar... | ||||
* | | Have room initialSync return the room's room_id | Paul "LeoNerd" Evans | 2014-11-10 | 1 | -0/+2 |
| | | |||||
* | | Initial (empty) test that room initialSync at least returns 200 OK | Paul "LeoNerd" Evans | 2014-11-10 | 1 | -0/+53 |
|/ | |||||
* | Merge branch 'develop' into server2server_signing | Mark Haines | 2014-09-30 | 3 | -10/+49 |
|\ | | | | | | | | | | | Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py | ||||
| * | Unbreak tests after changing storage API | Erik Johnston | 2014-09-29 | 2 | -8/+45 |
| | | |||||
| * | Track the IP users connect with. Add an admin column to users table. | Erik Johnston | 2014-09-26 | 2 | -3/+7 |
| | | |||||
* | | Sign federation transactions | Mark Haines | 2014-09-24 | 1 | -3/+12 |
|/ | |||||
* | Be consistent when associating keys with login types for registration/login. | Kegan Dougal | 2014-09-15 | 1 | -1/+1 |
| | |||||
* | Fix unit tests. | Kegan Dougal | 2014-09-15 | 1 | -2/+8 |
| | |||||
* | Have all unit tests import from our own subclass of trial's unittest ↵ | Paul "LeoNerd" Evans | 2014-09-12 | 4 | -10/+5 |
| | | | | TestCase; set up logging in ONE PLACE ONLY | ||||
* | Unit tests do not need captchas. | Kegan Dougal | 2014-09-05 | 1 | -0/+1 |
| | |||||
* | fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵ | Matthew Hodgson | 2014-09-03 | 6 | -6/+6 |
| | | | | hasn't been incorporated in time for launch. | ||||
* | Kill the state | Paul "LeoNerd" Evans | 2014-09-03 | 1 | -8/+12 |
| | | | | ... key from all the Presence messages | ||||
* | Implement presence state visibilty limiting when polling eventsource for stream | Paul "LeoNerd" Evans | 2014-09-03 | 1 | -5/+23 |
| | |||||
* | Fix tests to support ratelimiting | Mark Haines | 2014-09-03 | 2 | -2/+51 |
| | |||||
* | Perform room unit tests with 'local' users actually in the right domain ;) | Paul "LeoNerd" Evans | 2014-09-01 | 1 | -6/+6 |
| | |||||
* | Rename API-visible 'mtime' presence field to 'last_active'; slightly ↵ | Paul "LeoNerd" Evans | 2014-09-01 | 1 | -1/+1 |
| | | | | different semantics | ||||
* | Rename 'state' presence key to the much more obvious 'presence'; maintain a ↵ | Paul "LeoNerd" Evans | 2014-09-01 | 1 | -7/+11 |
| | | | | legacy 'state' copy for now | ||||
* | change the world: make the default matrix API URL prefix /_matrix rather ↵ | Matthew Hodgson | 2014-08-31 | 4 | -4/+4 |
| | | | | | | than /matrix to make it easier for existing websites to mount a HS in their namespace without collisions. perl -pi -e 's#/matrix#/_matrix#g' ./cmdclient/console.py ./docs/client-server/howto.rst ./docs/client-server/specification.rst ./docs/client-server/swagger_matrix/directory ./docs/client-server/swagger_matrix/events ./docs/client-server/swagger_matrix/login ./docs/client-server/swagger_matrix/presence ./docs/client-server/swagger_matrix/profile ./docs/client-server/swagger_matrix/registration ./docs/client-server/swagger_matrix/rooms ./docs/server-server/specification.rst ./graph/graph.py ./jsfiddles/create_room_send_msg/demo.js ./jsfiddles/event_stream/demo.js ./jsfiddles/example_app/demo.js ./jsfiddles/register_login/demo.js ./jsfiddles/room_memberships/demo.js ./synapse/api/urls.py ./tests/federation/test_federation.py ./tests/handlers/test_presence.py ./tests/handlers/test_typing.py ./tests/rest/test_events.py ./tests/rest/test_presence.py ./tests/rest/test_profile.py ./tests/rest/test_rooms.py ./webclient/components/fileUpload/file-upload-service.js ./webclient/components/matrix/matrix-service.js | ||||
* | Bugfix for rest presence test - datastore needs to implement profile methods | Paul "LeoNerd" Evans | 2014-08-29 | 1 | -0/+10 |
| | |||||
* | Define a new event stream data source for typing notifications (currently null) | Paul "LeoNerd" Evans | 2014-08-29 | 1 | -3/+5 |
| | |||||
* | Move the *EventSource classes into the handlers they relate to, so it's ↵ | Paul "LeoNerd" Evans | 2014-08-29 | 1 | -2/+2 |
| | | | | easier to find the code | ||||
* | Re-enable presence, un-skip presence tests | Paul "LeoNerd" Evans | 2014-08-28 | 1 | -2/+0 |
| | |||||
* | Fix up the various presence-related tests so that if they're not skipped, ↵ | Paul "LeoNerd" Evans | 2014-08-27 | 1 | -8/+16 |
| | | | | they still PASS | ||||
* | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 4 | -99/+42 |
|\ | |||||
| * | Final url modifications: renamed /presence_list to /presence/list to keep ↵ | Kegan Dougal | 2014-08-27 | 1 | -3/+3 |
| | | | | | | | | the top-level namespace clean. Updated tests. | ||||
| * | Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and ↵ | Kegan Dougal | 2014-08-27 | 3 | -96/+39 |
| | | | | | | | | removed tests which tested that. Updated cmdclient and webclient. | ||||
* | | Merge branch 'develop' into storage_transactions | Mark Haines | 2014-08-27 | 3 | -28/+17 |
|\| | |||||
| * | Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated ↵ | Kegan Dougal | 2014-08-26 | 3 | -28/+17 |
| | | | | | | | | cmdclient, tests and webclient. All appears to work. | ||||
* | | Fold federation/handler into handlers/federation | Mark Haines | 2014-08-26 | 2 | -8/+9 |
|/ | |||||
* | Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> ↵ | Kegan Dougal | 2014-08-26 | 1 | -4/+4 |
| | | | | /rooms/$roomid/members. /rooms$roomid/messages/list >> /room/$roomid/messages. Updated cmdclient, tests and webclient. | ||||
* | Fix ALL THE UNIT TESTS | Kegan Dougal | 2014-08-26 | 2 | -27/+27 |
| | |||||
* | skip presence tests which broke when presence polling was disabled | Mark Haines | 2014-08-22 | 1 | -0/+2 |
| | |||||
* | Don't generate room membership messages. Include previous state of in ↵ | Erik Johnston | 2014-08-20 | 1 | -1/+6 |
| | | | | membership messages. | ||||
* | Don't expect a reflection from events stream | Erik Johnston | 2014-08-19 | 1 | -3/+1 |
| | |||||
* | Update tests | Erik Johnston | 2014-08-19 | 1 | -8/+1 |
| | |||||
* | Fix typo in merge conflict | Erik Johnston | 2014-08-19 | 1 | -2/+0 |
| | |||||
* | Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor | Erik Johnston | 2014-08-19 | 5 | -180/+232 |
|\ | | | | | | | | | | | | | Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py | ||||
| * | Perform the 'REST'-level tests of Presence against the real Presence handler ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 1 | -40/+92 |
| | | | | | | | | as well, mocking out the datastore beneath it | ||||
| * | Rename MockHttpServer to MockHttpResource as it stands for one server ↵ | Paul "LeoNerd" Evans | 2014-08-19 | 5 | -136/+136 |
| | | | | | | | | resource rather than an entire server | ||||
* | | SQL doesn't allow AUTOINCREMENT on non PRIMARY KEY columns. | Erik Johnston | 2014-08-18 | 2 | -0/+3 |
| | | |||||
* | | Disable the ability to GET individualy messages. We need to think about the ↵ | Erik Johnston | 2014-08-18 | 1 | -36/+36 |
|/ | | | | correct API to do this, as the current one doesn't make much sense. | ||||
* | Removed http_server from HomeServer. Updated unit tests to use either ↵ | Kegan Dougal | 2014-08-14 | 2 | -4/+3 |
| | | | | resource_for_federation or resource_for_client depending on what is being tested. | ||||
* | Start phasing out HttpServer: we should be using Resources instead. Added ↵ | Kegan Dougal | 2014-08-14 | 2 | -0/+4 |
| | | | | resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree. | ||||
* | An initial hack at storing presence state-change mtimes in database and ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -2/+10 |
| | | | | presenting age durations to clients/federation events | ||||
* | Use strings instead of opaque magic-number constants for presence states; ↵ | Paul "LeoNerd" Evans | 2014-08-13 | 1 | -6/+6 |
| | | | | rename AWAY to UNAVAILABLE | ||||
* | add in copyrights to everything, not just the synapse subdir, and add a ↵ | Matthew Hodgson | 2014-08-13 | 6 | -0/+84 |
| | | | | copyrighter.pl whilst we're at it | ||||
* | Reference Matrix Home Server | matrix.org | 2014-08-12 | 6 | -0/+1610 |