180 Commits

Author	SHA1	Message	Date
David Baker	171d8b032f	Merge branch 'voip' into develop ... Conflicts: webclient/room/room-controller.js	2014-08-29 11:33:36 +01:00
David Baker	41d02ab674	More basic functionality for voip calls (like hanging up)	2014-08-29 11:29:36 +01:00
Emmanuel ROHEE	1abc93d65c	Cleaned up ng deps. By convention, angular modules must be listed at first	2014-08-29 11:58:35 +02:00
Emmanuel ROHEE	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
Emmanuel ROHEE	089d1b1b78	Recents update: do not care of events coming from the past (they are fired when doing pagination of room messages in the past)	2014-08-29 09:55:47 +02:00
Emmanuel ROHEE	9b2cb41dcf	Display emotes in the recents list	2014-08-29 09:49:03 +02:00
Emmanuel ROHEE	96baf62e7a	ng-show exists. So, for clarity, avoid to use ng-hide and double negation test.	2014-08-29 09:32:09 +02:00
Emmanuel ROHEE	246b2a3c3e	Renamed matrixService.assignRoomAliases into getRoomAliasAndDisplayName	2014-08-29 09:32:09 +02:00
David Baker	ca7426eee0	First basic working VoIP call support	2014-08-28 19:03:34 +01:00
Emmanuel ROHEE	b09e531159	Do a smart update of the recents from the events stream rather than hammering initialSync each time	2014-08-28 16:38:16 +02:00
Emmanuel ROHEE	c44293db2f	When opening this page, do not join a room already joined	2014-08-28 16:23:30 +02:00
Emmanuel ROHEE	7c99ebdbd1	Added waitForInitialSyncCompletion so that clients can know when they can access to the data retrieved by the initialSync Request	2014-08-28 16:23:30 +02:00
Emmanuel ROHEE	06c79a23d4	BF: Made member events parsing work (handleEvents expects an array of events)	2014-08-28 16:23:30 +02:00
Emmanuel ROHEE	466fbe4c4e	Cleaned up deps	2014-08-28 16:23:30 +02: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	04fdcf302d	Wired the recents list with the stream events for realtime update	2014-08-27 18:52:15 +02:00
Matthew Hodgson	f53c4300fd	improve iOS layout a bit	2014-08-27 17:03:16 +01:00
Emmanuel ROHEE	234c50b834	BF: mFileInput dependency got lost somewhere and upload buttons did not work anymore	2014-08-27 18:00:19 +02:00
Emmanuel ROHEE	d9155b6a25	Highlight the current room in the recents list	2014-08-27 17:20:53 +02:00
Emmanuel ROHEE	7ee5288849	Added the recents component at the left hand side of the room page	2014-08-27 17:20:53 +02:00
Emmanuel ROHEE	fb9661898d	BF: use room_id if there is no alias	2014-08-27 16:24:23 +02:00
Emmanuel ROHEE	87190a9673	Sort recents in anti-chronological order	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	308c9273fa	Moved recents things into a separate (and reusable) controler	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	c67cac134f	Moved assignRoomAliases into a central piece: matrixService for now	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	43242a0657	Cleaned ng dependencies	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	b1352f97ac	home/recents: show the last message of each message	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	6691ca6f8d	Rename go() into goToPage() which is available from everywhere thanks to the inheritance of $scope	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	e40d829363	Support limit and feedback param of initialSync	2014-08-27 15:55:51 +02:00
Kegan Dougal	c585c87c4b	Renamed /ds to /directory	2014-08-27 14:54:29 +01:00
Kegan Dougal	1d9d287c7c	Renamed /public/rooms to /publicRooms	2014-08-27 14:52:07 +01:00
David Baker	474d913712	fix joining rooms on webclient	2014-08-27 13:59:14 +01:00
Kegan Dougal	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
Kegan Dougal	5a93bfe1f0	Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated cmdclient, tests and webclient. All appears to work.	2014-08-26 17:21:48 +01:00
Kegan Dougal	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
Emmanuel ROHEE	bcf8eb687a	Avoid double call of refresh at app startup	2014-08-26 16:57:41 +02:00
Emmanuel ROHEE	c21fcb3373	Determine and send user presence state	2014-08-26 16:25:27 +02:00
Kegan Dougal	9ff9caeb74	webclient: Updated to use /rooms/$roomid/[invite|join|leave]	2014-08-26 14:59:31 +01:00
Kegan Dougal	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
Emmanuel ROHEE	95839212a7	The landing URL is now '#/' which actually points to homeController	2014-08-25 11:35:33 +02:00
Emmanuel ROHEE	1bd380c816	Merge remote-tracking branch 'origin/hotfixes-0.0.1' into develop	2014-08-25 11:13:54 +02:00
Emmanuel ROHEE	8b0473d5b9	Oops. Removed my NetBeans private folders	2014-08-25 10:25:43 +02:00
Matthew Hodgson	3f08a7ad21	oops	2014-08-23 20:48:14 +01:00
Matthew Hodgson	d2bb28d2df	very quick and dirty responsive design for iPhones	2014-08-23 20:45:00 +01:00
Emmanuel ROHEE	31e7cec486	Added "Your name" as placeholder to help user understand what is this alone input box	2014-08-22 18:23:38 +02: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
Emmanuel ROHEE	4c7df52360	renamed rooms to home - renamed files	2014-08-22 18:01:08 +02:00
Emmanuel ROHEE	61cac4df6e	renamed rooms to home	2014-08-22 17:59:48 +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