Commit Graph

861 Commits

Author SHA1 Message Date
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
Kegan Dougal
5a11a8ef69 Flesh out Room Events. 2014-09-01 16:52:33 +01:00
Emmanuel ROHEE
9b61076d42 BF: Check config exists (=defined in the localstorage) before using it 2014-09-01 17:43:27 +02:00
Mark Haines
46dcb0d890 Merge branch 'develop' into server2server_tls 2014-09-01 16:31:09 +01:00
Mark Haines
ef6a8e4f32 Listen using SSL 2014-09-01 16:30:43 +01:00
David Baker
b9172b982f missing semicolon 2014-09-01 16:23:13 +01:00
Paul "LeoNerd" Evans
1c6ab2d759 Bump a user's presence last_active time every time they send a message to a room 2014-09-01 16:16:35 +01:00
Paul "LeoNerd" Evans
59d3955db1 Have MemoryDataStore's get_rooms_for_user_where_membership_is() return room membership event objects, as per interface contract 2014-09-01 16:15:45 +01:00
Erik Johnston
db7109c43b Add beginnings of ban support. 2014-09-01 16:15:34 +01:00
Paul "LeoNerd" Evans
fd696f1243 Perform room unit tests with 'local' users actually in the right domain ;) 2014-09-01 15:58:30 +01:00
Kegan Dougal
401c16559d Specced out state/non-state events. Start working on the myriad of syncing APIs. 2014-09-01 15:58:20 +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
Mark Haines
f5755bcadf Merge branch 'develop' into server2server_tls 2014-09-01 15:51:44 +01:00
Mark Haines
9ea1de432d Fix homeserver config parsing 2014-09-01 15:51:15 +01:00
Paul "LeoNerd" Evans
468d94c920 Rename API-visible 'mtime' presence field to 'last_active'; slightly different semantics 2014-09-01 15:39:50 +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
Paul "LeoNerd" Evans
02f4e3b3ff Rename 'state' presence key to the much more obvious 'presence'; maintain a legacy 'state' copy for now 2014-09-01 14:45:41 +01:00
Kegan Dougal
f500dd627a Fleshed out joining/leaving rooms. Added M_LIMIT_EXCEEDED standard error code for rate limited requests. 2014-09-01 14:44:25 +01:00
Erik Johnston
865469f233 Implement power level lists, default power levels and send_evnet_level/add_state_level events. 2014-09-01 14:39:09 +01:00
David Baker
67ffc00d48 Don't show the hang up button once tha call has ended 2014-09-01 14:15:32 +01:00
Kegan Dougal
389ee3624c Added /web folder which contains html/css (based off the default swagger-ui) for viewing the c-s json api. 2014-09-01 14:11:26 +01:00
Kegan Dougal
51b0b5c5ab Renamed json files because: paths. 2014-09-01 14:05:28 +01:00
Erik Johnston
10efca1a74 Merge branch 'develop' of github.com:matrix-org/synapse into room_config 2014-09-01 13:41:44 +01:00
Mark Haines
a9512d0994 Merge branch 'develop' into server2server_tls 2014-09-01 13:29:17 +01:00
Matthew Hodgson
fad58dbd08 add another public wishlist item 2014-09-01 13:22:50 +01:00
Matthew Hodgson
0b01c8560d make the little logos clickable for Erik 2014-09-01 13:22:42 +01:00
Kegan Dougal
3bb93abb34 Start digging into invite/join/leave sections. 2014-09-01 10:38:48 +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
Mark Haines
3eb45eba0e Merge branch 'develop' into server2server_tls 2014-08-31 16:08:20 +01:00
Mark Haines
d9ebe531ed Add config tree to synapse. Add support for reading config from a file 2014-08-31 16:06:39 +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
2b7918bd6f missed a s#/matrix#/_matrix/g 2014-08-31 14:54:58 +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
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
Matthew Hodgson
b040bd6157 factor out mobile css into its own file 2014-08-31 00:38:45 +01:00
Matthew Hodgson
3ef312fb95 factor out the signup process into its own controller 2014-08-31 00:38:10 +01:00
Matthew Hodgson
91753655b7 moar logos! 2014-08-31 00:37:47 +01:00
Matthew Hodgson
17a4bc10bc switch default profile image to one of our own devising (dating back to communicator(!)) 2014-08-31 00:37:01 +01:00
Matthew Hodgson
885e0c8b76 add a basic wishlist 2014-08-31 00:36:11 +01:00
Matthew Hodgson
2a0e79bbfa tweaks to settings page 2014-08-30 00:50:51 +01:00
Matthew Hodgson
f64ce52305 actually add a 'home' button 2014-08-30 00:44:56 +01:00
Matthew Hodgson
c715660cb8 shrink text bubble font a bit; make image thumbnails always fit in their bubbles 2014-08-30 00:41:36 +01:00
Paul "LeoNerd" Evans
93407cf7cf Bugfixes on presence pushes on user joining:
* No need to inform clients of status of remote users; as that will
   arrive in due course anyway. We don't -have- the state currently, so
   we'd only send an unknown message

 * Remember to bump the presence serial for the event source, so the
   notifiers will wake up and report it
2014-08-29 19:53:33 +01:00
Paul "LeoNerd" Evans
a8e8d1d06c Renamed get_current_token_part to get_current_key 2014-08-29 19:15:23 +01:00