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 |
|
root
|
f40844def2
|
avatar url
|
2014-08-22 16:20:53 +01: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 |
|
Erik Johnston
|
f3cea238b9
|
Check if the membership message was for the room we were in before updating the membership list
|
2014-08-22 10:56:16 +01:00 |
|
Erik Johnston
|
6118a102c1
|
Keep track of people's presence and query that when we update the members list.
|
2014-08-22 10:51:00 +01:00 |
|
Erik Johnston
|
74c90f7815
|
Reinitialize room when creating a RoomController so that we start off with a clean slate, as it expects/
|
2014-08-22 10:51:00 +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 |
|
Erik Johnston
|
acf5127604
|
Make the content repo work with in daemon mode. Return the full url on upload. Update the webclient to use new content repo api.
|
2014-08-22 10:25:32 +01:00 |
|
Emmanuel ROHEE
|
53f4fbd99a
|
resizeImage: generate an image in the format of the original image. (Tested with tranparent PNG, transparent GIF, BMP, JPEG)
|
2014-08-22 10:48:00 +02:00 |
|
Emmanuel ROHEE
|
c8d0c4762d
|
Safari needs the img.onload event before actually working on the img
|
2014-08-22 10:15:15 +02:00 |
|
Matthew Hodgson
|
8f7fbc1bb0
|
improve leftBlock css
|
2014-08-22 02:11:33 +01:00 |
|
Matthew Hodgson
|
3248aed03b
|
fix mainInput retaining focus between sending consecutive messages by disabling commit 955662d6
|
2014-08-22 01:54:37 +01:00 |
|
Matthew Hodgson
|
868fa1a1e3
|
fix weird fontsizes on iOS
|
2014-08-22 01:41:38 +01:00 |
|
Matthew Hodgson
|
fd47f55e94
|
sacrifice a goat or two to make wordwrap actually work properly
|
2014-08-22 01:33:34 +01:00 |
|
Matthew Hodgson
|
ab27b49ded
|
rename autoComplete directive as tabComplete to avoid confusion with the autocomplete html attribute
|
2014-08-22 01:33:05 +01:00 |
|
Matthew Hodgson
|
019f3a66f6
|
add fixme pointing out name disambiguation is a bit flakey
|
2014-08-22 01:32:17 +01:00 |
|
Matthew Hodgson
|
3277a65052
|
actually display room metadata based on m.room.membe events
|
2014-08-21 19:02:00 +01:00 |
|
Erik Johnston
|
0045a2647a
|
Add a var.
|
2014-08-21 17:59:07 +01:00 |
|
Erik Johnston
|
2e1ab9db08
|
Only start event streaming after having set up the controllers.
|
2014-08-21 17:55:41 +01:00 |
|
Erik Johnston
|
7dac1bfc91
|
Change webclient to always hit the im sync api before streaming so we get current presence state
|
2014-08-21 17:17:41 +01:00 |
|
Matthew Hodgson
|
ad869fa4b3
|
stop hammering the HS for displayname and avatar URLs
|
2014-08-21 15:44:03 +01:00 |
|
Erik Johnston
|
2b1297c501
|
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1
|
2014-08-21 15:34:49 +01:00 |
|
Erik Johnston
|
4c228df167
|
Use the new 'inviter' key from im sync for room display names.
|
2014-08-21 15:31:11 +01:00 |
|
Emmanuel ROHEE
|
14b9989660
|
Fixed first pagination detection
|
2014-08-21 16:27:34 +02:00 |
|
Matthew Hodgson
|
01a129cb9a
|
cheer up erik and remove the double-horizontal-border between adjacent text plinths
|
2014-08-21 15:26:51 +01:00 |
|
Emmanuel ROHEE
|
bb4490c2d7
|
Show image fullscreen when clicking on the thumbnail
|
2014-08-21 16:09:42 +02:00 |
|
Emmanuel ROHEE
|
e4f0e1af1a
|
If there are available, show image thumbnails in the messages list
|
2014-08-21 15:00:20 +02:00 |
|
Emmanuel ROHEE
|
aac52fce15
|
Generate thumbnail client side and send its URL and info with the image message body
|
2014-08-21 15:00:20 +02:00 |
|
Emmanuel ROHEE
|
9d4bc8985f
|
Made uploadContent compatible for sending Blob objects
|
2014-08-21 15:00:20 +02:00 |
|
Emmanuel ROHEE
|
efe5aa6464
|
Added resizeImage()
|
2014-08-21 15:00:20 +02:00 |
|
Emmanuel ROHEE
|
7371e68f55
|
Quick fix to support array of room aliases
|
2014-08-20 17:46:16 +02:00 |
|
Emmanuel ROHEE
|
2f52e8ee18
|
BF: Apply image place holder only if the image message has the height information
|
2014-08-20 17:17:17 +02:00 |
|
Emmanuel ROHEE
|
96da42085c
|
BF: Wait for the room_id being resolved before starting pagination
|
2014-08-20 17:08:18 +02:00 |
|
Emmanuel ROHEE
|
ba88c9105c
|
Create a placeholder for each image of the chat thread. The height of this placeholder is the height of the image so that the scroller position will not be disrupted when the image will be actually loaded and displayed in its full height
|
2014-08-20 17:04:50 +02:00 |
|
Emmanuel ROHEE
|
6d3391f2f0
|
Send images with their imageInfo (size, mymetype, width & height)
|
2014-08-20 17:04:50 +02:00 |
|
Emmanuel ROHEE
|
da2f5aac0e
|
Sanitize message text content only if the type of current message in the ng-repeat loop is "text"
In case of image message, the body can be a JSON object (ImageInfo) and ngSanitize does not like that (ie it generates exception in the console)
|
2014-08-20 17:04:50 +02:00 |
|
Emmanuel ROHEE
|
d6a3639269
|
Replaced the image URL text input by a file selector button: "Send Image"
|
2014-08-20 14:09:55 +02:00 |
|
Emmanuel ROHEE
|
955662d64c
|
Disabled sending buttons while a message is being sent. Useful on bad Internet connection.
|
2014-08-20 13:43:31 +02:00 |
|
Erik Johnston
|
2ffb075772
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2014-08-20 10:29:16 +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
|
9ca5bc7892
|
keepScroll: a directive to anchor the scroller position at the bottom when the browser is resizing
|
2014-08-19 18:30:02 +02:00 |
|
Erik Johnston
|
e2b861cc67
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
|
2014-08-19 16:41:13 +01:00 |
|
Emmanuel ROHEE
|
4f773de6ba
|
BF: The enter key in the image URL box called sendImage() with no argument
|
2014-08-19 16:37:31 +02:00 |
|
Emmanuel ROHEE
|
c5d601d5cd
|
Cleaned dead code
|
2014-08-19 16:24:49 +02:00 |
|
Erik Johnston
|
347242a5c4
|
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts:
tests/rest/test_presence.py
tests/rest/test_rooms.py
tests/utils.py
|
2014-08-19 14:48:19 +01:00 |
|
Erik Johnston
|
598a1d8ff9
|
Change the way pagination works to support out of order events.
|
2014-08-19 14:19:48 +01:00 |
|
Emmanuel ROHEE
|
509ce6c137
|
Change mouse cursor to pointer on elements user can click on
|
2014-08-19 11:37:07 +02:00 |
|
Emmanuel ROHEE
|
ff21d4d93b
|
Merge remote-tracking branch 'origin/master' into user_page
|
2014-08-19 09:44:50 +02:00 |
|
Emmanuel ROHEE
|
d7a4f2ed7f
|
Fill user page with avatar, display name and matrix id
|
2014-08-19 09:37:10 +02:00 |
|
Emmanuel ROHEE
|
38f5c1c378
|
Made small avatar image center
|
2014-08-19 09:24:35 +02:00 |
|