Commit Graph

2299 Commits (8b1dd9f57f8afb2d602d3b533ab89dbe1df6b465)
 

Author SHA1 Message Date
David Baker 8b1dd9f57f Only send a badge-reset if the user actually has unread notifications. 10 years ago
Mark Haines b0b80074e0 SYN-252: Supply the stream and topological parts in the correct order to the constructor 10 years ago
David Baker d5bdf3c0c7 Allow the push rule delete method to take more specifiers. 10 years ago
David Baker 8552ed8df2 Change uses of get_user_by_req because it returns a tuple now. 10 years ago
Mark Haines 26c8fff19e Merge pull request #36 from matrix-org/device_id_from_access_token 10 years ago
Mark Haines 3cca61e006 Rename ClientID to ClientInfo since it is a pair of IDs rather than a single identifier 10 years ago
Mark Haines c18e551640 Add a : to the doc string after the type of the return value 10 years ago
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 10 years ago
David Baker 6840e7cece Merge branch 'master' into develop 10 years ago
David Baker 60b143a52e Move pushers delta to v12 and bump schema version 10 years ago
Mark Haines c59bcabf0b Return the device_id from get_auth_by_req 10 years ago
David Baker fddc7a080a Merge pull request #35 from matrix-org/pushers2 10 years ago
David Baker e78dd33292 Use %s instead of + 10 years ago
David Baker 93aac9bb7b Newline 10 years ago
David Baker 445ad9941e Redundant parens 10 years ago
David Baker 6d485dd1c7 unnecessary newlines 10 years ago
David Baker fb0928097a More magic commas (including the place I copied it from...) 10 years ago
David Baker 0cbb6b0f52 Google doc style 10 years ago
David Baker 2cfdfee572 spaces 10 years ago
David Baker 289a249874 Unnecessary newlines. 10 years ago
David Baker 3cb5b73c0d Unnecessary newline. 10 years ago
David Baker 8807f4170e Better style 10 years ago
David Baker 032f8d4ed3 Another superfluous newline 10 years ago
David Baker d93ce29a86 Ah, the comma of doom. 10 years ago
David Baker 6741c3dbd9 Brackets are nicer 10 years ago
David Baker 4fbf2328c2 Unnecessary new line 10 years ago
David Baker 30fbba168b Easy on the newlines 10 years ago
David Baker dd3abbd61f 2015 10 years ago
David Baker 6fde707add doc style fix 10 years ago
David Baker 5f2665320f It is 2015 10 years ago
David Baker 20c47383dc Oops, bad merge: needed to change the base class of the rest servlets too. 10 years ago
David Baker 03149ad23a More code style things 10 years ago
David Baker e1ca0f1396 Brackets rather than slashes at end 10 years ago
David Baker 6df6f5e084 Redundant bracketing & missed space 10 years ago
David Baker ca7240a2f0 Update copyright 10 years ago
David Baker fb532d8425 Unused import 10 years ago
David Baker c291a4d522 Merge branch 'develop' into pushers 10 years ago
David Baker 273b12729b Reset badge count to zero when last active time is bumped 10 years ago
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). 10 years ago
David Baker f7c4daa8f9 Oops, remove debugging 10 years ago
David Baker 5eacaeb4a7 or of course we could just return the deferred 10 years ago
David Baker eba89f093f Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in the cb gets executed. 10 years ago
David Baker 1d77969124 Unbreak bad presence merge - don't add these blocks together with an and: they're different things. 10 years ago
Paul "LeoNerd" Evans 57d2bfca3f Initial cut of a shared base class for REST unit tests 10 years ago
David Baker b481889117 Support membership events and more camelcase/underscores 10 years ago
David Baker 69a75b7ebe Add brackets to make get room name / alias work 10 years ago
Mark Haines 9b6aaf2074 Merge pull request #34 from matrix-org/remove_serialize_event_from_hs 10 years ago
Mark Haines e5725eb3b9 Remove unused import from server.py 10 years ago
Mark Haines 7f6f3f9d62 Pass the current time to serialize event, rather than passing an 10 years ago
David Baker efac71d6ca Pushers should only try & look for rejected devices in something that's a list or tuple. 10 years ago