David Baker
|
171d8b032f
|
Merge branch 'voip' into develop
Conflicts:
webclient/room/room-controller.js
|
2014-08-29 11:33:36 +01:00 |
|
Emmanuel ROHEE
|
6ac298f2f1
|
Start the events stream once the app starts (if credentials are in cache) or once the user gets logged in
|
2014-08-28 11:04:15 +02:00 |
|
David Baker
|
7d34a1c108
|
WIP voip support on web client
|
2014-08-27 18:57:54 +01:00 |
|
Emmanuel ROHEE
|
308c9273fa
|
Moved recents things into a separate (and reusable) controler
|
2014-08-27 15:55:51 +02:00 |
|
Emmanuel ROHEE
|
95839212a7
|
The landing URL is now '#/' which actually points to homeController
|
2014-08-25 11:35:33 +02:00 |
|
Emmanuel ROHEE
|
de0706493a
|
Use /home everywhere
|
2014-08-22 18:08:03 +02:00 |
|
Emmanuel ROHEE
|
aaf623fa53
|
Move profile parts of the rooms page and the config content into a new page: settings
|
2014-08-22 17:55:05 +02:00 |
|
Erik Johnston
|
2e1ab9db08
|
Only start event streaming after having set up the controllers.
|
2014-08-21 17:55:41 +01:00 |
|
Emmanuel ROHEE
|
ecce301632
|
File organisation sanity: put directives and filters into dedicated files
|
2014-08-20 11:28:36 +02:00 |
|
Emmanuel ROHEE
|
ecfdf23250
|
Created boilerplate for user profile page
|
2014-08-18 18:05:42 +02:00 |
|
Emmanuel ROHEE
|
43772d0b15
|
Support urlencoded room aliases in room URL
|
2014-08-18 17:40:05 +02:00 |
|
Emmanuel ROHEE
|
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 |
|
Emmanuel ROHEE
|
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 |
|
Matthew Hodgson
|
f1d140eea8
|
remove log spam
|
2014-08-16 22:02:52 +01:00 |
|
Matthew Hodgson
|
fe25e65f3f
|
disambiguate identical displaynames
|
2014-08-16 20:48:05 +01:00 |
|
Matthew Hodgson
|
e4770bb039
|
make presence timestamps less verbose
|
2014-08-16 13:30:34 +01:00 |
|
Matthew Hodgson
|
ce4ca473cb
|
order the members list by most recently active
|
2014-08-16 13:23:16 +01:00 |
|
Matthew Hodgson
|
207ef144c5
|
display mtime_age in webclient
|
2014-08-16 01:07:23 +01:00 |
|
Kegan Dougal
|
5b817ecd44
|
Added infinite scrolling. It's sliiiightly buggy in that it jumps down the list a bit, but it is overall working pretty well. Added ng-infinite-scroll-matrix.js and jquery-1.8.3 as deps.
|
2014-08-15 17:42:11 +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
|
5dbceaf5a4
|
Added event handler service which.. handles events. More specifically, it $broadcasts events depending on their type, and does processing on events (shuffling keys, adding events to $rootScope so displays will automatically update, sending delivery receipts, and so on). Some of this logic was previously contained in the RoomController, which fails the moment you add >1 room into the mix, hence requiring a Service to handle events, rather than having each individual controller maintain their part of the world.
|
2014-08-15 14:06:56 +01:00 |
|
Kegan Dougal
|
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 |
|
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
|
76005c44f7
|
Added an access token interceptor to check unknown tokens.
|
2014-08-14 15:21:39 +01:00 |
|
Matthew Hodgson
|
6c2db18be1
|
completely change the CSS to be an entirely 'position: absolute' layout rather than top-to-bottom. makes the overscroll much more predictable and sane and not dependent on CSS expressions.
|
2014-08-14 02:14:15 +01:00 |
|
Matthew Hodgson
|
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 |
|
matrix.org
|
4f475c7697
|
Reference Matrix Home Server
|
2014-08-12 15:10:52 +01:00 |