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 |
|
Kegan Dougal
|
2bd4346075
|
More rst formatting.
|
2014-09-09 15:13:50 -07:00 |
|
Kegan Dougal
|
f23e5b17b6
|
Extra restrictions to make parsing easier.
|
2014-09-09 15:11:06 -07:00 |
|
Kegan Dougal
|
56a358481e
|
Tyops
|
2014-09-09 15:00:48 -07:00 |
|
Kegan Dougal
|
d5704cf2a3
|
Added initial draft for human-readable ID rules.
|
2014-09-09 14:53:35 -07:00 |
|
Kegan Dougal
|
550e8f32ac
|
Move model to client-server for now.
|
2014-09-09 13:51:13 -07: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 |
|
Erik Johnston
|
a75f8686ba
|
Fix bug where we used an unbound local variable if we ended up rolling back the persist_event transaction
|
2014-09-09 16:27:59 +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 |
|
Emmanuel ROHEE
|
5132fcdb8b
|
Made recents list display something when joining a room which we do not have state data yet
|
2014-09-09 16:10:20 +02:00 |
|
Emmanuel ROHEE
|
332986ba43
|
BF: prevent joined messages to be displayed twice when joining a room.
Do this by synchronizing the m.room.member joined event from the events stream and the start of the pagination
|
2014-09-09 16:10:20 +02:00 |
|
David Baker
|
472b4fe48c
|
make calls work in Firefox
|
2014-09-09 14:54:06 +01:00 |
|
Emmanuel ROHEE
|
fd2d3fcfd7
|
Removed historical code: recents does not need to manage presences. It is already done by initialSync in eventStreamService
|
2014-09-09 12:47:42 +02:00 |
|
Emmanuel ROHEE
|
967ac65586
|
BF: Made the grey background of the current room cover all the cell width
|
2014-09-09 12:47:42 +02:00 |
|
David Baker
|
16b40cbede
|
Show call invites in the message table
|
2014-09-09 11:45:36 +01:00 |
|
Kegan Dougal
|
75890d7bdd
|
CSS tweakage
|
2014-09-08 19:02:23 -07:00 |
|
Kegan Dougal
|
e8f19b4c0d
|
Display a 'Set Topic' button if there is no topic or it's a 0-len string.
|
2014-09-08 18:59:26 -07:00 |
|
Kegan Dougal
|
6bdb23449a
|
Add ability to set topic by double-clicking on the topic text then hitting enter.
|
2014-09-08 18:40:34 -07:00 |
|
Kegan Dougal
|
f64cc237fc
|
Fixed bug which displayed an older room topic because it was being returned from /initialSync messages key. Check the ts of the event before clobbering state.
|
2014-09-08 17:27:51 -07:00 |
|
Kegan Dougal
|
ef2111099a
|
long topic is long. CSS support it
|
2014-09-08 17:19:04 -07:00 |
|
Kegan Dougal
|
df50a6823f
|
Display public room topics if they exist on the public room list.
|
2014-09-08 17:14:58 -07:00 |
|
Kegan Dougal
|
324020d5fe
|
Display the room topic in the room, underneath the name of the room.
|
2014-09-08 15:36:52 -07:00 |
|
Kegan Dougal
|
544691ab05
|
Update jsfiddles to have more helpful error messages when there is no connection when logging in.
|
2014-09-08 14:54:10 -07:00 |
|
Erik Johnston
|
5236de5b03
|
Add slightly helpful advice on how to generate config if you don'y already have one
|
2014-09-08 22:52:50 +01:00 |
|
Erik Johnston
|
91b370650a
|
Don't autogen config in synctl for the same reasons we don't turn of --generate-config by default on the homeserver - it is liable to confuse people who have moved the config file or have chosen a non standard location.
Also, don't override log file location.
|
2014-09-08 22:48:46 +01:00 |
|
Erik Johnston
|
e062f2dfa8
|
Apparently we can't do txn.rollback(), so raise and catch an exception instead.
|
2014-09-08 22:37:19 +01:00 |
|
Kegan Dougal
|
c1a25756c2
|
Added demo.details
|
2014-09-08 14:24:28 -07:00 |
|
Kegan Dougal
|
d692994ea4
|
Updated jsfiddle links to point to github
|
2014-09-08 14:16:22 -07:00 |
|
Kegan Dougal
|
a3590dfa26
|
Bodge to default to '1 users' when you create a room, which is better than blindly assuming a recents controller is writing to rootScope.rooms and setting numUsersInRoom there.
|
2014-09-08 14:01:34 -07:00 |
|