David Baker
|
6532b6e607
|
Merge branch 'develop' into csauth
Conflicts:
synapse/http/server.py
|
2015-04-24 09:37:54 +01:00 |
|
David Baker
|
74270defda
|
No commas here, otherwise our error string constants become tuples.
|
2015-04-24 09:28:57 +01:00 |
|
Paul "LeoNerd" Evans
|
e1e5e53127
|
Remove users from the remote_offline_serials list (and clean up empty elements) when they go online again
|
2015-04-23 19:01:37 +01:00 |
|
Paul "LeoNerd" Evans
|
b3bda8a75f
|
Don't let the remote offline serial list grow arbitrarily large
|
2015-04-23 18:40:47 +01:00 |
|
Paul "LeoNerd" Evans
|
8a785c3006
|
Store a list of the presence serial number at which remote users went offline, so that when we delete them from the cachemap, we can still synthesize OFFLINE events for them (SYN-261)
|
2015-04-23 18:40:19 +01:00 |
|
Paul "LeoNerd" Evans
|
191f7f09ce
|
Generate presence event-stream JSON structures directly
|
2015-04-23 18:27:25 +01:00 |
|
David Baker
|
03eb4adc6e
|
Dedicated error code for failed 3pid auth verification
|
2015-04-23 18:20:17 +01:00 |
|
David Baker
|
0eb61a3d16
|
Remove ultimately unused feature of saving params from the first call in the session: it's probably too open to abuse.
|
2015-04-23 14:44:12 +01:00 |
|
David Baker
|
a2c10d37d7
|
Add an error code to 'missing token' response.
|
2015-04-23 13:23:44 +01:00 |
|
David Baker
|
2e0d9219b9
|
Remove now-redundant email config
|
2015-04-23 11:45:29 +01:00 |
|
Paul "LeoNerd" Evans
|
a16eaa0c33
|
Neater fetching of user's auth level in a room - squash to int() at access time (SYN-353)
|
2015-04-22 14:20:04 +01:00 |
|
Paul "LeoNerd" Evans
|
f43063158a
|
Appease pep8
|
2015-04-22 13:12:11 +01:00 |
|
Paul "LeoNerd" Evans
|
d3309933f5
|
Much neater fetching of defined powerlevels from m.room.power_levels state event
|
2015-04-21 20:53:23 +01:00 |
|
Paul "LeoNerd" Evans
|
b568c0231c
|
Remove debugging print statement accidentally committed
|
2015-04-21 20:21:14 +01:00 |
|
Paul "LeoNerd" Evans
|
3a7d7a3f22
|
Sanitise a user's powerlevel to an int() before numerical comparison, because otherwise Python is "helpful" with it (SYN-351)
|
2015-04-21 20:18:29 +01:00 |
|
Mark Haines
|
6080830bef
|
Bump syutil version to 0.0.5
|
2015-04-21 17:04:06 +01:00 |
|
Mark Haines
|
8b183781cb
|
Merge pull request #128 from matrix-org/unify_http_wrappers
Unify http wrappers
|
2015-04-21 17:01:04 +01:00 |
|
Mark Haines
|
812a99100b
|
Set a version_string in BaseMediaResource so that the request_handler wrapper works
|
2015-04-21 16:43:58 +01:00 |
|
Mark Haines
|
1967650bc4
|
Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator
|
2015-04-21 16:35:53 +01:00 |
|
Mark Haines
|
1ebff9736b
|
Split out the JsonResource request logging and error handling into a separate wrapper function
|
2015-04-21 16:07:20 +01:00 |
|
Mark Haines
|
24d21887ed
|
SYN-350: Don't ratelimit the individual events generated during room creation
|
2015-04-21 14:14:19 +01:00 |
|
David Baker
|
91c8f828e1
|
pep8
|
2015-04-17 19:56:04 +01:00 |
|
David Baker
|
8db6832db8
|
Password reset, finally.
|
2015-04-17 19:53:47 +01:00 |
|
David Baker
|
117f35ac4a
|
Add endpoint to get threepids from server
|
2015-04-17 17:20:18 +01:00 |
|
David Baker
|
4eea5cf6c2
|
pep8
|
2015-04-17 16:46:45 +01:00 |
|
David Baker
|
f96ab9d18d
|
make add3pid servlet work
|
2015-04-17 16:44:49 +01:00 |
|
Erik Johnston
|
4a5990ff8f
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-04-17 16:08:28 +01:00 |
|
David Baker
|
0b1a8500a2
|
just the once would probably be fine
|
2015-04-17 13:53:54 +01:00 |
|
David Baker
|
cb03fafdf1
|
Merge branch 'develop' into csauth
|
2015-04-17 13:51:10 +01:00 |
|
David Baker
|
bf5e54f255
|
Register the 3pid servlet
|
2015-04-17 13:44:55 +01:00 |
|
David Baker
|
94e1e58b4d
|
password -> account servlet and add start of an 'add 3pid' endpoint
|
2015-04-17 13:44:12 +01:00 |
|
Erik Johnston
|
ced39d019f
|
Bump version
|
2015-04-17 13:25:16 +01:00 |
|
David Baker
|
83b554437e
|
Need to yield the username check, otherwise very very weird things happen.
|
2015-04-17 12:57:25 +01:00 |
|
David Baker
|
4cd5fb13a3
|
Oops, left debugging in.
|
2015-04-16 20:03:13 +01:00 |
|
David Baker
|
ea1776f556
|
Return user ID in use error straight away
|
2015-04-16 19:56:44 +01:00 |
|
Paul "LeoNerd" Evans
|
f2cf37518b
|
Filter typing nofication events to only those rooms the requesting user is a member of (SYN-328)
|
2015-04-15 23:34:16 +01:00 |
|
Paul "LeoNerd" Evans
|
0268d40281
|
Have TypingNotificationEventSource.get_new_events_for_user() return a deferred, for consistency and extensibility
|
2015-04-15 23:09:35 +01:00 |
|
Paul "LeoNerd" Evans
|
399b5add58
|
Neater implementation of membership change auth checks, ensuring we can't forget to check if the calling user is a member of the room
|
2015-04-15 18:40:23 +01:00 |
|
Paul "LeoNerd" Evans
|
e6e130b9ba
|
Ensure that non-room-members cannot ban others, even if they do have enough powerlevel (SYN-343)
|
2015-04-15 18:07:33 +01:00 |
|
David Baker
|
766bd8e880
|
Dummy login so we can do the first POST request to get login flows without it just succeeding
|
2015-04-15 17:14:25 +01:00 |
|
David Baker
|
a19b739909
|
Regstration with email in v2
|
2015-04-15 15:50:38 +01:00 |
|
Mark Haines
|
88cb06e996
|
Update syutil version to 0.0.4
|
2015-04-14 16:18:17 +01:00 |
|
Mark Haines
|
3cbc286d06
|
Move server key api into rest/key/v1
|
2015-04-14 13:28:11 +01:00 |
|
Mark Haines
|
1280a47fc6
|
Add comment
|
2015-04-09 11:42:21 +01:00 |
|
Mark Haines
|
23d285ad57
|
Unset the timer in the timeout callback so that we don't try to cancel it if it has been called
|
2015-04-09 11:41:50 +01:00 |
|
Mark Haines
|
6f9dea7483
|
SYN-339: Cancel the notifier timeout when the notifier fires
|
2015-04-09 11:07:20 +01:00 |
|
Mark Haines
|
83f5125d52
|
Merge pull request #114 from matrix-org/improve_get_event_cache
Improve get event cache
|
2015-04-08 16:50:27 +01:00 |
|
Erik Johnston
|
9cef051ce2
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-04-08 16:43:17 +01:00 |
|
Erik Johnston
|
45131b2bca
|
Bump version
|
2015-04-08 16:35:12 +01:00 |
|
Erik Johnston
|
ccda401dbf
|
SYN-338: Fix typo that caused the cache to throw an exception in some instances
|
2015-04-08 16:34:23 +01:00 |
|