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 |
|
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 |
|
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 |
|
David Baker
|
6df6f5e084
|
Redundant bracketing & missed space
|
2015-01-28 13:56:35 +00:00 |
|
David Baker
|
ca7240a2f0
|
Update copyright
|
2015-01-28 13:17:55 +00:00 |
|
David Baker
|
fb532d8425
|
Unused import
|
2015-01-28 13:06:09 +00:00 |
|
David Baker
|
c291a4d522
|
Merge branch 'develop' into pushers
Conflicts:
synapse/handlers/events.py
synapse/server.py
|
2015-01-28 12:51:05 +00:00 |
|
David Baker
|
273b12729b
|
Reset badge count to zero when last active time is bumped
|
2015-01-28 11:55:49 +00:00 |
|
David Baker
|
e32ded7b3e
|
Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).
|
2015-01-28 10:09:54 +00:00 |
|
David Baker
|
f7c4daa8f9
|
Oops, remove debugging
|
2015-01-27 16:08:47 +00:00 |
|
David Baker
|
5eacaeb4a7
|
or of course we could just return the deferred
|
2015-01-27 16:05:23 +00:00 |
|
David Baker
|
eba89f093f
|
Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in the cb gets executed.
|
2015-01-27 16:00:07 +00:00 |
|
David Baker
|
1d77969124
|
Unbreak bad presence merge - don't add these blocks together with an and: they're different things.
|
2015-01-27 15:58:27 +00:00 |
|
Paul "LeoNerd" Evans
|
57d2bfca3f
|
Initial cut of a shared base class for REST unit tests
|
2015-01-27 13:09:57 +00:00 |
|
David Baker
|
b481889117
|
Support membership events and more camelcase/underscores
|
2015-01-26 17:27:28 +00:00 |
|
David Baker
|
69a75b7ebe
|
Add brackets to make get room name / alias work
|
2015-01-26 16:52:47 +00:00 |
|
Mark Haines
|
9b6aaf2074
|
Merge pull request #34 from matrix-org/remove_serialize_event_from_hs
Don't pass the HS to serialize_event just so that it can get the current time.
|
2015-01-26 16:23:48 +00:00 |
|
Mark Haines
|
e5725eb3b9
|
Remove unused import from server.py
|
2015-01-26 16:16:50 +00:00 |
|
Mark Haines
|
7f6f3f9d62
|
Pass the current time to serialize event, rather than passing an
HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed.
|
2015-01-26 16:11:28 +00:00 |