3c79bdd7a0
Fix check_password rather than inverting the meaning of _check_local_password ( #730 )
2016-04-14 19:00:21 +01:00
a4c56bf67b
Merge pull request #729 from matrix-org/dbkr/fix_login_nonexistent_user
...
Fix login to error for nonexistent users
2016-04-14 18:46:45 +01:00
4c1b32d7e2
Fix login to error for nonexistent users
...
Fixes SYN-680
2016-04-14 18:28:42 +01:00
f78b479118
fix urlparse import thinko breaking tiny URLs
2016-04-14 15:23:55 +01:00
83776d6219
Make v2_alpha reg follow the AS API specification
...
The spec is clear the key should be 'user' not 'username' and this is indeed
the case for v1. This is not true for v2_alpha though, which is what this
commit is fixing.
2016-04-14 14:52:26 +01:00
bd77216d06
comment out 2c838f6459 due to risk of https://en.wikipedia.org/wiki/Billion_laughs attacks - thanks @torhve
2016-04-14 14:39:24 +01:00
9ae64c9910
Measure push action generator
2016-04-14 13:42:22 +01:00
b42ad359e9
Merge pull request #725 from matrix-org/dbkr/push_only_joined
...
Don't push for everyone who ever sent an RR to the room
2016-04-14 12:05:13 +01:00
757e2c79b4
Don't push for everyone who ever sent an RR to the room
2016-04-14 12:02:50 +01:00
86e9bbc74e
Add missing yield
2016-04-14 11:56:52 +01:00
e40f25ebe1
Rename log context
2016-04-14 11:54:14 +01:00
2ae91a9e2f
Make send_badge private
2016-04-14 11:37:50 +01:00
d213d69fe3
Add desc arg
2016-04-14 11:36:23 +01:00
56da835eaf
Add necessary logging contexts
2016-04-14 11:33:50 +01:00
96bcfb29c7
Add index
2016-04-14 11:26:33 +01:00
7be1065b8f
Add extra Measure
2016-04-14 11:26:15 +01:00
a2546b9082
Fix query for get_unread_push_actions_for_user_in_range
2016-04-14 11:08:31 +01:00
ceeb5b909f
Merge pull request #721 from matrix-org/erikj/spider
...
Sanitize the optional dependencies for spider API
2016-04-14 09:59:29 +01:00
43a89cca8e
Merge pull request #722 from matrix-org/dbkr/only_unread_event_actions
...
Only return unread notifications
2016-04-13 14:54:26 +01:00
f338bf9257
Give install requirements
2016-04-13 14:33:48 +01:00
767fc0b739
pep8
2016-04-13 14:23:27 +01:00
54d08c8868
Only return unread notifications
...
Make get_unread_push_actions_for_user_in_range only return unread event actions, being more true to its name. Done in two separate sql queries to get actions after a read receipt and those in a room wiht no receipt at all. SQL queries by Erik.
2016-04-13 14:16:45 +01:00
5880bc5417
Merge pull request #718 from matrix-org/erikj/public_room_list
...
Don't return empty public rooms
2016-04-13 14:07:26 +01:00
f613a3e332
Merge pull request #720 from matrix-org/erikj/auth_chec
...
Don't auto log failed auth checks
2016-04-13 14:07:23 +01:00
bfe586843f
Add back in helpful description for missing url_preview_ip_range_blacklist
2016-04-13 13:52:57 +01:00
d0633e6dbe
Sanitize the optional dependencies for spider API
2016-04-13 13:38:09 +01:00
0f2ca8cde1
Measure Auth.check
2016-04-13 11:15:59 +01:00
c53f9d561e
Don't auto log failed auth checks
2016-04-13 11:11:46 +01:00
65141161f6
Unused member variable
2016-04-12 16:25:26 +01:00
72f454b752
Don't return empty public rooms
2016-04-12 16:06:18 +01:00
d33d623f0d
Merge pull request #716 from matrix-org/dbkr/get_pushers
...
Add get endpoint for pushers
2016-04-12 14:40:37 +01:00
7984ffdc6a
Unneccessarywhitespaceisunnecessary
2016-04-12 13:55:57 +01:00
c1267d04c5
Oops, forgot the desc.
2016-04-12 13:55:32 +01:00
a04c076b7f
Make the /set part mandatory
2016-04-12 13:54:41 +01:00
44891b4a0a
Tidy up get_pusher functions
...
Decodes pushers rows on the main thread rather than the db thread and uses _simple_select_list. Also do the same to the function I copied and factor out the duplication into a helper function.
2016-04-12 13:47:17 +01:00
7b39bcdaae
Mis-named function
2016-04-12 13:35:08 +01:00
d937f342bb
Split into separate servlet classes
2016-04-12 13:33:30 +01:00
c48465dbaa
More comments
2016-04-12 12:48:30 +01:00
8be1a37909
More comments
2016-04-12 12:04:19 +01:00
d3d0be4167
Don't append to unused list
2016-04-12 11:59:00 +01:00
762ada1e07
Add back backfilled parameter that was removed
2016-04-12 11:58:04 +01:00
0d3da210f0
Add comment
2016-04-12 11:54:41 +01:00
cccf86dd05
Check if we've already backfilled events
2016-04-12 11:19:32 +01:00
8a76094965
Add get endpoint for pushers
...
As per https://github.com/matrix-org/matrix-doc/pull/308
2016-04-11 18:00:03 +01:00
790f5848b2
Fix the rule_id for .m.rule.invite_for_me ( #715 )
2016-04-11 16:10:39 +01:00
82d7eea7e3
Move the versionstring code out of app.homeserver into util
2016-04-11 14:57:09 +01:00
2547dffccc
Merge pull request #705 from matrix-org/dbkr/pushers_use_event_actions
...
Change pushers to use the event_actions table
2016-04-11 12:58:55 +01:00
9bb041791c
Run unsafe proces in a loop until we've caught up
...
and wrap unsafe process in a try block
2016-04-11 12:48:30 +01:00
17515bae14
PEP8
2016-04-11 11:02:50 +01:00
4bd3d25218
Merge pull request #688 from matrix-org/matthew/preview_urls
...
URL previewing support
2016-04-11 10:40:29 +01:00
Mark Haines