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 |
|
Erik Johnston
|
0d75b9fa96
|
Fix a few cases where we used user_id instead of state_key
|
2014-09-03 18:03:10 +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 |
|
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
|
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 |
|
Emmanuel ROHEE
|
277fd2250a
|
Added /unban $user_id
|
2014-09-03 15:58:40 +02:00 |
|
Erik Johnston
|
073a42cc95
|
Add support for room names
|
2014-09-03 14:41:38 +01:00 |
|
Emmanuel ROHEE
|
c06d07a276
|
Send unrecognized commands as text message (as before)
|
2014-09-03 15:25:59 +02: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
|
4777c1cd5b
|
BF: Do not be polluted by ops events that come when paginating back
|
2014-09-03 15:00:19 +02:00 |
|
Emmanuel ROHEE
|
4b85c5f52c
|
Added /op $user_id $powerLevel
|
2014-09-03 14:12:56 +02:00 |
|
Emmanuel ROHEE
|
d29d41322a
|
Better indicate in the page feedback section that a user can't join a room (because he has been banned for ex). May be worth to be put in the middle of screen
|
2014-09-03 11:45:40 +02:00 |
|
Emmanuel ROHEE
|
4ba5b4b55d
|
Do not show banned people in member list. Format ban events strings in room and recent flows
|
2014-09-03 11:38:24 +02:00 |
|
Emmanuel ROHEE
|
56427b8057
|
Added /ban command
|
2014-09-03 11:17:58 +02:00 |
|
Emmanuel ROHEE
|
65c7f78e9f
|
Made IRC style command easier to handle specifically for possible arguments
|
2014-09-03 11:07:53 +02:00 |
|
Erik Johnston
|
ddc16d8642
|
Merge branch 'master' into develop
|
2014-09-03 09:46:39 +01:00 |
|
Emmanuel ROHEE
|
6e2ce83d57
|
roomName directive: Take into account invited users.
Use the last user display name
|
2014-09-02 18:26:20 +02:00 |
|
Erik Johnston
|
211a8b288a
|
Hide the email textbox during registeration has it has not been wired up yet.
|
2014-09-02 16:59:45 +01:00 |
|
Matthew Hodgson
|
044daf4fe2
|
make power level more visible
|
2014-09-02 16:07:00 +01:00 |
|
Emmanuel ROHEE
|
d3c7567369
|
Attempt to make avatar change clearer
|
2014-09-02 17:00:47 +02:00 |
|
Emmanuel ROHEE
|
bcf30b29ad
|
BF: Reset base timer time ($scope.now) everytime last_active_ago is touched
|
2014-09-02 16:39:29 +02: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 |
|
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 |
|
Emmanuel ROHEE
|
1bc05aef20
|
BF: Armed updateMemberListPresenceAge only once
|
2014-09-02 11:14:58 +02: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 |
|
Emmanuel ROHEE
|
0271e8e692
|
Follow API renaming. state -> presence. mtime_ago -> last_active_ago
|
2014-09-01 19:09:49 +02:00 |
|
Emmanuel ROHEE
|
7d99cee3ef
|
Added roomName, a directive to compute a room name based on its alias (not aliases for now) and its users displaynames or ids
|
2014-09-01 18:52:24 +02:00 |
|
David Baker
|
ab8de33c76
|
Oops, show the voice call button once a call has ended
|
2014-09-01 17:41:42 +01:00 |
|
David Baker
|
57f047a05a
|
Fairly simple move of the call status widget to the header bar (and therefore into the index page rather than the rooms page).
|
2014-09-01 17:16:27 +01:00 |
|
Emmanuel ROHEE
|
9b61076d42
|
BF: Check config exists (=defined in the localstorage) before using it
|
2014-09-01 17:43:27 +02:00 |
|
David Baker
|
b9172b982f
|
missing semicolon
|
2014-09-01 16:23:13 +01:00 |
|
David Baker
|
fa6b3490e2
|
Handle call events in the recents view as well to get consistency with what it displays when refreshed.
|
2014-09-01 15:54:06 +01:00 |
|
David Baker
|
4e14e38bd5
|
Just show 'Call' for call events. Don't just splat out the content of the event for other events: it's rarely going to be sesnible.
|
2014-09-01 15:54:06 +01:00 |
|
Emmanuel ROHEE
|
26a95988da
|
Fixed presence change that occurs -Xs ago
|
2014-09-01 16:27:11 +02:00 |
|
Emmanuel ROHEE
|
c9ee9b45c7
|
Fixed presence state update. Specifically, the current user was sometimes indicated as offline
|
2014-09-01 16:22:59 +02:00 |
|
David Baker
|
67ffc00d48
|
Don't show the hang up button once tha call has ended
|
2014-09-01 14:15:32 +01:00 |
|
Matthew Hodgson
|
0b01c8560d
|
make the little logos clickable for Erik
|
2014-09-01 13:22:42 +01:00 |
|
Emmanuel ROHEE
|
f81002df60
|
BF: Pass desired_user_id to register API. And update the app header to avoid to display the previous matrix id
|
2014-09-01 11:12:24 +02:00 |
|
Matthew Hodgson
|
df752a15ce
|
licenses, please...
|
2014-09-01 00:42:03 +01:00 |
|
Matthew Hodgson
|
d27e1ab148
|
fix footer on non-room pages
|
2014-09-01 00:41:53 +01:00 |
|
Matthew Hodgson
|
7ca6d4e8f7
|
don't make HS ports explicit if it's the default for the protocol
|
2014-08-31 15:38:27 +01: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
|
820ef6e9d8
|
make lightbox a bit less ugly
|
2014-08-31 12:03:22 +01:00 |
|
Matthew Hodgson
|
0a65a2384c
|
only show presence timings if we know them
|
2014-08-31 11:55:48 +01:00 |
|