Daniel Wagner-Hall
|
88af7bb48b
|
Merge pull request #503 from matrix-org/daniel/nonghosts
Don't error on AS non-ghost user use
|
2016-01-19 11:27:00 +00:00 |
|
Erik Johnston
|
0d241e1114
|
Take a deepcopy of push rules before mutating them
|
2016-01-19 10:15:12 +00:00 |
|
Erik Johnston
|
f750a442f7
|
Update _id
|
2016-01-19 10:14:53 +00:00 |
|
Erik Johnston
|
003853e702
|
Preserve truthiness
|
2016-01-18 17:34:02 +00:00 |
|
Erik Johnston
|
a284ad4092
|
You need to escape backslashes
|
2016-01-18 17:20:44 +00:00 |
|
Erik Johnston
|
47f82e4408
|
Fix branch didn't check word_boundary
|
2016-01-18 17:04:36 +00:00 |
|
Erik Johnston
|
5cd2126a6a
|
Remove dead code
|
2016-01-18 16:49:46 +00:00 |
|
Erik Johnston
|
29c353c553
|
Don't split at word boundaries, actually use regex
|
2016-01-18 16:48:17 +00:00 |
|
Daniel Wagner-Hall
|
808a8aedab
|
Don't error on AS non-ghost user use
This will probably go away either when we fix our existing ASes, or when
we kill the concept of non-ghost users.
|
2016-01-18 16:33:05 +00:00 |
|
Daniel Wagner-Hall
|
74474a6d63
|
Pull out app service user lookup
I find this a lot simpler than nested try-catches and stuff
|
2016-01-18 16:32:33 +00:00 |
|
Erik Johnston
|
d16dcf642e
|
Drop log levels
|
2016-01-18 15:44:04 +00:00 |
|
Erik Johnston
|
7dd14e5d1c
|
Add comments and remove dead code
|
2016-01-18 15:42:23 +00:00 |
|
Erik Johnston
|
866fe27e78
|
Do for loop once at start
|
2016-01-18 15:29:41 +00:00 |
|
Erik Johnston
|
d1f56f732e
|
Use static for const dicts
|
2016-01-18 15:17:56 +00:00 |
|
Erik Johnston
|
0e39dcd135
|
Remove internal ids
|
2016-01-18 14:50:17 +00:00 |
|
Erik Johnston
|
345ff2196a
|
Don't edit ruleset
|
2016-01-18 14:50:17 +00:00 |
|
Erik Johnston
|
2c176e02ae
|
Make unit tests work
|
2016-01-18 14:48:50 +00:00 |
|
Erik Johnston
|
63485b3029
|
Re-enable urnead notifications
|
2016-01-18 14:48:30 +00:00 |
|
Erik Johnston
|
f59b564507
|
Make notifications go quicker
|
2016-01-18 14:48:29 +00:00 |
|
Erik Johnston
|
2068678b8c
|
Make Event objects behave more like dicts
|
2016-01-18 14:43:50 +00:00 |
|
Erik Johnston
|
cc66a9a5e3
|
Allow filtering events for multiple users at once
|
2016-01-18 14:43:50 +00:00 |
|
Daniel Wagner-Hall
|
5de1563997
|
Merge pull request #501 from matrix-org/daniel/unban
Require unbanning before other membership changes
|
2016-01-15 16:27:29 +00:00 |
|
Daniel Wagner-Hall
|
ac5a4477ad
|
Require unbanning before other membership changes
|
2016-01-15 16:27:26 +00:00 |
|
Daniel Wagner-Hall
|
c049f60d4a
|
Merge pull request #500 from matrix-org/daniel/cleanup
Remove unused parameters
|
2016-01-15 16:02:22 +00:00 |
|
Daniel Wagner-Hall
|
b5ce4f0427
|
Remove unused parameters
|
2016-01-15 13:54:03 +00:00 |
|
David Baker
|
ac12b6d332
|
Merge branch 'invalid_user_name' into develop
|
2016-01-15 10:07:01 +00:00 |
|
David Baker
|
5819b7a78c
|
M_INVALID_USERNAME to be consistent with the parameter name
|
2016-01-15 10:06:34 +00:00 |
|
David Baker
|
5bf1a3d6dc
|
Merge pull request #499 from matrix-org/invalid_user_name
Add specific error code for invalid user names.
|
2016-01-15 09:18:02 +00:00 |
|
David Baker
|
3f8db3d597
|
Add specific error code for invalid user names.
|
2016-01-14 17:21:04 +00:00 |
|
Erik Johnston
|
a50013fd99
|
Merge pull request #497 from matrix-org/erikj/max_limit
Clamp pagination limits to at most 1000
|
2016-01-14 16:28:52 +00:00 |
|
Richard van der Hoff
|
2978053d16
|
Merge branch 'release-v0.12.1' into develop
|
2016-01-14 15:04:08 +00:00 |
|
Daniel Wagner-Hall
|
2c760372d6
|
Merge pull request #496 from matrix-org/daniel/3
Require ID and as_token be unique for ASs
Defaults ID to as_token if not specified. This will change
when IDs are fully supported.
|
2016-01-14 14:34:11 +00:00 |
|
Daniel Wagner-Hall
|
2680043bc6
|
Require ID and as_token be unique for ASs
Defaults ID to as_token if not specified. This will change
when IDs are fully supported.
|
2016-01-14 14:34:01 +00:00 |
|
David Baker
|
8db451f652
|
Merge pull request #498 from matrix-org/push_rule_enabled_fix
Fix enabling & disabling push rules
|
2016-01-14 13:34:05 +00:00 |
|
Richard van der Hoff
|
430d3d74f6
|
Merge branch 'release-v0.12.1' into develop
|
2016-01-14 11:17:47 +00:00 |
|
Richard van der Hoff
|
7ee1879ed4
|
Merge pull request #492 from matrix-org/rav/event_context_shiz_release
Add 'event' result to 'context' endpoint
|
2016-01-14 11:17:29 +00:00 |
|
Daniel Wagner-Hall
|
d14fcfd24a
|
Merge pull request #487 from matrix-org/daniel/forceregistration
Require AS users to be registered before use
|
2016-01-14 11:06:43 +00:00 |
|
Daniel Wagner-Hall
|
27927463a1
|
Merge pull request #494 from matrix-org/daniel/2
Don't start server if ASes are invalidly configured
|
2016-01-14 11:06:19 +00:00 |
|
Daniel Wagner-Hall
|
fcb6df45e5
|
Merge pull request #493 from matrix-org/daniel/1
Delete unused code
|
2016-01-14 11:06:14 +00:00 |
|
David Baker
|
a7927c13fd
|
Fix enabling & disabling push rules
|
2016-01-14 10:53:44 +00:00 |
|
Erik Johnston
|
339c8f0133
|
Clamp pagination limits to at most 1000
|
2016-01-14 10:22:02 +00:00 |
|
Erik Johnston
|
bce602eb4e
|
Use logger not logging
|
2016-01-14 09:56:26 +00:00 |
|
Erik Johnston
|
939cbd7057
|
Merge pull request #495 from matrix-org/erikj/disable_notification
Temporarily disable notification branch
|
2016-01-14 09:46:09 +00:00 |
|
David Baker
|
12623c99b6
|
Use the unread notification count to send accurate badge counts in push notifications.
|
2016-01-13 18:55:57 +00:00 |
|
Erik Johnston
|
2655d61d70
|
Don't change signature. Return empty list
|
2016-01-13 17:43:39 +00:00 |
|
Erik Johnston
|
fcb05b4c82
|
Temporarily disable notification branch
|
2016-01-13 17:39:58 +00:00 |
|
Mark Haines
|
806bae1ee7
|
Merge pull request #488 from matrix-org/markjh/user_name
Rename 'user_name' to 'user_id' in push
|
2016-01-13 18:11:01 +01:00 |
|
Daniel Wagner-Hall
|
f6fcff3602
|
Don't start server if ASes are invalidly configured
|
2016-01-13 17:09:24 +00:00 |
|
Daniel Wagner-Hall
|
244b356a37
|
Delete unused code
|
2016-01-13 17:03:58 +00:00 |
|
Richard van der Hoff
|
49f33f6438
|
Add 'event' result to 'context' endpoint
... because the context isn't much use without the event.
|
2016-01-13 16:42:14 +00:00 |
|