Erik Johnston
|
e3aec9bc81
|
Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse
Conflicts:
webclient/room/room-controller.js
|
2014-09-12 18:19:32 +01:00 |
|
Emmanuel ROHEE
|
3ed39ad20e
|
Clean data when user logs out
|
2014-09-12 17:43:35 +02:00 |
|
David Baker
|
cc2cee4af6
|
Retry sending events that fail to send.
|
2014-09-12 16:32:22 +01:00 |
|
Emmanuel ROHEE
|
6c81752e46
|
Fixed displayname resolution of emote sender
|
2014-09-12 17:01:49 +02:00 |
|
Emmanuel ROHEE
|
a2cd942a95
|
Fixed public room name and users count alignement
Put data into a table to ease layout and manage long strings
|
2014-09-12 16:46:20 +02:00 |
|
David Baker
|
8b28f7d14e
|
Always pick the incoming call if we've not yet sent out our invite, otherwise the remorte party will see their call get rejected and our call won't come in until our user clicks allow.
|
2014-09-12 14:06:35 +01:00 |
|
David Baker
|
a81ec21762
|
Remove the local AV stream from ourselves when handing it off to a new call or we'll close it when we hang up.
|
2014-09-12 11:51:57 +01:00 |
|
Emmanuel ROHEE
|
9819b3619e
|
CSS m.room.topic and m.room.name events in the history
|
2014-09-12 11:56:08 +02:00 |
|
Emmanuel ROHEE
|
311dc61803
|
Handle NAME_EVENT to get room name update event
(TODO: recents needs to be directly plugged to $rootScope.events.rooms)
|
2014-09-12 10:51:05 +02:00 |
|
Emmanuel ROHEE
|
d934328904
|
Added edition of room name
|
2014-09-12 10:48:06 +02:00 |
|
Emmanuel ROHEE
|
6ea20f3503
|
Show room name updates in room history and recents.
Update it with the latest value
|
2014-09-12 10:12:56 +02:00 |
|
Emmanuel ROHEE
|
8b3ce85183
|
BF: temp workaround while /initialSync on a particular room is not available
initRoom on a new room is not called. Call it for any received events
|
2014-09-12 08:54:18 +02:00 |
|
David Baker
|
a059ca6915
|
few fixes for errors in glare conditions. still seem to end up with no audio if both calls are placed at the same time.
|
2014-09-11 19:16:57 +01:00 |
|
David Baker
|
1e05e30472
|
Put back the line that adds the stream to the invite, otherwise caller->callee audio won't work...
|
2014-09-11 18:59:22 +01:00 |
|
David Baker
|
81d061e74e
|
Fix bug where web client wold break trying to add the earliest token without having initialised the room if your first page of history contained only events which didn't call initRoom. Just call initRoom in handleMessages since we use it there rather than leaving it to the individual event handling methods.
|
2014-09-11 17:40:38 +01:00 |
|
Emmanuel ROHEE
|
ceec607e7f
|
Clearly show when an user cannot join a room.
In realtime show who kicked or banned him.
|
2014-09-11 16:54:57 +02:00 |
|
David Baker
|
fb082cf50f
|
start towards glare support (currently not much better but no worse than before) including fixing a lot of self/var self/this fails that caused chaos when we started to have more than one call in play.
|
2014-09-11 15:24:18 +01:00 |
|
Emmanuel ROHEE
|
806c49a690
|
Added support of copy/paste of multi lines content
|
2014-09-11 15:46:24 +02:00 |
|
Emmanuel ROHEE
|
aa347b52ba
|
Use autofill-event.js to workaround browsers issue: Form model doesn't update on autocomplete
https://github.com/angular/angular.js/issues/1460
|
2014-09-11 15:07:44 +02:00 |
|
Emmanuel ROHEE
|
6b20fef52a
|
Invite: reset the input when the invitation has been done
|
2014-09-11 13:52:07 +02:00 |
|
Emmanuel ROHEE
|
c92740e8a9
|
Enable enter key in the invite input
|
2014-09-11 13:43:55 +02:00 |
|
Emmanuel ROHEE
|
cc049851d0
|
On member avatar mouseover, show user_id and power level
|
2014-09-11 12:01:44 +02:00 |
|
Emmanuel ROHEE
|
14a9652324
|
Room topic: if the request fails, show the error in the feedback
|
2014-09-11 11:53:37 +02:00 |
|
Emmanuel ROHEE
|
af44e9556d
|
BF: made input autofocus work when opening the room topic input
|
2014-09-11 11:49:59 +02:00 |
|
Emmanuel ROHEE
|
7e7eb0efc1
|
Show room topic change in the chat history and in the recents
|
2014-09-11 11:31:24 +02:00 |
|
Emmanuel ROHEE
|
8dcb6f24b5
|
getRoomEventIndex: improved speed for what it is used
|
2014-09-11 09:11:24 +02:00 |
|
Emmanuel ROHEE
|
44998ca450
|
Merge remote-tracking branch 'origin/develop' into webclient_initialSync
|
2014-09-10 18:35:05 +02:00 |
|
Emmanuel ROHEE
|
7a153b5c94
|
Show echoed emote with transparency
|
2014-09-10 18:29:52 +02:00 |
|
Emmanuel ROHEE
|
5a06f5c5fc
|
Reenabled transparent echo message. It turns to opaque without flickering now.
|
2014-09-10 18:24:03 +02:00 |
|
Emmanuel ROHEE
|
6d18b52931
|
Clean previous request feedback when doing a new request
|
2014-09-10 17:40:34 +02:00 |
|
Emmanuel ROHEE
|
81ecaf945d
|
BF: Made /op work when providing no power value. 50 is used as default in this case
|
2014-09-10 17:37:51 +02:00 |
|
Emmanuel ROHEE
|
811716592c
|
Made users count auto updating. Do show it if the info is not available (ex:user has not joined the room yet)
|
2014-09-10 16:46:06 +02:00 |
|
David Baker
|
e2d2d63bcd
|
Animation on call end icon.
|
2014-09-10 15:45:09 +01:00 |
|
David Baker
|
dde7ec8e64
|
Upgrade angularjs to 1.3.0-rc1 since this is new development
|
2014-09-10 15:43:27 +01:00 |
|
Emmanuel ROHEE
|
30bfa911fc
|
Member event: store use the the latest one
|
2014-09-10 16:26:11 +02:00 |
|
Emmanuel ROHEE
|
da3f842b8c
|
Removed wrong comments about recents-controller.js: it uses $rootScope.rooms not $rootScope.events.rooms managed by event-handler-service.js and used by other controllers
|
2014-09-10 14:53:03 +02:00 |
|
Emmanuel ROHEE
|
130cbdd7af
|
dedup events: state events conflict with messages events. Do not consider them in deduplication
|
2014-09-10 14:45:32 +02:00 |
|
Emmanuel ROHEE
|
b099634ba1
|
Reenabled handle of room states events in initialSync but do not add them to the displayed messages in the room page.
Show the m.room.member events only when they come from room.messages (from initialSync of pagination) not from room.state.
|
2014-09-10 14:36:30 +02:00 |
|
Emmanuel ROHEE
|
c2afc6cd0a
|
Presence events do not have event id. Do not discard them
|
2014-09-10 13:48:33 +02:00 |
|
David Baker
|
80b5470663
|
Add text for incoming calls
|
2014-09-10 11:35:14 +01:00 |
|
David Baker
|
7411794fa1
|
Show mxid in call bar for users with no displayname
|
2014-09-10 11:21:20 +01:00 |
|
David Baker
|
55fe0d8adc
|
Less buggy rejection of calls when busy
|
2014-09-10 11:12:02 +01:00 |
|
Emmanuel ROHEE
|
b63dd9506e
|
Improved requests: pagination is done from the data received in initialSync
|
2014-09-10 12:01:00 +02:00 |
|
David Baker
|
6f256e6380
|
reject calls if there's already a call in progress
|
2014-09-10 10:32:05 +01:00 |
|
David Baker
|
f90ce04a83
|
Hangup call if user denies media access.
|
2014-09-09 18:21:03 +01:00 |
|
David Baker
|
ccfb42e4ff
|
Don't try setting up the call if the user has canceled it before allowing permission.
|
2014-09-09 17:58:26 +01:00 |
|
David Baker
|
25e96f82db
|
Don't break if you press the hangup button before allowing media permission.
|
2014-09-09 17:52:01 +01:00 |
|
David Baker
|
253c327252
|
Don't play an engaged tone if we hang up locally.
|
2014-09-09 17:38:40 +01:00 |
|
Emmanuel ROHEE
|
1ef51e7939
|
Improved room page loading flow: do pagination only when the members list is available.
Killed an unexpected pagination trigger when the page load: paginateMore
|
2014-09-09 16:46:30 +02:00 |
|
Emmanuel ROHEE
|
746ed57c0e
|
When the user has been kicked or banned from a room, remove the room from his recents list
|
2014-09-09 16:31:50 +02:00 |