Erik Johnston
|
464e1fcfa5
|
Merge branch 'master' of github.com:matrix-org/synapse into release-v0.2.0
Conflicts:
synapse/notifier.py
webclient/room/room-controller.js
webclient/room/room.html
|
2014-09-02 15:26:11 +01:00 |
|
Emmanuel ROHEE
|
e565a4bfc4
|
BF: Prevent controllers from being instantiated twice.
AngularJS will instantiate it when discovering ng-controller in their respective html files
|
2014-09-02 15:12:51 +02:00 |
|
Emmanuel ROHEE
|
d5da6b0cef
|
Handle "m.room.create" in order to inform controllers about new rooms
|
2014-09-02 13:55:23 +02:00 |
|
Paul "LeoNerd" Evans
|
aa337f588c
|
Order matters when adding REST servlets
|
2014-09-02 12:53:36 +01:00 |
|
Erik Johnston
|
4b8244fbf8
|
Fix bug where we didn't correctly store the ops power levels event.
|
2014-09-02 12:12:14 +01:00 |
|
Kegan Dougal
|
4ac80b8570
|
Whoops: Put /events parameters object in the right part of the api tree.
|
2014-09-02 12:09:47 +01:00 |
|
Kegan Dougal
|
5539251d82
|
Updated API docs with new keys on /createRoom and new API /rooms/$roomid/ban
|
2014-09-02 11:54:01 +01:00 |
|
David Baker
|
5c778f2f15
|
Add rest endpoint for the whole user profile
|
2014-09-02 11:49:17 +01:00 |
|
Kegan Dougal
|
fdcb876495
|
More ban spec. Added 'name' and 'topic' keys to /createRoom.
|
2014-09-02 11:46:53 +01:00 |
|
Paul "LeoNerd" Evans
|
d9d6fbb085
|
Safer handling of incoming presence EDUs that may or maynot contain 'presence' or 'state'
|
2014-09-02 11:17:43 +01:00 |
|
Paul "LeoNerd" Evans
|
7b56a7a3cb
|
'continue' to go to the next item in a for loop, not 'break'
|
2014-09-02 11:15:46 +01:00 |
|
Erik Johnston
|
10e7821461
|
By default, only room ops can change the name and topic.
|
2014-09-02 11:11:47 +01:00 |
|
Mark Haines
|
cf890e9d43
|
Remove option for disabling webclient because it was confusing
|
2014-09-02 11:09:41 +01:00 |
|
Erik Johnston
|
a808c06a10
|
Fix room permissions test
|
2014-09-02 11:03:03 +01:00 |
|
Erik Johnston
|
db02021aba
|
Implement auth for kicking.
|
2014-09-02 10:58:33 +01:00 |
|
Erik Johnston
|
ed25abe05f
|
Add message to assertion
|
2014-09-02 10:58:33 +01:00 |
|
Erik Johnston
|
08d2f902dd
|
Default HTTP and HTTPS ports to 8008 and 8448
|
2014-09-02 10:58:33 +01:00 |
|
Erik Johnston
|
0393e87519
|
Make the demo listen on both HTTP and HTTPS ports
|
2014-09-02 10:58:33 +01:00 |
|
Mark Haines
|
45570e4695
|
os.makedirs is almost but not entirely unlike mkdir -p
|
2014-09-02 10:58:05 +01:00 |
|
Mark Haines
|
64b341cc10
|
Fix typo when reading TLS config
|
2014-09-02 10:54:56 +01:00 |
|
Emmanuel ROHEE
|
828101dd51
|
Represent user power level in a room by a red bar at the bottom of his avatar image. The width of this bar depends on the power level.
|
2014-09-02 11:54:35 +02:00 |
|
Paul "LeoNerd" Evans
|
7e22afbc7c
|
Ensure that event source unit tests could cope with get_new_events_for_user() returning a Deferred
|
2014-09-02 10:53:16 +01:00 |
|
Mark Haines
|
30572e28c2
|
Make the config directory if the directory doesn't exisit when generating config
|
2014-09-02 10:52:25 +01:00 |
|
Mark Haines
|
d45f89c95b
|
More helpful error messages for missing config
|
2014-09-02 10:49:11 +01:00 |
|
Kegan Dougal
|
ab0637c2c3
|
Yet more bullet points on various sections.
|
2014-09-02 10:41:00 +01:00 |
|
Emmanuel ROHEE
|
1bc05aef20
|
BF: Armed updateMemberListPresenceAge only once
|
2014-09-02 11:14:58 +02:00 |
|
David Baker
|
772c117e68
|
Make the intro bit a separate section rather than have a 'quick start' section that only tells you how to get started half way through.
|
2014-09-02 10:05:26 +01:00 |
|
Erik Johnston
|
040d985908
|
Add support for setting room name and topic when creating rooms
|
2014-09-02 10:02:14 +01:00 |
|
Kegan Dougal
|
15a7312273
|
Added section on banning users, currently in flux as the API changes / is implemented.
|
2014-09-02 09:34:28 +01:00 |
|
Emmanuel ROHEE
|
3122ff2433
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-09-02 10:20:47 +02:00 |
|
Emmanuel ROHEE
|
027857b261
|
Merge branch 'withoutYAML' into develop
|
2014-09-02 10:19:37 +02:00 |
|
Kegan Dougal
|
94bb4031f3
|
Expanded on bullet points in several sections.
|
2014-09-02 08:58:53 +01:00 |
|
Emmanuel ROHEE
|
07d609cbc2
|
BF: Take into account MEMBER_EVENT and PRESENCE_EVENT events only after the initialSync is done
|
2014-09-02 09:39:43 +02:00 |
|
Matthew Hodgson
|
68a04b9282
|
given everything's apparently gone https:// by default for c-s, change this hardcoding...
|
2014-09-01 23:28:43 +01:00 |
|
Mark Haines
|
399e004884
|
Add unsecure listener port to homeserver
|
2014-09-01 22:38:52 +01:00 |
|
Mark Haines
|
79650f795f
|
enable ECDHE ciphers
|
2014-09-01 22:29:44 +01:00 |
|
Paul "LeoNerd" Evans
|
270d302834
|
Reënable presence visibility permission checking now it's not used on redundant code paths
|
2014-09-01 22:15:02 +01:00 |
|
Paul "LeoNerd" Evans
|
32fdf8efd6
|
No need to test is_presence_visible in _start_polling_local because we know it will be by when it's called
|
2014-09-01 22:15:02 +01:00 |
|
Matthew Hodgson
|
61e28cdb6f
|
specify metavars in argparse
|
2014-09-01 22:11:08 +01:00 |
|
Mark Haines
|
118b250473
|
add pyyaml dependency for config files
|
2014-09-01 20:50:32 +01:00 |
|
Mark Haines
|
6fd730c96b
|
Use yaml for config file
|
2014-09-01 20:44:51 +01:00 |
|
Erik Johnston
|
48142a01dd
|
Don't set a 'default' key in the creation event
|
2014-09-01 20:39:43 +01:00 |
|
Mark Haines
|
8b69468e5f
|
Use pregenerated DH params when generating config
|
2014-09-01 20:35:18 +01:00 |
|
Erik Johnston
|
bcfaaf7da6
|
That was a breaking db change. You need to recreate the databases. (In reality, it's enough to just run the im.sql through your db and change the schema version)
|
2014-09-01 20:34:07 +01:00 |
|
Erik Johnston
|
a85612baf8
|
Merge branch 'room_config' into develop
|
2014-09-01 20:28:11 +01:00 |
|
Erik Johnston
|
6d28560626
|
Don't put required power levels on permission state events
|
2014-09-01 20:27:45 +01:00 |
|
Mark Haines
|
86fa1138be
|
Update readme with instructions on how to generate configs for homeservers
|
2014-09-01 20:22:16 +01:00 |
|
Erik Johnston
|
f452899fe2
|
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
|
2014-09-01 19:57:28 +01:00 |
|
Erik Johnston
|
3f5ebccbff
|
Fix the tests to include new db calls
|
2014-09-01 19:57:17 +01:00 |
|
Mark Haines
|
ff79437d9b
|
Merge branch 'server2server_tls' into develop
|
2014-09-01 19:56:22 +01:00 |