Erik Johnston
|
0adf3e5445
|
Revert accidental bumping of angluar_sdk dep
|
2015-01-30 11:17:09 +00:00 |
|
Erik Johnston
|
2c9e136d57
|
Fix bad merge fo python_dependencies.py
|
2015-01-30 11:14:33 +00:00 |
|
Erik Johnston
|
2ebf795c0a
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
synapse/storage/__init__.py
synapse/storage/schema/delta/v12.sql
|
2015-01-30 11:10:37 +00:00 |
|
Erik Johnston
|
0c2d245fdf
|
Update the current state of an event if we update auth events.
|
2015-01-30 11:08:52 +00:00 |
|
Erik Johnston
|
823999716e
|
Fix bug in timeout handling in keyclient
|
2015-01-30 11:08:01 +00:00 |
|
Erik Johnston
|
c1d860870b
|
Fix regression where we no longer correctly handled the case of gaps in our event graph
|
2015-01-30 10:48:47 +00:00 |
|
Erik Johnston
|
c1c7b39827
|
Fix bug where we changes in outlier in metadata dict propogated to other events
|
2015-01-30 10:30:54 +00:00 |
|
David Baker
|
fc946f3b8d
|
Include content in notification pokes
|
2015-01-29 21:59:17 +00:00 |
|
David Baker
|
0b16886397
|
Change 'from' in notification pokes to 'sender' to match client API v2. Send sender display names where they exist.
|
2015-01-29 18:51:22 +00:00 |
|
David Baker
|
1235f7f383
|
Add default push rules including setting a sound for messages mentioning your username / display name
|
2015-01-29 18:38:22 +00:00 |
|
David Baker
|
4bdfce30d7
|
Renumber priority classes so we can use 0 for defaults.
|
2015-01-29 17:12:11 +00:00 |
|
David Baker
|
e0d2c6889b
|
Allow kind to be set to null to delete a pusher.
|
2015-01-29 17:05:00 +00:00 |
|
Erik Johnston
|
78015948a7
|
Initial implementation of auth conflict resolution
|
2015-01-29 16:52:33 +00:00 |
|
Mark Haines
|
acb68a39e0
|
Code style fixes.
|
2015-01-29 16:12:40 +00:00 |
|
David Baker
|
8b1dd9f57f
|
Only send a badge-reset if the user actually has unread notifications.
|
2015-01-29 16:10:01 +00:00 |
|
Erik Johnston
|
5a3a15f5c1
|
Make post_json(...) actually send data.
|
2015-01-29 13:58:22 +00:00 |
|
Erik Johnston
|
c183cec8f6
|
Add post_json(...) method to federation client
|
2015-01-29 13:44:52 +00:00 |
|
Mark Haines
|
b0b80074e0
|
SYN-252: Supply the stream and topological parts in the correct order to the constructor
|
2015-01-29 01:48:48 +00:00 |
|
David Baker
|
d5bdf3c0c7
|
Allow the push rule delete method to take more specifiers.
|
2015-01-28 18:06:04 +00:00 |
|
David Baker
|
8552ed8df2
|
Change uses of get_user_by_req because it returns a tuple now.
|
2015-01-28 18:04:40 +00:00 |
|
Mark Haines
|
26c8fff19e
|
Merge pull request #36 from matrix-org/device_id_from_access_token
Extract the device id and token id from the access token when autheniticating users
|
2015-01-28 17:19:28 +00:00 |
|
Mark Haines
|
3cca61e006
|
Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier
|
2015-01-28 17:16:12 +00:00 |
|
Mark Haines
|
c18e551640
|
Add a : to the doc string after the type of the return value
|
2015-01-28 17:08:53 +00:00 |
|
Mark Haines
|
388581e087
|
Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events
|
2015-01-28 16:58:23 +00:00 |
|
Erik Johnston
|
0ef5bfd6a9
|
Start implementing auth conflict res
|
2015-01-28 16:16:53 +00:00 |
|
David Baker
|
6840e7cece
|
Merge branch 'master' into develop
|
2015-01-28 16:03:35 +00:00 |
|
David Baker
|
60b143a52e
|
Move pushers delta to v12 and bump schema version
|
2015-01-28 15:48:28 +00:00 |
|
Mark Haines
|
c59bcabf0b
|
Return the device_id from get_auth_by_req
|
2015-01-28 15:43:41 +00:00 |
|
David Baker
|
fddc7a080a
|
Merge pull request #35 from matrix-org/pushers2
Pushers branch (with fixes)
|
2015-01-28 15:41:24 +00:00 |
|
David Baker
|
e78dd33292
|
Use %s instead of +
|
2015-01-28 14:52:58 +00:00 |
|
David Baker
|
93aac9bb7b
|
Newline
|
2015-01-28 14:51:01 +00:00 |
|
David Baker
|
445ad9941e
|
Redundant parens
|
2015-01-28 14:49:59 +00:00 |
|
David Baker
|
6d485dd1c7
|
unnecessary newlines
|
2015-01-28 14:48:42 +00:00 |
|
David Baker
|
fb0928097a
|
More magic commas (including the place I copied it from...)
|
2015-01-28 14:48:07 +00:00 |
|
David Baker
|
0cbb6b0f52
|
Google doc style
|
2015-01-28 14:44:41 +00:00 |
|
David Baker
|
2cfdfee572
|
spaces
|
2015-01-28 14:41:51 +00:00 |
|
David Baker
|
289a249874
|
Unnecessary newlines.
|
2015-01-28 14:39:03 +00:00 |
|
David Baker
|
3cb5b73c0d
|
Unnecessary newline.
|
2015-01-28 14:37:55 +00:00 |
|
David Baker
|
8807f4170e
|
Better style
|
2015-01-28 14:35:00 +00:00 |
|
David Baker
|
032f8d4ed3
|
Another superfluous newline
|
2015-01-28 14:33:15 +00:00 |
|
David Baker
|
d93ce29a86
|
Ah, the comma of doom.
|
2015-01-28 14:27:01 +00:00 |
|
David Baker
|
6741c3dbd9
|
Brackets are nicer
|
2015-01-28 14:26:03 +00:00 |
|
David Baker
|
4fbf2328c2
|
Unnecessary new line
|
2015-01-28 14:24:28 +00:00 |
|
David Baker
|
30fbba168b
|
Easy on the newlines
|
2015-01-28 14:23:16 +00:00 |
|
David Baker
|
dd3abbd61f
|
2015
|
2015-01-28 14:22:39 +00:00 |
|
David Baker
|
6fde707add
|
doc style fix
|
2015-01-28 14:14:49 +00:00 |
|
David Baker
|
5f2665320f
|
It is 2015
|
2015-01-28 14:11:45 +00:00 |
|
David Baker
|
20c47383dc
|
Oops, bad merge: needed to change the base class of the rest servlets too.
|
2015-01-28 14:10:46 +00:00 |
|
David Baker
|
03149ad23a
|
More code style things
|
2015-01-28 14:01:24 +00:00 |
|
David Baker
|
e1ca0f1396
|
Brackets rather than slashes at end
|
2015-01-28 13:58:32 +00:00 |