summary refs log tree commit diff
path: root/tests/rest (follow)
Commit message (Collapse)AuthorAgeFilesLines
* run isortAmber Brown2018-07-0911-48/+51
|
* Pass around the reactor explicitly (#3385)Amber Brown2018-06-222-5/+6
|
* Fix logcontext leak in HttpTransactionCacheRichard van der Hoff2018-05-211-0/+21
| | | | ONE DAY I WILL PURGE THE WORLD OF THIS EVIL
* Stop the transaction cache caching failuresRichard van der Hoff2018-05-211-0/+54
| | | | | | The transaction cache has some code which tries to stop it caching failures, but if the callback function failed straight away, then things would happen backwards and we'd end up with the failure stuck in the cache.
* Burminate v1authAdrian Tschira2018-04-304-13/+18
| | | | | | | | | | | | | | | | | | This closes #2602 v1auth was created to account for the differences in status code between the v1 and v2_alpha revisions of the protocol (401 vs 403 for invalid tokens). However since those protocols were merged, this makes the r0 version/endpoint internally inconsistent, and violates the specification for the r0 endpoint. This might break clients that rely on this inconsistency with the specification. This is said to affect the legacy angular reference client. However, I feel that restoring parity with the spec is more important. Either way, it is critical to inform developers about this change, in case they rely on the illegal behaviour. Signed-off-by: Adrian Tschira <nota@notafile.com>
* Use six.moves.urlparseAdrian Tschira2018-04-151-7/+7
| | | | | | The imports were shuffled around a bunch in py3 Signed-off-by: Adrian Tschira <nota@notafile.com>
* move handling of auto_join_rooms to RegisterHandlerKrombel2018-03-141-0/+1
| | | | | | | | | | | | | Currently the handling of auto_join_rooms only works when a user registers itself via public register api. Registrations via registration_shared_secret and ModuleApi do not work This auto_joins the users in the registration handler which enables the auto join feature for all 3 registration paths. This is related to issue #2725 Signed-Off-by: Matthias Kesler <krombel@krombel.de>
* s/replication_client/federation_client/Erik Johnston2018-03-134-11/+11
|
* Fix testsErik Johnston2018-03-134-11/+11
|
* Move RoomMemberHandler out of HandlersErik Johnston2018-03-011-1/+1
|
* Fix broken unit test for media storageErik Johnston2018-02-051-1/+6
|
* Merge pull request #2791 from matrix-org/erikj/media_storage_refactorErik Johnston2018-02-053-0/+109
|\ | | | | Ensure media is in local cache before thumbnailing
| * Add unit testsErik Johnston2018-01-183-0/+109
| |
* | mock registrations_require_3pidMatthew Hodgson2018-01-191-0/+1
|/
* Remove dead codeRichard van der Hoff2018-01-091-3/+0
| | | | pointless function is pointless
* Refactor UI auth implementationRichard van der Hoff2017-12-051-4/+7
| | | | | Instead of returning False when auth is incomplete, throw an exception which can be caught with a wrapper.
* Fix testDavid Baker2017-10-171-0/+1
|
* Split out profile handler to fix testsErik Johnston2017-08-251-2/+1
|
* Add groups to sync streamErik Johnston2017-07-201-2/+2
|
* use jsonschema.FormatChecker for RoomID and UserID stringspik2017-03-231-2/+2
| | | | | | * use a valid filter in rest/client/v2_alpha test Signed-off-by: pik <alexander.maznev@gmail.com>
* Add basic implementation of local device list changesErik Johnston2017-01-251-2/+2
|
* Linearize updates to membership via PUT /state/Erik Johnston2017-01-092-3/+6
|
* Stop generating refresh tokensRichard van der Hoff2016-11-281-8/+4
| | | | | | | Since we're not doing refresh tokens any more, we should start killing off the dead code paths. /tokenrefresh itself is a bit of a thornier subject, since there might be apps out there using it, but we can at least not generate refresh tokens on new logins.
* Clean transactions based on time. Add HttpTransactionCache tests.Kegan Dougal2016-11-141-0/+69
|
* Merge pull request #1098 from matrix-org/markjh/bearer_tokenMark Haines2016-10-252-0/+4
|\ | | | | Allow clients to supply access_tokens as headers
| * Fix unit testsMark Haines2016-09-122-0/+4
| |
* | Merge pull request #1164 from pik/error-codesErik Johnston2016-10-191-40/+87
|\ \ | | | | | | Clarify Error codes for GET /filter/
| * | Refactor test_filter to use real DataStorepik2016-10-181-43/+81
| | | | | | | | | | | | * add tests for filter api errors
| * | Error codes for filtersAlexander Maznev2016-10-141-3/+12
| | | | | | | | | | | | | | | | | | * add tests Signed-off-by: Alexander Maznev <alexander.maznev@gmail.com>
* | | rest/client/v1/register: use the correct requester in createUserPatrik Oldsberg2016-10-061-21/+9
| | | | | | | | | | | | Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
* | | storage/appservice: make appservice methods only relying on the cache ↵Patrik Oldsberg2016-10-061-1/+1
|/ / | | | | | | synchronous
* / Time out typing over federationErik Johnston2016-09-231-4/+1
|/
* More 0_0 in testsMark Haines2016-08-251-2/+2
|
* Add `create_requester` functionRichard van der Hoff2016-07-261-8/+5
| | | | | Wrap the `Requester` constructor with a function which provides sensible defaults, and use it throughout
* Implement deleting devicesRichard van der Hoff2016-07-261-4/+10
|
* Register a device_id in the /v2/register flow.Richard van der Hoff2016-07-201-3/+10
| | | | | | | | | | This doesn't cover *all* of the registration flows, but it does cover the most common ones: in particular: shared_secret registration, appservice registration, and normal user/pass registration. Pull device_id from the registration parameters. Register the device in the devices table. Associate the device with the returned access and refresh tokens. Profit.
* Further registration refactoringRichard van der Hoff2016-07-191-1/+5
| | | | | | | | | | | | | | * `RegistrationHandler.appservice_register` no longer issues an access token: instead it is left for the caller to do it. (There are two of these, one in `synapse/rest/client/v1/register.py`, which now simply calls `AuthHandler.issue_access_token`, and the other in `synapse/rest/client/v2_alpha/register.py`, which is covered below). * In `synapse/rest/client/v2_alpha/register.py`, move the generation of access_tokens into `_create_registration_details`. This means that the normal flow no longer needs to call `AuthHandler.issue_access_token`; the shared-secret flow can tell `RegistrationHandler.register` not to generate a token; and the appservice flow continues to work despite the above change.
* rest/client/v2_alpha/register.py: Refactor flow somewhat.Richard van der Hoff2016-07-191-1/+2
| | | | | | | | | | | This is meant to be an *almost* non-functional change, with the exception that it fixes what looks a lot like a bug in that it only calls `auth_handler.add_threepid` and `add_pusher` once instead of three times. The idea is to move the generation of the `access_token` out of `registration_handler.register`, because `access_token`s now require a device_id, and we only want to generate a device_id once registration has been successful.
* Split out the auth handlerDavid Baker2016-06-021-1/+1
|
* Move typing handler out of the Handlers objectMark Haines2016-05-171-1/+1
|
* Create user with expiryNegi Fazeli2016-05-131-0/+88
| | | | | | - Add unittests for client, api and handler Signed-off-by: Negar Fazeli <negar.fazeli@ericsson.com>
* Do checks for memberships before creating eventsErik Johnston2016-04-011-2/+2
|
* Fix testsDavid Baker2016-03-161-4/+5
|
* Use parse_json_object_from_request to parse JSON out of request bodiesMark Haines2016-03-111-2/+4
|
* Flake8 fixblide2016-03-101-6/+6
|
* Register endpoint returns refresh_tokenblide2016-03-101-12/+18
| | | | Guest registration still doesn't return refresh_token
* Fix testsDavid Baker2016-03-073-20/+20
|
* Fix unit testsMark Haines2016-03-041-2/+2
|
* Pass whole requester to ratelimitingDaniel Wagner-Hall2016-03-031-2/+2
| | | | This will enable more detailed decisions
* Fix flake8 warnings for testsMark Haines2016-02-198-170/+181
|
* Remove old tests.Erik Johnston2016-02-182-418/+0
|
* Rename config field to reflect yaml nameDaniel Wagner-Hall2016-02-032-3/+3
|
* Allow paginating backwards from stream tokenErik Johnston2016-01-281-8/+1
|
* Merge pull request #535 from matrix-org/rav/paginate_from_stream_tokenRichard van der Hoff2016-01-281-2/+14
|\ | | | | Make it possible to paginate forwards from stream tokens
| * Make it possible to paginate forwards from stream tokensRichard van der Hoff2016-01-271-2/+14
| | | | | | | | | | In order that we can fill the gap after a /sync, make it possible to paginate forwards from a stream token.
* | Remove redundated BaseHomeServerErik Johnston2016-01-261-8/+10
|/
* Introduce a Requester objectDaniel Wagner-Hall2016-01-112-7/+5
| | | | | | | | | This tracks data about the entity which made the request. This is instead of passing around a tuple, which requires call-site modifications every time a new piece of optional context is passed around. I tried to introduce a User object. I gave up.
* copyrightsMatthew Hodgson2016-01-0711-11/+11
|
* Return non-room events from guest /events callsDaniel Wagner-Hall2015-11-121-0/+3
|
* Add a couple of unit tests for room/<x>/messagesRichard van der Hoff2015-11-091-0/+56
| | | | ... merely because I was trying to figure out how it worked, and couldn't.
* Open up /events to anonymous users for room events onlyDaniel Wagner-Hall2015-11-052-2/+12
| | | | Squash-merge of PR #345 from daniel/anonymousevents
* Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-045-15/+26
| | | | | | | This follows the same flows-based flow as regular registration, but as the only implemented flow has no requirements, it auto-succeeds. In the future, other flows (e.g. captcha) may be required, so clients should treat this like the regular registration flow choices.
* Support clients supplying older tokens, fix short poll testMark Haines2015-10-301-2/+2
|
* Allow rejecting invitesDaniel Wagner-Hall2015-10-201-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 testsMark Haines2015-09-221-1/+17
|
* Merge pull request #276 from ↵Mark Haines2015-09-211-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 leftMark Haines2015-09-101-5/+5
| |
| * Allow users that have left the room to view the member list from the point ↵Mark Haines2015-09-091-2/+2
| | | | | | | | they left
* | s/user_id/user/g for consistencyDaniel Wagner-Hall2015-09-014-11/+11
| |
* | Attempt to validate macaroonsDaniel Wagner-Hall2015-08-265-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 readDaniel Wagner-Hall2015-08-254-11/+0
|
* Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-254-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 refreshDaniel Wagner-Hall2015-08-201-1/+2
|\ | | | | | | | | Conflicts: synapse/rest/client/v1/login.py
| * Fix testsDavid Baker2015-08-041-1/+2
| |
* | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-205-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 Dougal2015-07-291-1/+3
| | | | Namely this means using registration_handler.appservice_register.
* Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-281-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 Johnston2015-07-071-1/+11
|
* Add receipts_key to StreamTokenErik Johnston2015-07-021-2/+2
|
* Fix the presence testsMark Haines2015-05-221-2/+2
|
* Merge pull request #157 from matrix-org/markjh/presence_performanceMark Haines2015-05-221-0/+3
|\ | | | | Improve presence performance in loadtest
| * Fix the presence testsMark Haines2015-05-201-0/+3
| |
* | Oops, get_rooms_for_user returns a namedtuple, not a room_idMark Haines2015-05-211-1/+6
|/
* Discard unused NotifierUserStreamsMark Haines2015-05-131-0/+1
|
* Don't bother checking for updates if the stream token hasn't advanced for a userMark Haines2015-05-131-5/+10
|
* Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-284-13/+13
|\
| * Merge branch 'develop' into csauthDavid Baker2015-04-171-2/+5
| |\
| * | Fix testsDavid Baker2015-03-244-13/+13
| | |
* | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-171-2/+5
|\ \ \ | | |/ | |/|
| * | Various minor fixes to unit-test structure around typing notificationsPaul "LeoNerd" Evans2015-04-151-2/+4
| | |
| * | Have TypingNotificationEventSource.get_new_events_for_user() return a ↵Paul "LeoNerd" Evans2015-04-151-1/+2
| |/ | | | | | | deferred, for consistency and extensibility
* / Make work in both Maria and SQLite. Fix testsErik Johnston2015-04-011-9/+0
|/
* Fix testsErik Johnston2015-03-091-4/+4
|
* Fix unit testsKegan Dougal2015-02-271-0/+3
|
* Update testsErik Johnston2015-02-191-0/+1
|
* Merge branch 'develop' into application-servicesKegan Dougal2015-02-116-141/+34
|\
| * Factor out some of the common homeserver setup code into aMark Haines2015-02-116-141/+34
| | | | | | | | setup_test_homeserver function in utils.
* | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-092-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 developMark Haines2015-01-291-0/+1
|
* Merge changes from developMark Haines2015-01-294-2/+12
|\
| * Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-284-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 Haines2015-01-283-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_reqMark Haines2015-01-282-2/+2
| | |
* | | More unit-testing of REST errorsPaul "LeoNerd" Evans2015-01-271-1/+35
| | |
* | | Move storage of user filters into real datastore layer; now have to mock it ↵Paul "LeoNerd" Evans2015-01-272-3/+27
| | | | | | | | | | | | out in the REST-level tests
* | | Use new V2AlphaRestTestCasePaul "LeoNerd" Evans2015-01-271-38/+2
| | |
* | | Merge branch 'develop' into client_v2_filterPaul "LeoNerd" Evans2015-01-271-0/+45
|\| |
| * | Initial cut of a shared base class for REST unit testsPaul "LeoNerd" Evans2015-01-271-0/+45
| |/
* | Minor changes to v2_alpha filter REST test to allow the setUp method to be ↵Paul "LeoNerd" Evans2015-01-271-5/+7
| | | | | | | | shareable
* | Initial trivial REST test of v2_alpha filter APIPaul "LeoNerd" Evans2015-01-261-0/+74
|/
* Create (empty) v2_alpha REST tests directoryPaul "LeoNerd" Evans2015-01-261-0/+15
|
* Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-234-24/+24
|
* Merge rest servlets into the client json resource objectMark Haines2015-01-232-4/+9
|
* Move client rest tests back under restMark Haines2015-01-229-0/+2156
|
* Move client v1 api rest servlets into a "client/v1" directoryMark Haines2015-01-227-2128/+0
|
* Check that setting typing notification still works after explicit timeout at ↵Paul "LeoNerd" Evans2015-01-121-1/+50
| | | | REST layer - SYN-230
* Update testsKegan Dougal2015-01-071-1/+1
|
* Merge branch 'develop' of github.com:matrix-org/synapse into events_refactorErik Johnston2014-12-152-4/+115
|\ | | | | | | | | Conflicts: tests/handlers/test_room.py
| * Send list of typing user IDs as 'user_ids' list within 'content', so that ↵Paul "LeoNerd" Evans2014-12-121-1/+3
| | | | | | | | m.typing stream events have a toplevel content, for consistency with others
| * Move typing-notification REST tests into their own .py filePaul "LeoNerd" Evans2014-12-112-83/+113
| |
| * Actually unit-test the event stream around REST typing testsPaul "LeoNerd" Evans2014-12-111-0/+14
| |
| * Initial hack at unit tests of room typing REST APIPaul "LeoNerd" Evans2014-12-111-3/+68
| |
* | Fix test.Erik Johnston2014-12-121-1/+1
| |
* | Fix stream test. Make sure we add join to auth_events for invitiationsErik Johnston2014-12-121-4/+0
|/
* Fix tests from prev commitErik Johnston2014-11-191-1/+0
|
* Include room members' presence in room initialSyncPaul "LeoNerd" Evans2014-11-181-0/+14
|
* Include 'messages' snapshot in room initialSyncPaul "LeoNerd" Evans2014-11-181-0/+4
|
* Merge branch 'develop' into room-initial-syncPaul "LeoNerd" Evans2014-11-173-150/+182
|\ | | | | | | | | Conflicts: synapse/handlers/message.py
| * Only allow people in a room to look up room state.Erik Johnston2014-11-111-8/+8
| |
| * Fix rest.test_roomsErik Johnston2014-11-111-90/+113
| |
| * Fix rest.test_events. Convert to use SQLiteMemoryDbPoolErik Johnston2014-11-101-10/+5
| |
| * Don't execute empty tests. Formatting.Erik Johnston2014-11-051-17/+28
| |
| * Sign outgoing PDUs.Mark Haines2014-10-163-11/+36
| |
* | Include room membership in room initialSyncPaul "LeoNerd" Evans2014-11-101-0/+1
| |
* | Put room state in room initialSync output - I guess this is right; I really ↵Paul "LeoNerd" Evans2014-11-101-0/+35
| | | | | | | | can't find any other tests similar...
* | Have room initialSync return the room's room_idPaul "LeoNerd" Evans2014-11-101-0/+2
| |
* | Initial (empty) test that room initialSync at least returns 200 OKPaul "LeoNerd" Evans2014-11-101-0/+53
|/
* Merge branch 'develop' into server2server_signingMark Haines2014-09-303-10/+49
|\ | | | | | | | | | | Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py
| * Unbreak tests after changing storage APIErik Johnston2014-09-292-8/+45
| |
| * Track the IP users connect with. Add an admin column to users table.Erik Johnston2014-09-262-3/+7
| |
* | Sign federation transactionsMark Haines2014-09-241-3/+12
|/
* Be consistent when associating keys with login types for registration/login.Kegan Dougal2014-09-151-1/+1
|
* Fix unit tests.Kegan Dougal2014-09-151-2/+8
|
* Have all unit tests import from our own subclass of trial's unittest ↵Paul "LeoNerd" Evans2014-09-124-10/+5
| | | | TestCase; set up logging in ONE PLACE ONLY
* Unit tests do not need captchas.Kegan Dougal2014-09-051-0/+1
|
* fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org ↵Matthew Hodgson2014-09-036-6/+6
| | | | hasn't been incorporated in time for launch.
* Kill the statePaul "LeoNerd" Evans2014-09-031-8/+12
| | | | ... key from all the Presence messages
* Implement presence state visibilty limiting when polling eventsource for streamPaul "LeoNerd" Evans2014-09-031-5/+23
|
* Fix tests to support ratelimitingMark Haines2014-09-032-2/+51
|
* Perform room unit tests with 'local' users actually in the right domain ;)Paul "LeoNerd" Evans2014-09-011-6/+6
|
* Rename API-visible 'mtime' presence field to 'last_active'; slightly ↵Paul "LeoNerd" Evans2014-09-011-1/+1
| | | | different semantics
* Rename 'state' presence key to the much more obvious 'presence'; maintain a ↵Paul "LeoNerd" Evans2014-09-011-7/+11
| | | | legacy 'state' copy for now
* change the world: make the default matrix API URL prefix /_matrix rather ↵Matthew Hodgson2014-08-314-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 methodsPaul "LeoNerd" Evans2014-08-291-0/+10
|
* Define a new event stream data source for typing notifications (currently null)Paul "LeoNerd" Evans2014-08-291-3/+5
|
* Move the *EventSource classes into the handlers they relate to, so it's ↵Paul "LeoNerd" Evans2014-08-291-2/+2
| | | | easier to find the code
* Re-enable presence, un-skip presence testsPaul "LeoNerd" Evans2014-08-281-2/+0
|
* Fix up the various presence-related tests so that if they're not skipped, ↵Paul "LeoNerd" Evans2014-08-271-8/+16
| | | | they still PASS
* Merge branch 'develop' into storage_transactionsMark Haines2014-08-274-99/+42
|\
| * Final url modifications: renamed /presence_list to /presence/list to keep ↵Kegan Dougal2014-08-271-3/+3
| | | | | | | | the top-level namespace clean. Updated tests.
| * Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and ↵Kegan Dougal2014-08-273-96/+39
| | | | | | | | removed tests which tested that. Updated cmdclient and webclient.
* | Merge branch 'develop' into storage_transactionsMark Haines2014-08-273-28/+17
|\|
| * Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated ↵Kegan Dougal2014-08-263-28/+17
| | | | | | | | cmdclient, tests and webclient. All appears to work.
* | Fold federation/handler into handlers/federationMark Haines2014-08-262-8/+9
|/
* Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> ↵Kegan Dougal2014-08-261-4/+4
| | | | /rooms/$roomid/members. /rooms$roomid/messages/list >> /room/$roomid/messages. Updated cmdclient, tests and webclient.
* Fix ALL THE UNIT TESTSKegan Dougal2014-08-262-27/+27
|
* skip presence tests which broke when presence polling was disabledMark Haines2014-08-221-0/+2
|
* Don't generate room membership messages. Include previous state of in ↵Erik Johnston2014-08-201-1/+6
| | | | membership messages.
* Don't expect a reflection from events streamErik Johnston2014-08-191-3/+1
|
* Update testsErik Johnston2014-08-191-8/+1
|
* Fix typo in merge conflictErik Johnston2014-08-191-2/+0
|
* Merge branch 'master' of github.com:matrix-org/synapse into sql_refactorErik Johnston2014-08-195-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" Evans2014-08-191-40/+92
| | | | | | | | as well, mocking out the datastore beneath it
| * Rename MockHttpServer to MockHttpResource as it stands for one server ↵Paul "LeoNerd" Evans2014-08-195-136/+136
| | | | | | | | resource rather than an entire server
* | SQL doesn't allow AUTOINCREMENT on non PRIMARY KEY columns.Erik Johnston2014-08-182-0/+3
| |
* | Disable the ability to GET individualy messages. We need to think about the ↵Erik Johnston2014-08-181-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 Dougal2014-08-142-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 Dougal2014-08-142-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" Evans2014-08-131-2/+10
| | | | presenting age durations to clients/federation events
* Use strings instead of opaque magic-number constants for presence states; ↵Paul "LeoNerd" Evans2014-08-131-6/+6
| | | | rename AWAY to UNAVAILABLE
* add in copyrights to everything, not just the synapse subdir, and add a ↵Matthew Hodgson2014-08-136-0/+84
| | | | copyrighter.pl whilst we're at it
* Reference Matrix Home Servermatrix.org2014-08-126-0/+1610