David Baker
c58eb0d5a3
Merge branch 'turn' into develop
2014-09-25 13:09:56 +01:00
David Baker
7dc7c53029
The REST API spec only alows for returning a single server so name the
...
endpoint appropriately.
2014-09-24 17:28:47 +02:00
David Baker
7679ee7321
Hopefully implement turn in the web client (probably wrong for Firefox because Firefox is a special snowflake)
2014-09-24 16:08:31 +01:00
Matthew Hodgson
437969eac9
use all new /rooms/<room id>/state to actually gather the state for rooms whenever join them. a bit ugly, as we don't currently have a nice place to gather housekeeping after joining a room, so horrible code duplication...
2014-09-23 18:50:39 +01:00
Matthew Hodgson
7d94913efb
remove old commented-out code
2014-09-23 16:12:25 +01:00
Kegan Dougal
2c00e1ecd9
Be consistent when associating keys with login types for registration/login.
2014-09-15 15:38:29 +01:00
Kegan Dougal
04fbda46dd
Make captcha work again with the new registration logic.
2014-09-15 14:52:39 +01:00
Kegan Dougal
d821755b49
Updated webclient to support the new registration logic.
2014-09-15 14:31:53 +01:00
Emmanuel ROHEE
d934328904
Added edition of room name
2014-09-12 10:48:06 +02:00
Kegan Dougal
6bdb23449a
Add ability to set topic by double-clicking on the topic text then hitting enter.
2014-09-08 18:40:34 -07:00
Emmanuel ROHEE
9a5f224931
matrixService.rooms must be renamed matrixService.initialSync now
2014-09-08 18:21:41 +02:00
Kegan Dougal
dd2ae64120
Set the room_alias field when we encounter a new one, rather than only from local storage.
2014-09-08 11:28:50 +02:00
Matthew Hodgson
a1bf28b7f0
handle m.room.aliases for id<->alias mapping; remove local_storage map; stop local echo flickering by removing opacity transition for now; implement /join
2014-09-06 00:32:39 -07:00
Kegan Dougal
1a298aad9c
Added captcha support on both the HS and web client.
...
Merge branch 'captcha' of github.com:matrix-org/synapse into develop
2014-09-05 23:32:51 -07:00
Kegan Dougal
0b9e1e7b56
Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.
2014-09-05 17:58:06 -07:00
David Baker
c03c255304
Better call bar (visually: still lacks ring[back] tones).
2014-09-06 00:14:02 +01:00
Kegan Dougal
130458385e
Modified matrixService.register to specify if captcha results should be sent with the registration request. This is toggleable via useCaptcha in register-controller.
2014-09-05 13:56:36 -07:00
Emmanuel ROHEE
3be6156774
Created kick & unban methods in matrixService. Made some factorisation.
2014-09-05 17:30:50 +02:00
Emmanuel ROHEE
3501478828
BF: Make /unban work again
2014-09-05 16:56:50 +02:00
Matthew Hodgson
3bc7bba262
switch IRC-style command parser to use regexps rather than split(" ") so that it doesn't choke on consecutive whitespaces
...
yield better errors for invalid commands
don't pass invalid commands through as messages
support kick reasons
2014-09-04 23:14:52 -07:00
Emmanuel ROHEE
1bf6c3faad
BF: presence PUT requests stopped to work with old "state" param yesterday evening :( - cda31fb755
?diff=unified
2014-09-04 15:10:43 +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
Erik Johnston
66a5bc4fad
Fix ban path
2014-09-03 18:19:57 +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
Emmanuel ROHEE
4c7da89219
Do not define power level limits in setUserPowerLevel. Update the function to be used as a resetUserPowerLevel
2014-09-03 15:20:09 +02:00
Emmanuel ROHEE
932f35a7f0
Added /deop $user_id
2014-09-03 15:20:09 +02:00
Emmanuel ROHEE
4b85c5f52c
Added /op $user_id $powerLevel
2014-09-03 14:12:56 +02:00
Emmanuel ROHEE
56427b8057
Added /ban command
2014-09-03 11:17:58 +02: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
Matthew Hodgson
8fe912d95c
change the world: make the default matrix API URL prefix /_matrix rather than /matrix to make it easier for existing websites to mount a HS in their namespace without collisions.
...
perl -pi -e 's#/matrix#/_matrix#g' ./cmdclient/console.py ./docs/client-server/howto.rst ./docs/client-server/specification.rst ./docs/client-server/swagger_matrix/directory ./docs/client-server/swagger_matrix/events ./docs/client-server/swagger_matrix/login ./docs/client-server/swagger_matrix/presence ./docs/client-server/swagger_matrix/profile ./docs/client-server/swagger_matrix/registration ./docs/client-server/swagger_matrix/rooms ./docs/server-server/specification.rst ./graph/graph.py ./jsfiddles/create_room_send_msg/demo.js ./jsfiddles/event_stream/demo.js ./jsfiddles/example_app/demo.js ./jsfiddles/register_login/demo.js ./jsfiddles/room_memberships/demo.js ./synapse/api/urls.py ./tests/federation/test_federation.py ./tests/handlers/test_presence.py ./tests/handlers/test_typing.py ./tests/rest/test_events.py ./tests/rest/test_presence.py ./tests/rest/test_profile.py ./tests/rest/test_rooms.py ./webclient/components/fileUpload/file-upload-service.js ./webclient/components/matrix/matrix-service.js
2014-08-31 14:51:37 +01:00
Matthew Hodgson
1bc036a12d
nasty big monolithic commit of a whole bunch of UI/UX improvements:
...
- add a simple CSS template across the app for navigation & cosmetics
- split login into login & register, and totally reskin it
- restructure room CSS to play nicely with it
- implement basis 1:1 chat from user pages
- disable autofocus on iOS to improve UX
2014-08-31 00:40:42 +01:00
David Baker
073bec4830
Oops, forgot a s/sendObject/sendEvent/ - make messages work again!
2014-08-29 13:45:15 +01:00
David Baker
5308e3026a
Change call signalling messages to be their own types of room events rather than room messages with different msgtypes: room messages should be things that the client can display as a unit message to the user.
2014-08-29 13:23:01 +01:00
Emmanuel ROHEE
ee079cd250
Added a timeout(40s) to $http stream requests (/events) in order to be notified by an error when there is a network issue. Thus, we can retry with a new request.
2014-08-29 11:32:06 +02:00
Emmanuel ROHEE
246b2a3c3e
Renamed matrixService.assignRoomAliases into getRoomAliasAndDisplayName
2014-08-29 09:32:09 +02:00
Emmanuel ROHEE
c67cac134f
Moved assignRoomAliases into a central piece: matrixService for now
2014-08-27 15:55:51 +02:00
Emmanuel ROHEE
e40d829363
Support limit and feedback param of initialSync
2014-08-27 15:55:51 +02:00
Kegan Dougal
c585c87c4b
Renamed /ds to /directory
2014-08-27 14:54:29 +01:00
Kegan Dougal
1d9d287c7c
Renamed /public/rooms to /publicRooms
2014-08-27 14:52:07 +01:00
David Baker
474d913712
fix joining rooms on webclient
2014-08-27 13:59:14 +01:00
Kegan Dougal
dd661769e1
Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and removed tests which tested that. Updated cmdclient and webclient.
2014-08-27 11:33:56 +01:00
Kegan Dougal
5a93bfe1f0
Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated cmdclient, tests and webclient. All appears to work.
2014-08-26 17:21:48 +01:00
Kegan Dougal
2e70de09b9
Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$roomid/members. /rooms$roomid/messages/list >> /room/$roomid/messages. Updated cmdclient, tests and webclient.
2014-08-26 16:19:17 +01:00
Emmanuel ROHEE
c21fcb3373
Determine and send user presence state
2014-08-26 16:25:27 +02:00
Kegan Dougal
9ff9caeb74
webclient: Updated to use /rooms/$roomid/[invite|join|leave]
2014-08-26 14:59:31 +01:00
Kegan Dougal
5796232cb1
Adjusted webclient to use new state paths. Updated membership msg template to actually show the person invited. Factored out common membership functions in matrix service.
2014-08-26 10:24:47 +01:00
David Baker
3c349b408b
Update web client to use new IS API.
2014-08-22 11:34:27 +02:00
Emmanuel ROHEE
9d4bc8985f
Made uploadContent compatible for sending Blob objects
2014-08-21 15:00:20 +02:00