summary refs log tree commit diff
path: root/tests (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #538 from matrix-org/erikj/fix_lru_cacheErik Johnston2016-01-292-0/+19
|\ \ \
| * | | Add testsErik Johnston2016-01-292-0/+19
* | | | Fix testErik Johnston2016-01-281-3/+4
|/ / /
* | / Merge pull request #534 from matrix-org/erikj/setupErik Johnston2016-01-283-5/+12
|\| | | |/ |/|
| * Fix testsErik Johnston2016-01-273-5/+12
* | 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 tokensRichard van der Hoff2016-01-271-2/+14
* | Remove redundated BaseHomeServerErik Johnston2016-01-265-314/+30
|/
* Fix testsErik Johnston2016-01-251-6/+4
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/syncErik Johnston2016-01-222-0/+86
|\
| * Revert all the bits changing keys of eeverything that used LRUCaches to tuplesDavid Baker2016-01-222-35/+35
| * Make LRU cache not default to treecache & add options to use itDavid Baker2016-01-221-1/+2
| * Test treecache directlyDavid Baker2016-01-221-0/+19
| * Add tests for treecache directly and test del_multi at the LruCache level too.David Baker2016-01-221-0/+66
| * Change LRUCache to be tree-based so we can delete subtrees.David Baker2016-01-212-35/+35
* | Fix testsErik Johnston2016-01-221-1/+1
|/
* Cache dns lookups, and use the cache if we fail to lookup servers laterErik Johnston2016-01-201-0/+115
* Make unit tests workErik Johnston2016-01-182-559/+0
* Require unbanning before other membership changesDaniel Wagner-Hall2016-01-151-3/+3
* Require ID and as_token be unique for ASsDaniel Wagner-Hall2016-01-142-16/+86
* Delete the table objects from TransactionStoreMark Haines2016-01-132-2/+0
* Merge pull request #478 from matrix-org/daniel/userobjectDaniel Wagner-Hall2016-01-113-13/+11
|\
| * Introduce a Requester objectDaniel Wagner-Hall2016-01-113-13/+11
* | Merge pull request #456 from matrix-org/store_event_actionsDavid Baker2016-01-083-1/+26
|\ \ | |/ |/|
| * fix testsDavid Baker2016-01-063-1/+10
| * Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-051-9/+9
| |\
| * | fix testsDavid Baker2016-01-042-2/+2
| * | Merge remote-tracking branch 'origin/develop' into store_event_actionsDavid Baker2016-01-041-0/+60
| |\ \
| * | | Add mocks to make tests work againDavid Baker2015-12-222-0/+16
* | | | copyrightsMatthew Hodgson2016-01-0753-53/+53
| |_|/ |/| |
* | | Allow guests to upgrade their accountsDaniel Wagner-Hall2016-01-051-9/+9
| |/ |/|
* | Add a unit test for the snapshot cacheMark Haines2015-12-231-0/+60
|/
* Merge remote-tracking branch 'origin/master' into developMark Haines2015-12-071-1/+1
|\
| * Fix mock import in tests.Oleg Girko2015-12-061-1/+1
* | Host /unstable and /r0 versions of r0 APIsDaniel Wagner-Hall2015-12-011-2/+3
* | rename the method in the tests as wellMark Haines2015-12-011-3/+3
|/
* Update testsErik Johnston2015-11-173-0/+17
* Return non-room events from guest /events callsDaniel Wagner-Hall2015-11-121-0/+3
* Fix an issue with ignoring power_level changes on divergent graphsRichard van der Hoff2015-11-121-0/+93
* Merge pull request #359 from matrix-org/markjh/incremental_indexingErik Johnston2015-11-112-0/+79
|\
| * Test for background updatesMark Haines2015-11-102-0/+79
* | Return world_readable and guest_can_join in /publicRoomsDaniel Wagner-Hall2015-11-101-0/+2
* | Add a couple of unit tests for room/<x>/messagesRichard van der Hoff2015-11-091-0/+56
|/
* Open up /events to anonymous users for room events onlyDaniel Wagner-Hall2015-11-054-26/+89
* Merge branch 'develop' of github.com:matrix-org/synapse into developDaniel Wagner-Hall2015-11-044-117/+1
|\
| * Merge branch 'develop' into daniel/removesomeliesMark Haines2015-11-042-110/+2
| |\
| | * Remove the LockManager class because it wasn't being usedMark Haines2015-11-041-108/+0
| * | Remove more unused parametersDaniel Wagner-Hall2015-11-023-9/+1
* | | Allow guests to register and call /events?room_id=Daniel Wagner-Hall2015-11-046-18/+48
| |/ |/|
* | Merge branch 'develop' into markjh/room_tagsMark Haines2015-11-021-2/+7
|\|
| * Fix a 500 error resulting from empty room_idsRichard van der Hoff2015-10-261-2/+7
* | Support clients supplying older tokens, fix short poll testMark Haines2015-10-301-2/+2
|/
* Merge pull request #319 from matrix-org/erikj/filter_refactorErik Johnston2015-10-221-26/+31
|\
| * Refactor api.filtering to have a Filter APIErik Johnston2015-10-201-26/+31
* | Merge pull request #314 from matrix-org/paul/event-redactionMark Haines2015-10-222-0/+115
|\ \ | |/ |/|
| * Add some unit tests of prune_events()Paul "LeoNerd" Evans2015-10-162-0/+115
* | Merge branch 'develop' of github.com:matrix-org/synapse into developDaniel Wagner-Hall2015-10-202-0/+129
|\ \
| * | Invoke EventBuilder directly instead of going via the EventBuilderFactoryPaul "LeoNerd" Evans2015-10-191-35/+3
| * | Capture __init__.pyPaul "LeoNerd" Evans2015-10-191-0/+15
| * | Use assertIn() instead of assertTrue on the 'in' operatorPaul "LeoNerd" Evans2015-10-191-6/+6
| * | Another signing test vector using an 'm.room.message' with content, so that t...Paul "LeoNerd" Evans2015-10-191-1/+49
| * | Initial minimial hack at a test of event hashing and signingPaul "LeoNerd" Evans2015-10-191-0/+98
| |/
* / Allow rejecting invitesDaniel Wagner-Hall2015-10-201-2/+2
|/
* update filtering testsMark Haines2015-10-131-6/+6
* rename schema_prepare to prepare_databaseErik Johnston2015-10-131-1/+1
* Expose error more nicelyErik Johnston2015-10-131-1/+1
* Merge branch 'develop' of github.com:matrix-org/synapse into erikj/unfederatableErik Johnston2015-10-0211-98/+391
|\
| * synapse/storage/_base.py:_simple_selectupdate_one was unusedMark Haines2015-09-231-20/+0
| * Move NullSource out of synapse and into tests since it is only used by the testsMark Haines2015-09-221-1/+17
| * Implement configurable stats reportingDaniel Wagner-Hall2015-09-224-54/+213
| * Merge pull request #276 from matrix-org/markjh/history_for_rooms_that_have_be...Mark Haines2015-09-211-7/+7
| |\
| | * 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 th...Mark Haines2015-09-091-2/+2
| * | Merge pull request #256 from matrix-org/authDaniel Wagner-Hall2015-09-146-16/+154
| |\ \
| | * | s/user_id/user/g for consistencyDaniel Wagner-Hall2015-09-015-15/+15
| | * | Turn TODO into thing which actually will failDaniel Wagner-Hall2015-08-261-6/+9
| | * | Attempt to validate macaroonsDaniel Wagner-Hall2015-08-266-27/+162
* | | | Merge branch 'erikj/check_room_exists' into erikj/unfederatableErik Johnston2015-09-011-8/+29
|\| | |
| * | | Fix testsErik Johnston2015-09-011-8/+29
| | |/ | |/|
* / | Check against sender rather than event_idErik Johnston2015-09-011-1/+1
|/ /
* / Swap out bcrypt for md5 in testsDaniel Wagner-Hall2015-08-261-0/+13
|/
* Stop looking up "admin", which we never readDaniel Wagner-Hall2015-08-257-18/+2
* Remove completely unused concepts from codebaseDaniel Wagner-Hall2015-08-257-20/+4
* Merge branch 'develop' into refreshDaniel Wagner-Hall2015-08-201-1/+2
|\
| * Merge pull request #211 from matrix-org/email_in_useMark Haines2015-08-201-1/+2
| |\
| | * Fix testsDavid Baker2015-08-041-1/+2
* | | /tokenrefresh POST endpointDaniel Wagner-Hall2015-08-201-0/+55
* | | s/by_token/by_access_token/gDaniel Wagner-Hall2015-08-208-34/+34
* | | Move token generation to auth handlerDaniel Wagner-Hall2015-08-201-7/+7
* | | Re-add whitespace around caveat operatorsDaniel Wagner-Hall2015-08-191-4/+4
* | | Remove padding space around caveat operatorsDaniel Wagner-Hall2015-08-181-4/+4
* | | Fix units in testDaniel Wagner-Hall2015-08-181-1/+1
* | | Fix some formatting to use tuplesDaniel Wagner-Hall2015-08-181-1/+1
* | | Merge branch 'develop' into authDaniel Wagner-Hall2015-08-184-5/+104
|\| |
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary...Erik Johnston2015-08-121-2/+2
| |\ \
| | * | Remove call to recently removed function in mockDaniel Wagner-Hall2015-08-111-2/+2
| * | | Move all the caches into their own package, synapse.util.cachesErik Johnston2015-08-113-5/+3
| * | | Change Cache to not use *args in its interfaceErik Johnston2015-08-071-6/+6
| * | | Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cacheErik Johnston2015-08-061-4/+7
| |\ \ \
| * | | | Use dictionary cache to do group -> state fetchingErik Johnston2015-08-051-1/+1
| * | | | Move DictionaryCacheErik Johnston2015-08-041-1/+1
| * | | | Add basic dictionary cacheErik Johnston2015-08-041-0/+101
| | |_|/ | |/| |
* | | | Issue macaroons as opaque auth tokensDaniel Wagner-Hall2015-08-182-0/+72
* | | | Remove call to recently removed function in mockDaniel Wagner-Hall2015-08-111-2/+2
| |_|/ |/| |
* | | Change Cache to not use *args in its interfaceErik Johnston2015-08-071-6/+6
| |/ |/|
* | Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferredsErik Johnston2015-08-061-0/+134
|\|
| * Use the same reg paths as register v1 for ASes.Kegan Dougal2015-07-291-1/+3
| * Fix v2_alpha registration. Add unit tests.Kegan Dougal2015-07-281-0/+132
* | Make @cached cache deferreds rather than the deferreds' valuesErik Johnston2015-08-061-4/+7
|/
* Fix test.Erik Johnston2015-07-071-1/+11
* Consolidate duplicate code in notifierErik Johnston2015-07-021-10/+10
* Add receipts_key to StreamTokenErik Johnston2015-07-021-2/+2
* Fix bug where synapse was sending AS user queries incorrectly.Kegan Dougal2015-06-171-0/+43
* Fix testsErik Johnston2015-06-121-0/+2
* Merge pull request #180 from matrix-org/erikj/prev_state_contextErik Johnston2015-06-031-0/+2
|\
| * Don't needlessly compute prev_stateErik Johnston2015-06-031-0/+2
* | Merge pull request #179 from matrix-org/erikj/state_group_outliersErik Johnston2015-06-031-2/+2
|\ \
| * | Don't needlessly compute contextErik Johnston2015-06-031-2/+2
| |/
* / Caches should be bound to instances.Erik Johnston2015-06-032-36/+50
|/
* Fix the presence testsMark Haines2015-05-223-17/+23
* Merge pull request #157 from matrix-org/markjh/presence_performanceMark Haines2015-05-222-10/+6
|\
| * Fix the presence testsMark Haines2015-05-202-10/+6
* | Make the appservice use 'users_in_room' rather than get_room_members since it...Mark Haines2015-05-221-12/+3
* | Oops, get_rooms_for_user returns a namedtuple, not a room_idMark Haines2015-05-211-1/+6
* | Merge pull request #155 from matrix-org/erikj/perfErik Johnston2015-05-211-1/+2
|\ \ | |/ |/|
| * Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into erikj/...Erik Johnston2015-05-182-48/+13
| |\
| * | Fix daedlockErik Johnston2015-05-151-1/+2
* | | Merge branch 'develop' into notifier_performanceMark Haines2015-05-182-48/+13
|\ \ \ | | |/ | |/|
| * | Remove unused arguments and doc PresenceHandler.push_update_to_clientsMark Haines2015-05-142-48/+13
| |/
* | Discard unused NotifierUserStreamsMark Haines2015-05-132-0/+4
* | Don't bother checking for updates if the stream token hasn't advanced for a userMark Haines2015-05-135-17/+24
|/
* Add support for using executemanyErik Johnston2015-05-051-2/+2
* Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-284-13/+13
|\
| * Merge branch 'develop' into csauthDavid Baker2015-04-241-0/+65
| |\
| * \ Merge branch 'develop' into csauthDavid Baker2015-04-177-61/+677
| |\ \
| * | | Fix testsDavid Baker2015-03-245-14/+14
| * | | Don't test exact equality of the list: as long as it has the fields we expect...David Baker2015-03-241-6/+5
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-271-0/+65
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove users from the remote_offline_serials list (and clean up empty element...Paul "LeoNerd" Evans2015-04-231-0/+27
| * | | Store a list of the presence serial number at which remote users went offline...Paul "LeoNerd" Evans2015-04-231-0/+38
| | |/ | |/|
* | | Merge branch 'develop' of github.com:matrix-org/synapse into postgresErik Johnston2015-04-172-8/+24
|\| |
| * | Various minor fixes to unit-test structure around typing notificationsPaul "LeoNerd" Evans2015-04-152-2/+11
| * | Have TypingNotificationEventSource.get_new_events_for_user() return a deferre...Paul "LeoNerd" Evans2015-04-152-7/+14
* | | Fix tests after commit 9a0579Erik Johnston2015-04-081-0/+6
* | | Merge branch 'develop' of github.com:matrix-org/synapse into mysqlErik Johnston2015-04-075-56/+691
|\| |
| * | Merge branch 'develop' into application-services-registration-scriptKegan Dougal2015-04-011-0/+13
| |\ \
| | * | Fix thinko whereby events *for the AS specifically* were not passed on.Kegan Dougal2015-03-311-0/+13
| * | | Use a sender localpart instead of a user ID.Kegan Dougal2015-03-311-2/+2
| * | | Edit SQL schema to use string IDs not ints. Use token as ID. Update tests.Kegan Dougal2015-03-311-15/+23
| * | | Fix tests and missing returns on deferreds.Kegan Dougal2015-03-311-12/+29
| * | | Remove more reg/unreg methods. Read config not database for cache.Kegan Dougal2015-03-311-39/+0
| |/ /
| * | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-263-3/+75
| |\ \
| | * | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict()Paul "LeoNerd" Evans2015-03-251-0/+22
| | * | Unit-test that Cache() key eviction is orderedPaul "LeoNerd" Evans2015-03-251-0/+18
| | |/
| | * Pull out the cache logic from the @cached wrapper into its own class we can r...Paul "LeoNerd" Evans2015-03-201-1/+33
| * | Implement ServiceQueuer with tests.Kegan Dougal2015-03-161-7/+47
| * | Replace EventGrouper for ServiceQueuer to move to push-based txns. Fix tests ...Kegan Dougal2015-03-161-73/+27
| * | Minor PR comment tweaks.Kegan Dougal2015-03-161-5/+5
| * | Merge branch 'develop' into application-services-txn-reliabilityKegan Dougal2015-03-165-10/+171
| |\ \
| * | | Use event IDs instead of dumping event content in the txns table.Kegan Dougal2015-03-091-13/+17
| * | | Use seconds; start gluing in the AS scheduler into the AS handler.Kegan Dougal2015-03-092-7/+10
| * | | Finish appservice txn storage impl and tests.Kegan Dougal2015-03-091-0/+68
| * | | Implement create_appservice_txn with tests.Kegan Dougal2015-03-091-0/+67
| * | | Partially implement txn store methods with tests.Kegan Dougal2015-03-091-2/+169
| * | | Update UTsKegan Dougal2015-03-061-5/+5
| * | | Apply clarity and docstringsKegan Dougal2015-03-061-1/+1
| * | | Finish synapse.appservice.scheduler implementation.Kegan Dougal2015-03-061-2/+113
| * | | Flesh out more stub functions.Kegan Dougal2015-03-061-2/+3
| * | | Add more tests; fix bugs.Kegan Dougal2015-03-061-7/+47
| * | | Start adding some testsKegan Dougal2015-03-061-0/+106
* | | | Make work in both Maria and SQLite. Fix testsErik Johnston2015-04-0110-52/+83
| |_|/ |/| |
* | | Tidy up _simple_... methodsErik Johnston2015-03-202-2/+2
| |/ |/|
* | Add an .inc_by() method to CounterMetric; implement DistributionMetric a neat...Paul "LeoNerd" Evans2015-03-121-3/+2
* | Rename TimerMetric to DistributionMetric; as it could count more than just timePaul "LeoNerd" Evans2015-03-121-12/+12
* | Export CacheMetric as hits+total, rather than hits+misses, as it's easier to ...Paul "LeoNerd" Evans2015-03-121-3/+3
* | Prometheus needs "escaped" label valuesPaul "LeoNerd" Evans2015-03-121-27/+27
* | Bugfix to rendering output of vectored TimerMetricsPaul "LeoNerd" Evans2015-03-121-4/+4
* | Rename Metrics' "keys" to "labels"Paul "LeoNerd" Evans2015-03-121-3/+3
* | Initial hack at a TimerMetric; for storing counts + duration accumulatorsPaul "LeoNerd" Evans2015-03-121-1/+35
* | Implement vector CallbackMetricsPaul "LeoNerd" Evans2015-03-121-1/+17
* | Rename CacheCounterMetric to just CacheMetric; add a CallbackMetric component...Paul "LeoNerd" Evans2015-03-121-9/+15
* | Initial attempt at a scalar callback-based metric to give instantaneous snaps...Paul "LeoNerd" Evans2015-03-121-1/+21
* | Create the concept of a cachecounter metric; generating two counters specific...Paul "LeoNerd" Evans2015-03-121-1/+26
* | Initial tiny attempt at (vectorable) counter metricsPaul "LeoNerd" Evans2015-03-122-0/+61
* | Fix testsErik Johnston2015-03-093-10/+10
|/
* Merge pull request #93 from matrix-org/application-services-exclusiveKegsay2015-03-022-19/+80
|\
| * Add more unit tests for exclusive namespaces.Kegan Dougal2015-02-272-2/+50
| * Update unit tests to use new format.Kegan Dougal2015-02-272-19/+32
* | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pduErik Johnston2015-03-022-0/+113
|\ \
| * | Fix unit testsKegan Dougal2015-02-271-0/+3
| |/
| * Use cache.pop() instead of a separate membership test + del []Paul "LeoNerd" Evans2015-02-231-0/+7
| * Merge remote-tracking branch 'origin/develop' into performance-cache-improvem...Paul "LeoNerd" Evans2015-02-232-0/+2
| |\
| * | Allow @cached-wrapped functions to have a prefill method for setting entriesPaul "LeoNerd" Evans2015-02-231-0/+14
| * | Take named arguments to @cached() decorator, add a 'max_entries' limitPaul "LeoNerd" Evans2015-02-191-0/+89
* | | Fix presence testsErik Johnston2015-02-231-15/+28
| |/ |/|
* | Update testsErik Johnston2015-02-192-0/+2
|/
* Use git aware version string in User-Agent and Server headersErik Johnston2015-02-181-2/+8
* Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-137-1/+532
|\
| * Fix tests which broke when event caching was introduced.Kegan Dougal2015-02-111-1/+4
| * Merge branch 'develop' into application-servicesKegan Dougal2015-02-1126-362/+200
| |\
| * | Notify ASes for events sent by other users in a room which an AS user is a pa...Kegan Dougal2015-02-111-0/+25
| * | Remove unused imports.Kegan Dougal2015-02-091-2/+2
| * | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-093-1/+145
| * | Dependency inject ApplicationServiceApi when creating ApplicationServicesHand...Kegan Dougal2015-02-051-7/+3
| * | Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-1/+4
| |\ \
| * | | Fix unit tests.Kegan Dougal2015-02-051-2/+5
| * | | Add unit test for appservice_handler.query_room_alias_existsKegan Dougal2015-02-051-1/+30
| * | | Add unknown user ID check. Use store.get_aliases_for_room(room_id) when searc...Kegan Dougal2015-02-051-0/+1
| * | | Add hs_token column and generate a different token f.e application service.Kegan Dougal2015-02-051-4/+6
| * | | Fix bug in store defer. Add more unit tests.Kegan Dougal2015-02-043-5/+193
| * | | Begin to add unit tests for appservice glue and regex testing.Kegan Dougal2015-02-043-0/+140
* | | | Merge pull request #62 from matrix-org/state-chacheErik Johnston2015-02-111-1/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix testsErik Johnston2015-02-091-1/+6
| | |/ | |/|
* | | Add a cache for get_eventMark Haines2015-02-112-2/+4
* | | Add a lru cache classMark Haines2015-02-111-0/+56
* | | Factor out some of the common homeserver setup code into aMark Haines2015-02-1125-360/+140
|/ /
* / Try to ensure we don't persist an event we have already persisted. In persist...Erik Johnston2015-02-031-1/+4
|/
* Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-303-3/+614
|\
| * Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-303-3/+614
| |\
| | * Create a separate filter object to do the actual filtering, so that we canMark Haines2015-01-291-51/+57
| | * Merge in auth changes from developMark Haines2015-01-291-0/+1
| | * Merge changes from developMark Haines2015-01-295-4/+20
| | |\
| | * | Add filter_room_state unit tests.Kegan Dougal2015-01-291-0/+56
| | * | Add basic filtering public API unit tests. Use defers in the right places.Kegan Dougal2015-01-291-1/+53
| | * | Add more unit tests for the filter algorithm.Kegan Dougal2015-01-291-5/+259
| | * | Implement filter algorithm. Add basic event type unit tests to assert it works.Kegan Dougal2015-01-291-1/+44
| | * | Add filter JSON sanity checks.Kegan Dougal2015-01-281-4/+20
| | * | Initial stab at real SQL storage implementation of user filter definitionsPaul "LeoNerd" Evans2015-01-271-1/+18
| | * | 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 o...Paul "LeoNerd" Evans2015-01-272-3/+27
| | * | Have the Filtering API return Deferreds, so we can do the Datastore implement...Paul "LeoNerd" Evans2015-01-271-2/+3
| | * | Initial trivial unittest of Filtering objectPaul "LeoNerd" Evans2015-01-271-0/+67
| | * | Use new V2AlphaRestTestCasePaul "LeoNerd" Evans2015-01-271-38/+2
| | * | Merge branch 'develop' into client_v2_filterPaul "LeoNerd" Evans2015-01-271-0/+45
| | |\ \
| | * | | Minor changes to v2_alpha filter REST test to allow the setUp method to be sh...Paul "LeoNerd" Evans2015-01-271-5/+7
| | * | | Initial trivial REST test of v2_alpha filter APIPaul "LeoNerd" Evans2015-01-261-0/+74
| * | | | Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolu...Erik Johnston2015-01-3026-418/+415
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-306-4/+80
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-285-4/+20
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Extract the id token of the token when authing users, include the token and d...Mark Haines2015-01-284-2/+18
| | * | | Return the device_id from get_auth_by_reqMark Haines2015-01-282-2/+2
| | | |/ | | |/|
| * / | Initial cut of a shared base class for REST unit testsPaul "LeoNerd" Evans2015-01-271-0/+45
| |/ /
| * | Create (empty) v2_alpha REST tests directoryPaul "LeoNerd" Evans2015-01-261-0/+15
* | | Initial implementation of auth conflict resolutionErik Johnston2015-01-291-0/+2
* | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-2324-416/+337
|\| | | |/ |/|
| * Replace hs.parse_roomalias with RoomAlias.from_stringMark Haines2015-01-234-13/+8
| * Replace hs.parse_roomid with RoomID.from_stringMark Haines2015-01-235-11/+12
| * Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-2316-70/+74
| * Merge pull request #31 from matrix-org/client_api_resourceMark Haines2015-01-232-4/+9
| |\
| | * Merge rest servlets into the client json resource objectMark Haines2015-01-232-4/+9