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
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
Matthew Hodgson
df752a15ce
licenses, please...
2014-09-01 00:42:03 +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
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
Emmanuel ROHEE
41d1db2d4a
Merge branch 'settings-page' into develop
2014-08-22 18:18:27 +02:00
Emmanuel ROHEE
de0706493a
Use /home everywhere
2014-08-22 18:08:03 +02:00
Erik Johnston
239622f80b
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1
2014-08-22 15:48:09 +01:00
Emmanuel ROHEE
dde50d4245
Use $location.url instead of $location.path to get clean page URL without hash arguments of the previous page.
...
This happpens with room URL like http://127.0.0.1:8080/matrix/client/#/room/#public:localhost . The second hash part is transferred to the next page when using $location.path.
2014-08-22 11:44:09 +02:00
David Baker
3c349b408b
Update web client to use new IS API.
2014-08-22 11:34:27 +02:00
Matthew Hodgson
00e8be516a
merge weirdness
2014-08-16 01:48:44 +01:00
Kegan Dougal
7ddb7a5cbb
Event streaming now happens on an app level, rather than a per-room level. Make eventStreamService manage it's own repolling provided no one calls stop() on it. Couple the stream with eventHandlerService so any controller can just blithely call eventStreamService.resume() and expect to 'get stuff' without having to handle promises (though resume() still returns a promise for that request and proxies it through $q). Kill and reset the stream if you logout.
2014-08-15 14:06:56 +01:00
Kegan Dougal
fef3183461
Pass back the user_id in the response to /login in case it has changed. Store and use that on the webclient rather than the input field.
2014-08-14 16:40:15 +01:00
Kegan Dougal
ca3747fb2f
hs: Make /login accept full user IDs or just local parts. webclient: Only enable Register button when both password fields match.
2014-08-14 16:29:51 +01:00
Kegan Dougal
6f925f61ff
Auto-correct the username when logging in if there isn't an @
2014-08-14 16:08:22 +01:00
Kegan Dougal
fb93e14e53
Be more helpful when failing to register/login, stating why (communication error, user in user, wrong credentials, etc). Make the HS send M_USER_IN_USE.
2014-08-14 16:03:04 +01:00
Kegan Dougal
24bd133d9d
Added extra nesting .data and rename callback to be response not data
2014-08-14 15:43:16 +01:00
Kegan Dougal
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
Kegan Dougal
613e468b89
Guess the home server URL on the login screen by inspecting the URL of the web client.
2014-08-14 13:57:55 +01:00
matrix.org
4f475c7697
Reference Matrix Home Server
2014-08-12 15:10:52 +01:00
