David Baker
|
ed72fc3a50
|
Merge branch 'develop' into pushrules2
Conflicts:
synapse/storage/schema/pusher.sql
|
2015-03-04 15:24:21 +00:00 |
|
Erik Johnston
|
d56c01fff4
|
Note that we don't specify execution order
|
2015-03-04 15:10:05 +00:00 |
|
Erik Johnston
|
17d319a20d
|
s/schema_deltas/applied_schema_deltas/
|
2015-03-04 15:06:22 +00:00 |
|
David Baker
|
92b3dc3219
|
Merge branch 'develop' into pushrules2
|
2015-03-04 14:56:41 +00:00 |
|
Erik Johnston
|
5681264faa
|
s/%r/%s/
|
2015-03-04 14:21:53 +00:00 |
|
Erik Johnston
|
f701197227
|
Add example directory structures in doc
|
2015-03-04 14:20:14 +00:00 |
|
David Baker
|
2a45f3d448
|
Use if not results rather than len, as per feedback.
|
2015-03-04 14:17:59 +00:00 |
|
Erik Johnston
|
16dd87d848
|
Don't assume db conn is a Context Manager.
Twisted adbapi wrapped connections aren't context managers.
|
2015-03-04 14:03:41 +00:00 |
|
Erik Johnston
|
5eefd1f618
|
Add unique constraint on schema_version.lock schema. Use conflict clause in sql.
|
2015-03-04 13:52:18 +00:00 |
|
Erik Johnston
|
b4c38738f4
|
Change to use logger in db upgrade script
|
2015-03-04 13:43:35 +00:00 |
|
Erik Johnston
|
640e53935d
|
Use context manager with db conn to correctly commit and rollback
|
2015-03-04 13:43:17 +00:00 |
|
Erik Johnston
|
8c8354e85a
|
Actually add full_schemas dir
|
2015-03-04 13:34:38 +00:00 |
|
Erik Johnston
|
c3530c3fb3
|
More docs. Rename 'schema/current' to 'schema/full_schemas'
|
2015-03-04 13:34:11 +00:00 |
|
Erik Johnston
|
811355ccd0
|
Add some docs and remove unused variables
|
2015-03-04 13:11:01 +00:00 |
|
Erik Johnston
|
82b34e813d
|
SYN-67: Finish up implementing new database schema management
|
2015-03-04 12:04:19 +00:00 |
|
Erik Johnston
|
8d33adfbbb
|
SYN-67: Begin changing the way we handle schema versioning
|
2015-03-02 18:23:55 +00:00 |
|
David Baker
|
6fab7bd2c1
|
s/user_name/user/ as per mjark's comment
|
2015-03-02 18:17:19 +00:00 |
|
Erik Johnston
|
9f03553f48
|
Add missing comma
|
2015-03-02 16:38:40 +00:00 |
|
Erik Johnston
|
b41dc68773
|
We purposefully don't have a version 14 delta script.
|
2015-03-02 16:36:19 +00:00 |
|
David Baker
|
20436cdf75
|
Blank lines
|
2015-03-02 15:58:12 +00:00 |
|
Kegsay
|
8ad024ea80
|
Merge pull request #93 from matrix-org/application-services-exclusive
Application services exclusive flag support
|
2015-03-02 14:56:32 +00:00 |
|
Erik Johnston
|
0a036944bd
|
Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu
|
2015-03-02 13:53:30 +00:00 |
|
Kegan Dougal
|
c3c01641d2
|
Run deltas and bump user_version in upgrade script
|
2015-03-02 13:38:57 +00:00 |
|
Kegan Dougal
|
cb97ea3ec2
|
PEP8
|
2015-03-02 11:23:46 +00:00 |
|
Kegan Dougal
|
377ae369c1
|
Wrap all of get_app_service_rooms in a txn.
|
2015-03-02 11:20:51 +00:00 |
|
Kegan Dougal
|
b216b36892
|
JOIN state_events rather than parsing unrecognized_keys to pull out member state_keys
|
2015-03-02 10:41:35 +00:00 |
|
Kegan Dougal
|
3d73383d18
|
Modify _simple_select_list to allow an empty WHERE clause. Use it for get_all_rooms and get_all_users.
|
2015-03-02 10:16:24 +00:00 |
|
Kegan Dougal
|
ebc4830666
|
PR tweaks: set earlier on and use 'as json' for compat
|
2015-03-02 09:53:00 +00:00 |
|
Kegan Dougal
|
16b90764ad
|
Convert expected format for AS regex to include exclusivity.
Previously you just specified the regex as a string, now it expects a JSON
object with a 'regex' key and an 'exclusive' boolean, as per spec.
|
2015-02-27 10:44:32 +00:00 |
|
Kegan Dougal
|
806a6c886a
|
PEP8
|
2015-02-27 09:48:57 +00:00 |
|
David Baker
|
1959088156
|
Add API for getting/setting enabled-ness of push rules.
|
2015-02-26 18:07:44 +00:00 |
|
Kegan Dougal
|
f0995436e7
|
Check for membership invite events correctly.
|
2015-02-26 17:21:17 +00:00 |
|
Kegan Dougal
|
dcec7175dc
|
Finish impl to get new events for AS. ASes should now be able to poll /events
|
2015-02-26 16:23:01 +00:00 |
|
Kegan Dougal
|
92478e96d6
|
Finish impl to extract all room IDs an AS may be interested in when polling the event stream.
|
2015-02-26 14:35:28 +00:00 |
|
David Baker
|
944003021b
|
whitespace
|
2015-02-26 13:43:05 +00:00 |
|
David Baker
|
94fa334b01
|
Add enable/disable overlay for push rules (REST API not yet hooked up)
|
2015-02-25 19:17:07 +00:00 |
|
Kegan Dougal
|
29267cf9d7
|
PEP8 and pyflakes
|
2015-02-25 17:42:28 +00:00 |
|
Kegan Dougal
|
978ce87c86
|
Comment unused variables.
|
2015-02-25 17:37:48 +00:00 |
|
Kegan Dougal
|
2c79c4dc7f
|
Fix alias query.
|
2015-02-25 17:37:14 +00:00 |
|
Kegan Dougal
|
2b8ca84296
|
Add support for extracting matching room_ids and room_aliases for a given AS.
|
2015-02-25 17:15:25 +00:00 |
|
Kegan Dougal
|
2d20466f9a
|
Add stub functions and work out execution flow to implement AS event stream polling.
|
2015-02-25 15:00:59 +00:00 |
|
Paul "LeoNerd" Evans
|
9640510de2
|
Use OrderedDict for @cached backing store, so we can evict the oldest key unbiased
|
2015-02-23 18:41:58 +00:00 |
|
Paul "LeoNerd" Evans
|
f53fcbce97
|
Use cache.pop() instead of a separate membership test + del []
|
2015-02-23 18:30:45 +00:00 |
|
Mark Haines
|
27080698e7
|
Fix code style warning
|
2015-02-23 18:19:13 +00:00 |
|
Mark Haines
|
74048bdd41
|
Remove unused import
|
2015-02-23 18:17:43 +00:00 |
|
Paul "LeoNerd" Evans
|
a09e59a698
|
Pull the _get_event_cache.setdefault() call out of the try block, as it doesn't need to be there and is confusing
|
2015-02-23 16:55:57 +00:00 |
|
Paul "LeoNerd" Evans
|
044d813ef7
|
Use the @cached decorator to implement the destination_retry_timings cache
|
2015-02-23 16:04:40 +00:00 |
|
Paul "LeoNerd" Evans
|
357fba2c24
|
RoomMemberStore no longer needs a _user_rooms_cache member
|
2015-02-23 15:57:41 +00:00 |
|
Paul "LeoNerd" Evans
|
e76d485e29
|
Allow @cached-wrapped functions to have a prefill method for setting entries
|
2015-02-23 15:41:54 +00:00 |
|
Paul "LeoNerd" Evans
|
4631b737fd
|
Squash out the now-redundant ApplicationServicesCache object class
|
2015-02-23 14:38:44 +00:00 |
|