Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix tests | David Baker | 2015-08-04 | 1 | -1/+2 |
| | |||||
* | 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 |
| | |||||
* | Consolidate duplicate code in notifier | Erik Johnston | 2015-07-02 | 1 | -10/+10 |
| | |||||
* | Add receipts_key to StreamToken | Erik Johnston | 2015-07-02 | 1 | -2/+2 |
| | |||||
* | Fix bug where synapse was sending AS user queries incorrectly. | Kegan Dougal | 2015-06-17 | 1 | -0/+43 |
| | | | | | | Bug introduced in 92b20713d7c6346aeb20dc09963081e472752bb5 which reversed the comparison when checking if a user existed in the users table. Added UTs to prevent this happening again. | ||||
* | Fix tests | Erik Johnston | 2015-06-12 | 1 | -0/+2 |
| | |||||
* | Merge pull request #180 from matrix-org/erikj/prev_state_context | Erik Johnston | 2015-06-03 | 1 | -0/+2 |
|\ | | | | | Don't needlessly compute prev_state | ||||
| * | Don't needlessly compute prev_state | Erik Johnston | 2015-06-03 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #179 from matrix-org/erikj/state_group_outliers | Erik Johnston | 2015-06-03 | 1 | -2/+2 |
|\ \ | | | | | | | Don't compute EventContext for outliers. | ||||
| * | | Don't needlessly compute context | Erik Johnston | 2015-06-03 | 1 | -2/+2 |
| |/ | |||||
* / | Caches should be bound to instances. | Erik Johnston | 2015-06-03 | 2 | -36/+50 |
|/ | | | | | Before, caches were global and so different instances of the stores would share caches. This caused problems in the unit tests. | ||||
* | Fix the presence tests | Mark Haines | 2015-05-22 | 3 | -17/+23 |
| | |||||
* | Merge pull request #157 from matrix-org/markjh/presence_performance | Mark Haines | 2015-05-22 | 2 | -10/+6 |
|\ | | | | | Improve presence performance in loadtest | ||||
| * | Fix the presence tests | Mark Haines | 2015-05-20 | 2 | -10/+6 |
| | | |||||
* | | Make the appservice use 'users_in_room' rather than get_room_members since ↵ | Mark Haines | 2015-05-22 | 1 | -12/+3 |
| | | | | | | | | it is cached | ||||
* | | Oops, get_rooms_for_user returns a namedtuple, not a room_id | Mark Haines | 2015-05-21 | 1 | -1/+6 |
| | | |||||
* | | Merge pull request #155 from matrix-org/erikj/perf | Erik Johnston | 2015-05-21 | 1 | -1/+2 |
|\ \ | |/ |/| | Bulk and batch retrieval of events. | ||||
| * | Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-05-18 | 2 | -48/+13 |
| |\ | | | | | | | | | | erikj/perf | ||||
| * | | Fix daedlock | Erik Johnston | 2015-05-15 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'develop' into notifier_performance | Mark Haines | 2015-05-18 | 2 | -48/+13 |
|\ \ \ | | |/ | |/| | |||||
| * | | Remove unused arguments and doc PresenceHandler.push_update_to_clients | Mark Haines | 2015-05-14 | 2 | -48/+13 |
| |/ | |||||
* | | Discard unused NotifierUserStreams | Mark Haines | 2015-05-13 | 2 | -0/+4 |
| | | |||||
* | | Don't bother checking for updates if the stream token hasn't advanced for a user | Mark Haines | 2015-05-13 | 5 | -17/+24 |
|/ | |||||
* | Add support for using executemany | Erik Johnston | 2015-05-05 | 1 | -2/+2 |
| | |||||
* | 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-24 | 1 | -0/+65 |
| |\ | | | | | | | | | | | | | Conflicts: synapse/http/server.py | ||||
| * \ | Merge branch 'develop' into csauth | David Baker | 2015-04-17 | 7 | -61/+677 |
| |\ \ | |||||
| * | | | Fix tests | David Baker | 2015-03-24 | 5 | -14/+14 |
| | | | | |||||
| * | | | Don't test exact equality of the list: as long as it has the fields we ↵ | David Baker | 2015-03-24 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | expect, that's just fine. I added the user_id (as in database pkey) and it broke: no point testing what that comes out as: it's determined by the db. | ||||
* | | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-27 | 1 | -0/+65 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Remove users from the remote_offline_serials list (and clean up empty ↵ | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -0/+27 |
| | | | | | | | | | | | | | | | | elements) when they go online again | ||||
| * | | | Store a list of the presence serial number at which remote users went ↵ | Paul "LeoNerd" Evans | 2015-04-23 | 1 | -0/+38 |
| | |/ | |/| | | | | | | | offline, so that when we delete them from the cachemap, we can still synthesize OFFLINE events for them (SYN-261) | ||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into postgres | Erik Johnston | 2015-04-17 | 2 | -8/+24 |
|\| | | |||||
| * | | Various minor fixes to unit-test structure around typing notifications | Paul "LeoNerd" Evans | 2015-04-15 | 2 | -2/+11 |
| | | | |||||
| * | | Have TypingNotificationEventSource.get_new_events_for_user() return a ↵ | Paul "LeoNerd" Evans | 2015-04-15 | 2 | -7/+14 |
| | | | | | | | | | | | | deferred, for consistency and extensibility | ||||
* | | | Fix tests after commit 9a0579 | Erik Johnston | 2015-04-08 | 1 | -0/+6 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into mysql | Erik Johnston | 2015-04-07 | 5 | -56/+691 |
|\| | | |||||
| * | | Merge branch 'develop' into application-services-registration-script | Kegan Dougal | 2015-04-01 | 1 | -0/+13 |
| |\ \ | |||||
| | * | | Fix thinko whereby events *for the AS specifically* were not passed on. | Kegan Dougal | 2015-03-31 | 1 | -0/+13 |
| | | | | | | | | | | | | | | | | | | | | This was caused by not explicitly checking the service.sender field. This has now been fixed and a regression test has been added. | ||||
| * | | | Use a sender localpart instead of a user ID. | Kegan Dougal | 2015-03-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Form the user ID at runtime instead, This gives less room for error in AS config files since they cannot specify the domain of another HS. | ||||
| * | | | Edit SQL schema to use string IDs not ints. Use token as ID. Update tests. | Kegan Dougal | 2015-03-31 | 1 | -15/+23 |
| | | | | |||||
| * | | | Fix tests and missing returns on deferreds. | Kegan Dougal | 2015-03-31 | 1 | -12/+29 |
| | | | | |||||
| * | | | Remove more reg/unreg methods. Read config not database for cache. | Kegan Dougal | 2015-03-31 | 1 | -39/+0 |
| |/ / | |||||
| * | | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-26 | 3 | -3/+75 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py | ||||
| | * | | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict() | Paul "LeoNerd" Evans | 2015-03-25 | 1 | -0/+22 |
| | | | | |||||
| | * | | Unit-test that Cache() key eviction is ordered | Paul "LeoNerd" Evans | 2015-03-25 | 1 | -0/+18 |
| | |/ | |||||
| | * | Pull out the cache logic from the @cached wrapper into its own class we can ↵ | Paul "LeoNerd" Evans | 2015-03-20 | 1 | -1/+33 |
| | | | | | | | | | | | | reuse | ||||
| * | | Implement ServiceQueuer with tests. | Kegan Dougal | 2015-03-16 | 1 | -7/+47 |
| | | | |||||
| * | | Replace EventGrouper for ServiceQueuer to move to push-based txns. Fix tests ↵ | Kegan Dougal | 2015-03-16 | 1 | -73/+27 |
| | | | | | | | | | | | | and add stub tests for ServiceQueuer. | ||||
| * | | Minor PR comment tweaks. | Kegan Dougal | 2015-03-16 | 1 | -5/+5 |
| | | | |||||
| * | | Merge branch 'develop' into application-services-txn-reliability | Kegan Dougal | 2015-03-16 | 5 | -10/+171 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/appservice.py | ||||
| * | | | Use event IDs instead of dumping event content in the txns table. | Kegan Dougal | 2015-03-09 | 1 | -13/+17 |
| | | | | |||||
| * | | | Use seconds; start gluing in the AS scheduler into the AS handler. | Kegan Dougal | 2015-03-09 | 2 | -7/+10 |
| | | | | |||||
| * | | | Finish appservice txn storage impl and tests. | Kegan Dougal | 2015-03-09 | 1 | -0/+68 |
| | | | | |||||
| * | | | Implement create_appservice_txn with tests. | Kegan Dougal | 2015-03-09 | 1 | -0/+67 |
| | | | | |||||
| * | | | Partially implement txn store methods with tests. | Kegan Dougal | 2015-03-09 | 1 | -2/+169 |
| | | | | |||||
| * | | | Update UTs | Kegan Dougal | 2015-03-06 | 1 | -5/+5 |
| | | | | |||||
| * | | | Apply clarity and docstrings | Kegan Dougal | 2015-03-06 | 1 | -1/+1 |
| | | | | |||||
| * | | | Finish synapse.appservice.scheduler implementation. | Kegan Dougal | 2015-03-06 | 1 | -2/+113 |
| | | | | | | | | | | | | | | | | | | | | With tests to assert behaviour. Not hooked up yet. Stub datastore methods not implemented yet. | ||||
| * | | | Flesh out more stub functions. | Kegan Dougal | 2015-03-06 | 1 | -2/+3 |
| | | | | |||||
| * | | | Add more tests; fix bugs. | Kegan Dougal | 2015-03-06 | 1 | -7/+47 |
| | | | | |||||
| * | | | Start adding some tests | Kegan Dougal | 2015-03-06 | 1 | -0/+106 |
| | | | | |||||
* | | | | Make work in both Maria and SQLite. Fix tests | Erik Johnston | 2015-04-01 | 10 | -52/+83 |
| |_|/ |/| | | |||||
* | | | Tidy up _simple_... methods | Erik Johnston | 2015-03-20 | 2 | -2/+2 |
| |/ |/| | |||||
* | | Add an .inc_by() method to CounterMetric; implement DistributionMetric a ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -3/+2 |
| | | | | | | | | neater way | ||||
* | | Rename TimerMetric to DistributionMetric; as it could count more than just time | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -12/+12 |
| | | |||||
* | | Export CacheMetric as hits+total, rather than hits+misses, as it's easier to ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -3/+3 |
| | | | | | | | | derive hit ratio from that | ||||
* | | Prometheus needs "escaped" label values | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -27/+27 |
| | | |||||
* | | Bugfix to rendering output of vectored TimerMetrics | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -4/+4 |
| | | |||||
* | | Rename Metrics' "keys" to "labels" | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -3/+3 |
| | | |||||
* | | Initial hack at a TimerMetric; for storing counts + duration accumulators | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+35 |
| | | |||||
* | | Implement vector CallbackMetrics | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+17 |
| | | |||||
* | | Rename CacheCounterMetric to just CacheMetric; add a CallbackMetric ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -9/+15 |
| | | | | | | | | component to give the size of the cache | ||||
* | | Initial attempt at a scalar callback-based metric to give instantaneous ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+21 |
| | | | | | | | | snapshot gauges | ||||
* | | Create the concept of a cachecounter metric; generating two counters ↵ | Paul "LeoNerd" Evans | 2015-03-12 | 1 | -1/+26 |
| | | | | | | | | specific to caches | ||||
* | | Initial tiny attempt at (vectorable) counter metrics | Paul "LeoNerd" Evans | 2015-03-12 | 2 | -0/+61 |
| | | |||||
* | | Fix tests | Erik Johnston | 2015-03-09 | 3 | -10/+10 |
|/ | |||||
* | Merge pull request #93 from matrix-org/application-services-exclusive | Kegsay | 2015-03-02 | 2 | -19/+80 |
|\ | | | | | Application services exclusive flag support | ||||
| * | Add more unit tests for exclusive namespaces. | Kegan Dougal | 2015-02-27 | 2 | -2/+50 |
| | | |||||
| * | Update unit tests to use new format. | Kegan Dougal | 2015-02-27 | 2 | -19/+32 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu | Erik Johnston | 2015-03-02 | 2 | -0/+113 |
|\ \ | |||||
| * | | Fix unit tests | Kegan Dougal | 2015-02-27 | 1 | -0/+3 |
| |/ | |||||
| * | Use cache.pop() instead of a separate membership test + del [] | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -0/+7 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into ↵ | Paul "LeoNerd" Evans | 2015-02-23 | 2 | -0/+2 |
| |\ | | | | | | | | | | performance-cache-improvements | ||||
| * | | Allow @cached-wrapped functions to have a prefill method for setting entries | Paul "LeoNerd" Evans | 2015-02-23 | 1 | -0/+14 |
| | | | |||||
| * | | Take named arguments to @cached() decorator, add a 'max_entries' limit | Paul "LeoNerd" Evans | 2015-02-19 | 1 | -0/+89 |
| | | | |||||
* | | | Fix presence tests | Erik Johnston | 2015-02-23 | 1 | -15/+28 |
| |/ |/| | |||||
* | | Update tests | Erik Johnston | 2015-02-19 | 2 | -0/+2 |
|/ | |||||
* | Use git aware version string in User-Agent and Server headers | Erik Johnston | 2015-02-18 | 1 | -2/+8 |
| | |||||
* | Merge pull request #50 from matrix-org/application-services | Mark Haines | 2015-02-13 | 7 | -1/+532 |
|\ | | | | | Application Services | ||||
| * | Fix tests which broke when event caching was introduced. | Kegan Dougal | 2015-02-11 | 1 | -1/+4 |
| | | |||||
| * | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-11 | 26 | -362/+200 |
| |\ | |||||
| * | | Notify ASes for events sent by other users in a room which an AS user is a ↵ | Kegan Dougal | 2015-02-11 | 1 | -0/+25 |
| | | | | | | | | | | | | part of. | ||||
| * | | Remove unused imports. | Kegan Dougal | 2015-02-09 | 1 | -2/+2 |
| | | | |||||
| * | | Modify auth.get_user_by_req for authing appservices directly. | Kegan Dougal | 2015-02-09 | 3 | -1/+145 |
| | | | | | | | | | | | | | | | | | | 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) | ||||
| * | | Dependency inject ApplicationServiceApi when creating ↵ | Kegan Dougal | 2015-02-05 | 1 | -7/+3 |
| | | | | | | | | | | | | ApplicationServicesHandler. | ||||
| * | | Merge branch 'develop' into application-services | Kegan Dougal | 2015-02-05 | 1 | -1/+4 |
| |\ \ | |||||
| * | | | Fix unit tests. | Kegan Dougal | 2015-02-05 | 1 | -2/+5 |
| | | | | |||||
| * | | | Add unit test for appservice_handler.query_room_alias_exists | Kegan Dougal | 2015-02-05 | 1 | -1/+30 |
| | | | | |||||
| * | | | Add unknown user ID check. Use store.get_aliases_for_room(room_id) when ↵ | Kegan Dougal | 2015-02-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | searching for services by alias. | ||||
| * | | | Add hs_token column and generate a different token f.e application service. | Kegan Dougal | 2015-02-05 | 1 | -4/+6 |
| | | | | |||||
| * | | | Fix bug in store defer. Add more unit tests. | Kegan Dougal | 2015-02-04 | 3 | -5/+193 |
| | | | | |||||
| * | | | Begin to add unit tests for appservice glue and regex testing. | Kegan Dougal | 2015-02-04 | 3 | -0/+140 |
| | | | | |||||
* | | | | Merge pull request #62 from matrix-org/state-chache | Erik Johnston | 2015-02-11 | 1 | -1/+6 |
|\ \ \ \ | |_|_|/ |/| | | | State chache | ||||
| * | | | Fix tests | Erik Johnston | 2015-02-09 | 1 | -1/+6 |
| | |/ | |/| | |||||
* | | | Add a cache for get_event | Mark Haines | 2015-02-11 | 2 | -2/+4 |
| | | | |||||
* | | | Add a lru cache class | Mark Haines | 2015-02-11 | 1 | -0/+56 |
| | | | |||||
* | | | Factor out some of the common homeserver setup code into a | Mark Haines | 2015-02-11 | 25 | -360/+140 |
|/ / | | | | | | | setup_test_homeserver function in utils. | ||||
* / | Try to ensure we don't persist an event we have already persisted. In ↵ | Erik Johnston | 2015-02-03 | 1 | -1/+4 |
|/ | | | | persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering. | ||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 3 | -3/+614 |
|\ | | | | | | | | | Conflicts: synapse/storage/schema/im.sql | ||||
| * | Merge pull request #37 from matrix-org/client_v2_filter | Erik Johnston | 2015-01-30 | 3 | -3/+614 |
| |\ | | | | | | | Client v2 filter | ||||
| | * | Create a separate filter object to do the actual filtering, so that we can | Mark Haines | 2015-01-29 | 1 | -51/+57 |
| | | | | | | | | | | | | | | | split the storage and management of filters from the actual filter code and don't have to load a filter from the db each time we filter an event | ||||
| | * | Merge in auth changes from develop | Mark Haines | 2015-01-29 | 1 | -0/+1 |
| | | | |||||
| | * | Merge changes from develop | Mark Haines | 2015-01-29 | 5 | -4/+20 |
| | |\ | |||||
| | * | | Add filter_room_state unit tests. | Kegan Dougal | 2015-01-29 | 1 | -0/+56 |
| | | | | |||||
| | * | | Add basic filtering public API unit tests. Use defers in the right places. | Kegan Dougal | 2015-01-29 | 1 | -1/+53 |
| | | | | |||||
| | * | | Add more unit tests for the filter algorithm. | Kegan Dougal | 2015-01-29 | 1 | -5/+259 |
| | | | | |||||
| | * | | Implement filter algorithm. Add basic event type unit tests to assert it works. | Kegan Dougal | 2015-01-29 | 1 | -1/+44 |
| | | | | |||||
| | * | | Add filter JSON sanity checks. | Kegan Dougal | 2015-01-28 | 1 | -4/+20 |
| | | | | |||||
| | * | | Initial stab at real SQL storage implementation of user filter definitions | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -1/+18 |
| | | | | |||||
| | * | | 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 | ||||
| | * | | Have the Filtering API return Deferreds, so we can do the Datastore ↵ | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | implementation nicely | ||||
| | * | | Initial trivial unittest of Filtering object | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+67 |
| | | | | |||||
| | * | | 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 |
| | |\ \ | |||||
| | * | | | 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 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2015-01-30 | 26 | -418/+415 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | new_state_resolution | ||||
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-30 | 6 | -4/+80 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql | ||||
| * | | | | Merge pull request #36 from matrix-org/device_id_from_access_token | Mark Haines | 2015-01-28 | 5 | -4/+20 |
| |\ \ \ \ | | |_|_|/ | |/| | | | 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 | 4 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | 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 |
| | | |/ | | |/| | |||||
| * / | | Initial cut of a shared base class for REST unit tests | Paul "LeoNerd" Evans | 2015-01-27 | 1 | -0/+45 |
| |/ / | |||||
| * | | Create (empty) v2_alpha REST tests directory | Paul "LeoNerd" Evans | 2015-01-26 | 1 | -0/+15 |
| | | | |||||
* | | | Initial implementation of auth conflict resolution | Erik Johnston | 2015-01-29 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections | Erik Johnston | 2015-01-23 | 24 | -416/+337 |
|\| | | |/ |/| | |||||
| * | Replace hs.parse_roomalias with RoomAlias.from_string | Mark Haines | 2015-01-23 | 4 | -13/+8 |
| | | |||||
| * | Replace hs.parse_roomid with RoomID.from_string | Mark Haines | 2015-01-23 | 5 | -11/+12 |
| | | |||||
| * | Replace hs.parse_userid with UserID.from_string | Mark Haines | 2015-01-23 | 16 | -70/+74 |
| | | |||||
| * | Merge pull request #31 from matrix-org/client_api_resource | Mark Haines | 2015-01-23 | 2 | -4/+9 |
| |\ | | | | | | | Merge rest servlets into the client json resource object | ||||
| | * | Merge rest servlets into the client json resource object | Mark Haines | 2015-01-23 | 2 | -4/+9 |
| | | | |||||
| * | | Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it ↵ | Paul "LeoNerd" Evans | 2015-01-22 | 1 | -3/+3 |
| | | | | | | | | | | | | is still presence-specific | ||||
| * | | Much merging of test case setUp() methods to make them much more | Paul "LeoNerd" Evans | 2015-01-22 | 1 | -273/+193 |
| |/ | | | | | | | shareable | ||||
| * | Move client rest tests back under rest | Mark Haines | 2015-01-22 | 9 | -5/+19 |
| | | |||||
| * | Move rest APIs back under the rest directory | Mark Haines | 2015-01-22 | 3 | -16/+16 |
| | | |||||
| * | Move client v1 api rest servlets into a "client/v1" directory | Mark Haines | 2015-01-22 | 8 | -21/+35 |
| | | |||||
| * | Fix manifest. Ignore contrib and docs directories when checking manifest ↵ | Mark Haines | 2015-01-22 | 1 | -5/+0 |
| | | | | | | | | against source control. | ||||
| * | Abstract out the room ID from presence tests, so it's stored in self | Paul "LeoNerd" Evans | 2015-01-21 | 1 | -8/+10 |
| | | |||||
| * | Use common base class for two Presence unit-tests, avoiding boilerplate ↵ | Paul "LeoNerd" Evans | 2015-01-21 | 1 | -54/+25 |
| | | | | | | | | copypasta | ||||
* | | Implement new state resolution algorithm | Erik Johnston | 2015-01-21 | 1 | -71/+357 |
|/ | |||||
* | Finish renaming "context" to "room_id" in federation codebase | Mark Haines | 2015-01-16 | 1 | -2/+2 |
| | |||||
* | Have MockClock detect attempts to cancel expired timers, to prevent a repeat ↵ | Paul "LeoNerd" Evans | 2015-01-13 | 1 | -4/+16 |
| | | | | of SYN-230 | ||||
* | Remove unused functions | Mark Haines | 2015-01-13 | 1 | -11/+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 | ||||
* | Don't make @unittest.DEBUG print the huge amount of verbosity generated by ↵ | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -0/+2 |
| | | | | the synapse.storage loggers | ||||
* | Check that setting typing notification still works after explicit timeout - ↵ | Paul "LeoNerd" Evans | 2015-01-12 | 1 | -0/+26 |
| | | | | SYN-230 | ||||
* | Update tests | Kegan Dougal | 2015-01-07 | 1 | -1/+1 |
| | |||||
* | Mock ratelimiter to make tests pass. | Kegan Dougal | 2014-12-19 | 2 | -4/+16 |
| | |||||
* | Supply auth_chain along with current state in '/state/', fetch auth events ↵ | Mark Haines | 2014-12-18 | 1 | -0/+2 |
| | | | | from a remote server if we are missing some of them | ||||
* | Replace distributor deferred list, with a simple for loop until I understand ↵ | Mark Haines | 2014-12-18 | 1 | -8/+19 |
| | | | | why the former breaks and the latter doesn't | ||||
* | Construct the EventContext in the state handler rather than constructing one ↵ | Mark Haines | 2014-12-16 | 3 | -36/+34 |
| | | | | and then immediately calling state_handler.annotate_context_with_state | ||||
* | Remove annotate_event_with_state as nothing was using it. Update state tests ↵ | Mark Haines | 2014-12-16 | 1 | -69/+39 |
| | | | | to call annotate_context_with_state | ||||
* | Kill off synapse.api.events.* | Erik Johnston | 2014-12-16 | 9 | -284/+35 |
| | |||||
* | Rename MessageHandler.handle_event. Add a few comments. | Erik Johnston | 2014-12-15 | 1 | -2/+3 |
| | |||||
* | Get current member state from current_state snapshot. Fix leave test. | Erik Johnston | 2014-12-15 | 1 | -1/+12 |
| | |||||
* | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-15 | 4 | -26/+287 |
|\ | | | | | | | | | 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 | 2 | -6/+18 |
| | | | | | | | | m.typing stream events have a toplevel content, for consistency with others | ||||
| * | Add a 'user_left_room' distributor signal analogous to 'user_joined_room' | Paul "LeoNerd" Evans | 2014-12-11 | 1 | -3/+41 |
| | | |||||
| * | Actually auth-check to ensure people can only send typing notifications for ↵ | Paul "LeoNerd" Evans | 2014-12-11 | 1 | -0/+10 |
| | | | | | | | | rooms they're actually in | ||||
| * | 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 |
| | | |||||
| * | Hook up the event stream to typing notifications | Paul "LeoNerd" Evans | 2014-12-10 | 1 | -0/+60 |
| | | |||||
| * | Store serial numbers per room for typing event stream purposes | Paul "LeoNerd" Evans | 2014-12-10 | 1 | -30/+16 |
| | | |||||
| * | First hack at implementing timeouts in typing notification handler | Paul "LeoNerd" Evans | 2014-12-10 | 1 | -3/+33 |
| | | |||||
* | | Fix tests and remove debug logging | Erik Johnston | 2014-12-12 | 1 | -2/+7 |
| | | |||||
* | | Fix membership handler test | Erik Johnston | 2014-12-12 | 1 | -82/+97 |
| | | |||||
* | | 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 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor | Erik Johnston | 2014-12-11 | 2 | -0/+99 |
|\| | | | | | | | | | Conflicts: setup.py | ||||
| * | Implement .cancel_call_later() in MockClock | Paul "LeoNerd" Evans | 2014-12-10 | 2 | -2/+23 |
| | | |||||
| * | Implement .call_later() in MockClock | Paul "LeoNerd" Evans | 2014-12-10 | 2 | -0/+48 |
| | | |||||
| * | Trivial test of MockClock() | Paul "LeoNerd" Evans | 2014-12-10 | 1 | -0/+30 |
| | | |||||
* | | Fix replication tests | Erik Johnston | 2014-12-11 | 1 | -12/+6 |
| | | |||||
* | | Fix federation test | Erik Johnston | 2014-12-11 | 1 | -18/+24 |
| | | |||||
* | | Fix room creation test | Erik Johnston | 2014-12-11 | 1 | -34/+34 |
| | | |||||
* | | Fix prev_content | Erik Johnston | 2014-12-11 | 1 | -3/+2 |
| | | |||||
* | | Fix redaction tests | Erik Johnston | 2014-12-11 | 1 | -6/+8 |
| | | |||||
* | | Fix redactions. Fix 'age' key | Erik Johnston | 2014-12-11 | 1 | -3/+3 |
| | | |||||
* | | Fix some tests | Erik Johnston | 2014-12-10 | 5 | -130/+120 |
|/ | |||||
* | Add newline back in | Erik Johnston | 2014-12-10 | 1 | -0/+1 |
| | |||||
* | Remove whitespace | Erik Johnston | 2014-12-10 | 1 | -1/+1 |
| | |||||
* | fix UTs by telling all the mock stores about the new methods for tracking ↵ | Matthew Hodgson | 2014-12-09 | 4 | -3/+23 |
| | | | | retries | ||||
* | Fix bugs when joining a remote room that has dodgy event graphs. This should ↵ | Erik Johnston | 2014-11-27 | 1 | -1/+5 |
| | | | | also fix the number of times a HS will trigger a GET /event/ | ||||
* | Fix tests. | Erik Johnston | 2014-11-26 | 1 | -1/+1 |
| | |||||
* | Fix bugs in invite/join dances. | Erik Johnston | 2014-11-25 | 2 | -7/+21 |
| | | | | | We now do more implement more of the auth on the events so that we don't reject valid events. | ||||
* | SYN-163: Add an order by rowid to selects. | Erik Johnston | 2014-11-24 | 1 | -4/+8 |
| | | | | | | | This should fix the bug where the edges of the graph get returned in a different order than they were inserted in, and so no get_event no longer returned the exact same JSON as was inserted. This meant that signature checks failed. | ||||
* | Fix tests from prev commit | Erik Johnston | 2014-11-19 | 1 | -1/+0 |
| | |||||
* | Initialise UserPresenceCache instances to always contain a 'presence' key | Paul "LeoNerd" Evans | 2014-11-19 | 1 | -2/+8 |
| | |||||
* | replace user_id with sender | Mark Haines | 2014-11-19 | 2 | -1/+5 |
| | |||||
* | 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 | 21 | -1203/+748 |
|\ | | | | | | | | | Conflicts: synapse/handlers/message.py | ||||
| * | Merge PDUs and Events into one object | Mark Haines | 2014-11-14 | 2 | -6/+7 |
| | | |||||
| * | Validate signatures on incoming events | Mark Haines | 2014-11-14 | 1 | -1/+3 |
| | | |||||
| * | Merge branch 'develop' into request_logging | Mark Haines | 2014-11-14 | 20 | -1166/+687 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: setup.py synapse/storage/_base.py synapse/util/async.py | ||||
| | * | SYN-103: Remove "origin" and "destination" keys from edus | Mark Haines | 2014-11-13 | 3 | -9/+0 |
| | | | |||||
| | * | Fix bugs with invites/joins across federatiom. | Erik Johnston | 2014-11-12 | 1 | -13/+9 |
| | | | | | | | | | | | | | | | Both in terms of auth and not trying to fetch missing PDUs for invites, joins etc. | ||||
| | * | Only allow people in a room to look up room state. | Erik Johnston | 2014-11-11 | 1 | -8/+8 |
| | | | |||||
| | * | Rename annotate_state_groups to annotate_event_with_state | Erik Johnston | 2014-11-11 | 3 | -13/+13 |
| | | | |||||
| | * | Fix state tests | Erik Johnston | 2014-11-11 | 1 | -517/+176 |
| | | | |||||
| | * | Fix validation tests | Erik Johnston | 2014-11-11 | 1 | -12/+43 |
| | | | |||||
| | * | 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 |
| | | | |||||
| | * | Fix SQLBaseStoreTestCase | Erik Johnston | 2014-11-10 | 1 | -1/+1 |
| | | | |||||
| | * | Fix stream test. | Erik Johnston | 2014-11-10 | 1 | -5/+12 |
| | | | |||||
| | * | Fix room_member storage test | Erik Johnston | 2014-11-10 | 1 | -0/+2 |
| | | | |||||
| | * | Fix redaction storage test | Erik Johnston | 2014-11-10 | 1 | -0/+4 |
| | | | |||||
| | * | Fix room handler test | Erik Johnston | 2014-11-10 | 1 | -15/+40 |
| | | | |||||
| | * | Fix a couple more storage tests | Erik Johnston | 2014-11-05 | 2 | -16/+32 |
| | | | |||||
| | * | Remove stale tests | Erik Johnston | 2014-11-05 | 1 | -2/+2 |
| | | | |||||
| | * | Fix redaction storage test | Erik Johnston | 2014-11-05 | 1 | -0/+12 |
| | | | |||||
| | * | Fix typing tests | Erik Johnston | 2014-11-05 | 1 | -0/+1 |
| | | | |||||
| | * | Fix room tests | Erik Johnston | 2014-11-05 | 1 | -6/+0 |
| | | | |||||
| | * | Fix profile tests | Erik Johnston | 2014-11-05 | 1 | -1/+5 |
| | | | |||||
| | * | Fix presencelike test | Erik Johnston | 2014-11-05 | 1 | -1/+5 |
| | | | |||||
| | * | Don't execute empty tests. Formatting. | Erik Johnston | 2014-11-05 | 1 | -17/+28 |
| | | | |||||
| | * | Fix presence test | Erik Johnston | 2014-11-05 | 1 | -0/+1 |
| | | | |||||
| | * | Fix Federation test | Erik Johnston | 2014-11-05 | 1 | -1/+1 |
| | | | |||||
| | * | PEP8 | Erik Johnston | 2014-11-04 | 1 | -4/+4 |
| | | | |||||
| | * | Fix room handler tests | Erik Johnston | 2014-11-04 | 1 | -127/+19 |
| | | | |||||
| | * | Fix federation handler tests. I've removed the invite/join dance ones as ↵ | Erik Johnston | 2014-11-04 | 1 | -57/+27 |
| | | | | | | | | | | | | they are completely out of date. | ||||
| | * | PEP8 | Erik Johnston | 2014-11-04 | 1 | -1/+3 |
| | | | |||||
| | * | Fix tests.handlers.test_directory | Erik Johnston | 2014-11-04 | 1 | -2/+5 |
| | | | |||||
| | * | event <-> pdu mappings are now trivial and will soon be scrapped | Erik Johnston | 2014-11-04 | 1 | -167/+0 |
| | | | |||||
| | * | Fix up federation tests | Erik Johnston | 2014-11-04 | 1 | -114/+124 |
| | | | |||||
| | * | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2014-10-30 | 1 | -0/+16 |
| | |\ | | | | | | | | | | | | | federation_authorization | ||||
| | * \ | Merge branch 'develop' into event_signing | Mark Haines | 2014-10-17 | 6 | -13/+13 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/federation/replication.py | ||||
| | * | | | Include hashes of previous pdus when referencing them | Mark Haines | 2014-10-16 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | Sign outgoing PDUs. | Mark Haines | 2014-10-16 | 5 | -15/+48 |
| | | | | | |||||
| | * | | | persist hashes and origin signatures for PDUs | Mark Haines | 2014-10-15 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Merge branch 'develop' into request_logging | Mark Haines | 2014-10-30 | 1 | -0/+16 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Conflicts: synapse/config/logger.py | ||||
| * | | | | Add a request-id to each log line | Mark Haines | 2014-10-30 | 1 | -0/+43 |
| | |_|/ | |/| | | |||||
* | | | | 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 |
| |/ / |/| | |