tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity
905 commits 4 branches 629 tags 119 MiB
Commit graph

905 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik Johnston
9f633bc125 Merge branch 'master' of github.com:matrix-org/synapse into develop 
Conflicts:
	CHANGES.rst
 2014-09-04 07:38:38 +01:00
Matthew Hodgson
3b38d2f507 big warning 2014-09-04 02:35:18 +01:00
Matthew Hodgson
a751a80a05 target live site 2014-09-04 02:02:06 +01:00
Matthew Hodgson
77e628e840 changelog for v0.2.1 2014-09-04 01:57:27 +01:00
Matthew Hodgson
822d0e5520 update README to know about synctl 2014-09-04 01:51:01 +01:00
Matthew Hodgson
0d5c7718c0 make synctl default to homesever.log 2014-09-03 22:49:47 +01:00
Erik Johnston
0538a4098d Merge branch 'release-v0.2.1' 2014-09-03 19:47:32 +01:00
Erik Johnston
300816ffa1 Bump versions. Update change logs. 2014-09-03 19:39:45 +01:00
Paul "LeoNerd" Evans
804199d9b6 Added a simple start/stop control script 2014-09-03 19:30:48 +01:00
Paul "LeoNerd" Evans
4c3512a45c Added a TODO note about YAML modeline for editors 2014-09-03 19:30:48 +01:00
Erik Johnston
bcaea74352 Error code must be an integer 2014-09-03 19:19:24 +01:00
Erik Johnston
c9d1ee24ca Import SynapseError 2014-09-03 19:15:55 +01:00
Erik Johnston
9b18151104 Handle timeouts slightly nicer. 2014-09-03 19:13:41 +01:00
Erik Johnston
34a7f0ca93 Fix test to assert that we don't do auth 2014-09-03 19:13:29 +01:00
Erik Johnston
5b645f9d34 Don't do auth for change_membership in federation handler, it doesn't work and federation doesn't do auth in general either. Add a hacky timeout when trying to join a remote room. 2014-09-03 19:08:39 +01:00
David Baker
284d6b279b Hide email link UI from the settings because it doesn't work. 2014-09-03 19:00:56 +01:00
Erik Johnston
dce6395395 When creating a room and a user supplies a room_alias but no name, use the room_alias as the name. 2014-09-03 18:52:34 +01:00
Emmanuel ROHEE
6322aa154b Added more ng-if to make nice sentences like "Bob kicked Alice" or "Bob unbanned Alice" 2014-09-03 19:52:09 +02:00
Matthew Hodgson
7f01d1d8c8 better error msgs 2014-09-03 18:39:09 +01:00
Emmanuel ROHEE
069a9745b0 Ignore leave members in the list too 2014-09-03 19:37:54 +02:00
Emmanuel ROHEE
78087617d1 Fixed used of state_key instead of user_id in member events. 
Needed to split into 2 conditional spans for grammar reason
 2014-09-03 19:29:36 +02:00
David Baker
d72ce4da64 Merge branch 'develop' of github.com:matrix-org/synapse into develop 
Conflicts:
	synapse/http/client.py
 2014-09-03 18:25:17 +01:00
David Baker
a25d1530ef Make registering and logging in with a threepid work in the webclient. 2014-09-03 18:23:56 +01:00
David Baker
d6ecbbdf0a Add support for registering with a threepid to the HS (get credentials from the client and check them against an ID server). 2014-09-03 18:22:27 +01:00
Erik Johnston
66a5bc4fad Fix ban path 2014-09-03 18:19:57 +01:00
Paul "LeoNerd" Evans
d703e712f7 Add support to _simple_insert() to do INSERT OR REPLACE 2014-09-03 18:18:41 +01:00
Kegan Dougal
f196d77f66 Added federation protocol urls section from other docs. 2014-09-03 18:07:42 +01:00
Erik Johnston
0d75b9fa96 Fix a few cases where we used user_id instead of state_key 2014-09-03 18:03:10 +01:00
Kegan Dougal
5391ccdfe6 Marked docs/client-server/specification.rst as old. 2014-09-03 18:02:33 +01:00
Kegan Dougal
f68dbbd3da More explanation of federation keys. 2014-09-03 18:00:00 +01:00
Emmanuel ROHEE
1a32b1f002 Normalise users power levels so that the user with the higher power level will have a bar covering 100% of the width of his avatar 2014-09-03 18:55:48 +02:00
Kegan Dougal
79bf9d25db Added more terms. 2014-09-03 17:48:08 +01:00
Erik Johnston
1b491e50c9 Implement a kick api 2014-09-03 17:46:52 +01:00
Mark Haines
7c4ce957c7 Unindent list in specification to remove blockquote 2014-09-03 17:37:19 +01:00
Paul "LeoNerd" Evans
4081413876 Default PID file should be 'homeserver.pid' to match the other 'homeserver.*' naming convention 2014-09-03 17:34:07 +01:00
Emmanuel ROHEE
5dd1a738f8 Use /rooms/$room_id/state/m.room.member/$user_id to change the membership of another user 2014-09-03 18:33:51 +02:00
Matthew Hodgson
8a7c1d6a00 fix the copyright holder from matrix.org to OpenMarket Ltd, as matrix.org hasn't been incorporated in time for launch. 2014-09-03 17:31:57 +01:00
Mark Haines
f93aba1d66 Fix formating for threat model 2014-09-03 17:28:35 +01:00
Mark Haines
e3b261b0b7 Move securitY threat model docs into specification 2014-09-03 17:26:16 +01:00
Mark Haines
ee2bcdec65 Limit the size of uploads 2014-09-03 17:04:16 +01:00
Kegan Dougal
beaf50f5c6 Bubble up SynapseErrors so expected failures aren't masked. 2014-09-03 16:31:01 +01:00
Kegan Dougal
581c54bebe Add exception handling to directory servlet, so we don't 500. Mark directory API as volatile in the api docs. 2014-09-03 16:27:01 +01:00
Erik Johnston
30bcbc433a Fix up directory server to not require uploading room hosts. Update the room hosts table with the current room hosts (if we have them) on GET. 2014-09-03 16:04:27 +01:00
Emmanuel ROHEE
5f7cdbe0b8 List commands and their usage in the settings page 2014-09-03 17:02:02 +02:00
Emmanuel ROHEE
ede161d296 Added /kick $user_id 2014-09-03 17:02:02 +02:00
Erik Johnston
b5f9d47c89 Handle new state events which don't have a common ancestor 2014-09-03 15:50:05 +01:00
Erik Johnston
e4c40158c5 Snapshot prev_state for generic events 2014-09-03 15:48:51 +01:00
Paul "LeoNerd" Evans
cda31fb755 Kill the state 
... key from all the Presence messages
 2014-09-03 15:37:10 +01:00
Paul "LeoNerd" Evans
dada11dc5f Bugfix for back-pagination of presence 2014-09-03 15:28:03 +01:00
Emmanuel ROHEE
277fd2250a Added /unban $user_id 2014-09-03 15:58:40 +02:00