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
a25d1530ef
Make registering and logging in with a threepid work in the webclient.
2014-09-03 18:23:56 +01:00
66a5bc4fad
Fix ban path
2014-09-03 18:19:57 +01:00
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
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
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
932f35a7f0
Added /deop $user_id
2014-09-03 15:20:09 +02:00
4b85c5f52c
Added /op $user_id $powerLevel
2014-09-03 14:12:56 +02:00
56427b8057
Added /ban command
2014-09-03 11:17:58 +02:00
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
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
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
073bec4830
Oops, forgot a s/sendObject/sendEvent/ - make messages work again!
2014-08-29 13:45:15 +01:00
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
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
246b2a3c3e
Renamed matrixService.assignRoomAliases into getRoomAliasAndDisplayName
2014-08-29 09:32:09 +02:00
c67cac134f
Moved assignRoomAliases into a central piece: matrixService for now
2014-08-27 15:55:51 +02:00
e40d829363
Support limit and feedback param of initialSync
2014-08-27 15:55:51 +02:00
c585c87c4b
Renamed /ds to /directory
2014-08-27 14:54:29 +01:00
1d9d287c7c
Renamed /public/rooms to /publicRooms
2014-08-27 14:52:07 +01:00
474d913712
fix joining rooms on webclient
2014-08-27 13:59:14 +01:00
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
5a93bfe1f0
Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated cmdclient, tests and webclient. All appears to work.
2014-08-26 17:21:48 +01:00
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
c21fcb3373
Determine and send user presence state
2014-08-26 16:25:27 +02:00
9ff9caeb74
webclient: Updated to use /rooms/$roomid/[invite|join|leave]
2014-08-26 14:59:31 +01:00
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
3c349b408b
Update web client to use new IS API.
2014-08-22 11:34:27 +02:00
9d4bc8985f
Made uploadContent compatible for sending Blob objects
2014-08-21 15:00:20 +02:00
6d3391f2f0
Send images with their imageInfo (size, mymetype, width & height)
2014-08-20 17:04:50 +02:00
e2b861cc67
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
2014-08-19 16:41:13 +01:00
c5d601d5cd
Cleaned dead code
2014-08-19 16:24:49 +02:00
347242a5c4
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
...
Conflicts:
tests/rest/test_presence.py
tests/rest/test_rooms.py
tests/utils.py
2014-08-19 14:48:19 +01:00
598a1d8ff9
Change the way pagination works to support out of order events.
2014-08-19 14:19:48 +01:00
35da1bf4a3
Auth content uploads. Added a mapping function from request > filename. Added exception handling for content uploads. webclient: Only prefix the client API path on doRequest, not doBaseRequest (this would've broken the identity server auth too). Added matrixService.uploadContent. May not require mFileUpload anymore.
2014-08-18 17:18:54 +01:00
e5257b21b3
Support room alias in rooms URL (ex: http://127.0.0.1:8000/#/room/#public:localhost:8080 )
2014-08-18 17:11:08 +02:00
0b5674ccc5
Do not start the event stream if the user is not logged in (=if he does not has an access token yet)
...
Add isUserLoggedIn to check this.
2014-08-18 10:44:29 +02:00
5ac87292c4
Remove old polling stuff from RoomController. Added service comments. Do not start the event stream on startup unless you have credentials.
2014-08-15 14:06:56 +01:00
8bf3994c2e
Added event stream service which neatly blobs together requests / state for the event stream. This depends on matrix service to do the actual hit. Currently this has exactly the same behaviour as before.
2014-08-15 14:06:56 +01:00
30da8c81c7
webclient: You can now paginate in rooms. Defaults to 10 messages, with a button to get more (needs to be hooked into infini-scrolling).
2014-08-14 17:23:47 +01:00
db3e1d73c6
Move the unknown token broadcast to the interceptor. Return the $http promise and not a wrapped one via $q. Everything now needs a level deeper nesting. Fixed registration and login.
2014-08-14 15:36:40 +01:00
7143f358f1
Detect when the user access token is no more valid and log the user out in this case
2014-08-14 15:00:21 +02:00
c87e1f6418
Room: Added a text input to type an image URL in order to send an image message
2014-08-13 11:42:28 +02:00
3e35a9f96e
add in copyrights to everything, not just the synapse subdir, and add a copyrighter.pl whilst we're at it
2014-08-13 03:32:18 +01:00
fe3c5a2726
Fix the 'Go to room' button to use the correct room alias api
2014-08-12 17:17:14 +01:00
4f475c7697
Reference Matrix Home Server
2014-08-12 15:10:52 +01:00
David Baker