f6258221c1
Join rooms if we're not already in them when accepting a call coming from that room.
...
SYWEB-55 #resolve
2014-09-19 17:23:55 +01:00
03ac0c91ae
Merge branch 'videocalls' into develop
...
Conflicts:
webclient/room/room.html
2014-09-19 16:26:46 +01:00
709b8ac2b7
SYWEB-13 SYWEB-14: disabled "Call" button if the browser does not support all required WebRTC features
2014-09-19 17:20:33 +02:00
e9670fd144
SYWEB-13: disabled "Send image" button if the browser does not support HTML5 file API
2014-09-19 17:20:33 +02:00
270825ab2a
Fix undefined variable error
2014-09-19 11:41:49 +01:00
008515c844
A kind of the typo in the fix of SYWEB-44
2014-09-19 09:25:51 +02:00
301ef1bdc6
Room id leaks: log them when then happens. Plus log the conditions that made them happen
2014-09-19 09:17:18 +02:00
cf1e167034
Fixed SYWEB-16: When sending an invite over federation, the remote user sees the name of the resulting invite room as *their* name rather than the inviters
2014-09-19 09:07:16 +02:00
faec6f7f31
Oops. Removed dev logs
2014-09-18 17:48:20 +02:00
26dda48e50
SYWEB-14: BF: rooms invitations were not visible in recents after launching/refreshing the web page
2014-09-18 17:34:26 +02:00
3dea0d2806
undefined is empty. Fixed bug where empty bingWords with old accounts which hadn't logged in didn't send notifications.
2014-09-18 16:17:29 +01:00
3bd8cbc62f
Prettier and stabler video with basic support for viewing mode. For now, transition into 'large' mode is disabled.
2014-09-18 15:51:30 +01:00
b7d42c1e93
SYWEB-40: Only local rooms are shown in the recents list.
...
Removed an old patch that deduplicated join events. This patch is now useless. Plus it is buggy since it compared event.content and event.prev_content only on the membership field whereas these objects contain more data now like displayname...
2014-09-18 15:28:52 +02:00
0db0528e8e
Reverted patches done for SYWEB-40
2014-09-18 15:19:35 +02:00
ac8d73b258
Patch for SYWEB-40 : isStateEvent is not being set correctly, and really shouldn't be a configurable arg in the first place. As a result of being undefined, the events.rooms[rid].members object was not being updated in some cases, which combined with the recents-filter bug ( 32808e4), caused federated rooms to not appear in the recents list.
2014-09-18 12:02:52 +01:00
1c0408de08
unbreak calls in firefox
2014-09-18 11:59:27 +01:00
e932e5237e
WIP video chat layout
2014-09-18 11:04:45 +01:00
aeaeceb92c
Create room entries for public rooms too so their public state is transferred over correctly when you join it.
2014-09-17 16:38:40 +01:00
16f55d4275
webclient SYWEB-3 : Public rooms are bold. Can't think of a nicer way which doesn't clutter the recents list.
2014-09-17 16:38:40 +01:00
1fb2c831e8
Video calling (in a tiny box at the moment)
2014-09-17 16:26:35 +01:00
65c37cc852
SYWEB-22: Format emote('/me') messages correctly in desktop notification
2014-09-17 16:13:09 +02:00
9aed6a06cf
SYWEB-15: Always show the room alias as well as its name in the UI
2014-09-17 15:38:20 +02:00
d6c0cff3bd
Bugfix when content isn't a string.
2014-09-16 16:31:16 +01:00
95e171e19a
Don't bing for sent messages. Handle cases where the member is unknown rather than erroring out.
2014-09-16 16:23:20 +01:00
d7b206cc93
Added basic RegExp support.
2014-09-16 16:10:48 +01:00
3395a3305f
Bing on all the things if there are 0 bing words.
2014-09-16 15:47:29 +01:00
5aaa3c09c1
hidden/minimise/focus disaster disclaimer with the TODO
2014-09-16 15:35:23 +01:00
b36a0c71d1
Added utility function containsBingWord and hook up some css to it.
2014-09-16 15:35:23 +01:00
a402e0c5e6
Added bing detection logic. Persist the display name of the user in localstorage for use when binging.
2014-09-16 15:35:23 +01:00
660364d6a7
Move the notification logic out of an individual room controller and into the general event handler, so we can notify for >1 room.
2014-09-16 15:35:23 +01:00
84372cef4a
Time out calls from both ends properly.
2014-09-16 15:26:22 +01:00
45592ccdfd
WEB-29: Improve room page content loading
...
InitialSync: load the 30 last messages of each room so that a full page of messages can be displayed without additionnal request
2014-09-16 16:16:11 +02:00
dd2b933a0d
Use event age to recognise which calls are current and which aren't and hence support answering calls that were placed before we loaded the page.
2014-09-16 14:47:10 +01:00
faee41c303
Merge remote-tracking branch 'origin/develop' into webclient_data_centralisation
2014-09-16 08:50:53 +02:00
b0483cd47d
Filter room where the user has been banned
2014-09-15 18:22:38 +02:00
8aa4b7bf7f
Recents must not show temporary fake messages
2014-09-15 17:31:07 +02:00
2c00e1ecd9
Be consistent when associating keys with login types for registration/login.
2014-09-15 15:38:29 +01:00
42f5b0a6b8
Recents uses data directly from $rootscope.events
2014-09-15 16:31:59 +02:00
04fbda46dd
Make captcha work again with the new registration logic.
2014-09-15 14:52:39 +01:00
d821755b49
Updated webclient to support the new registration logic.
2014-09-15 14:31:53 +01:00
a9da2ec895
BF: presence and eventMap were not reset at logout.
2014-09-15 10:39:30 +02:00
842898df15
Send multiple candidates at once instead of all individually. Changes spec to include multiple candidates in a candidate(s) message.
2014-09-12 18:19:19 +01:00
3ed39ad20e
Clean data when user logs out
2014-09-12 17:43:35 +02:00
cc2cee4af6
Retry sending events that fail to send.
2014-09-12 16:32:22 +01:00
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
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
d934328904
Added edition of room name
2014-09-12 10:48:06 +02:00
6ea20f3503
Show room name updates in room history and recents.
...
Update it with the latest value
2014-09-12 10:12:56 +02:00
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
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
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
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
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
7e7eb0efc1
Show room topic change in the chat history and in the recents
2014-09-11 11:31:24 +02:00
8dcb6f24b5
getRoomEventIndex: improved speed for what it is used
2014-09-11 09:11:24 +02:00
44998ca450
Merge remote-tracking branch 'origin/develop' into webclient_initialSync
2014-09-10 18:35:05 +02:00
5a06f5c5fc
Reenabled transparent echo message. It turns to opaque without flickering now.
2014-09-10 18:24:03 +02:00
30bfa911fc
Member event: store use the the latest one
2014-09-10 16:26:11 +02:00
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
130cbdd7af
dedup events: state events conflict with messages events. Do not consider them in deduplication
2014-09-10 14:45:32 +02:00
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
c2afc6cd0a
Presence events do not have event id. Do not discard them
2014-09-10 13:48:33 +02:00
55fe0d8adc
Less buggy rejection of calls when busy
2014-09-10 11:12:02 +01:00
b63dd9506e
Improved requests: pagination is done from the data received in initialSync
2014-09-10 12:01:00 +02:00
f90ce04a83
Hangup call if user denies media access.
2014-09-09 18:21:03 +01:00
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
25e96f82db
Don't break if you press the hangup button before allowing media permission.
2014-09-09 17:52:01 +01:00
253c327252
Don't play an engaged tone if we hang up locally.
2014-09-09 17:38:40 +01:00
472b4fe48c
make calls work in Firefox
2014-09-09 14:54:06 +01:00
16b40cbede
Show call invites in the message table
2014-09-09 11:45:36 +01:00
6bdb23449a
Add ability to set topic by double-clicking on the topic text then hitting enter.
2014-09-08 18:40:34 -07:00
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
324020d5fe
Display the room topic in the room, underneath the name of the room.
2014-09-08 15:36:52 -07:00
da9b7b0368
Added big massive TODOs on a huge design problem with initial sync
2014-09-08 13:54:09 -07:00
9a5f224931
matrixService.rooms must be renamed matrixService.initialSync now
2014-09-08 18:21:41 +02:00
21d6ce2380
App startup improvements:
...
- do one and only one initialSync when the app starts. (recents-controller does not do its own anymore)
- initialSync: get only the last message per room instead of default number of messages (10)
Prevent recents-controller from loosing its data each time the page URL changes
2014-09-08 18:14:35 +02:00
972f664b6b
add sounds to the calling interface
2014-09-08 16:10:36 +01:00
dc1f202eca
fix desktop notifs, which were broken in eab463fd
2014-09-08 11:28:51 +02:00
ef0304beff
disable broken event dup suppression, and fix echo for /me
2014-09-08 11:28:50 +02:00
dd2ae64120
Set the room_alias field when we encounter a new one, rather than only from local storage.
2014-09-08 11:28:50 +02:00
6e341aebab
dedup all events
2014-09-06 00:36:55 -07:00
a1bf28b7f0
handle m.room.aliases for id<->alias mapping; remove local_storage map; stop local echo flickering by removing opacity transition for now; implement /join
2014-09-06 00:32:39 -07:00
1a298aad9c
Added captcha support on both the HS and web client.
...
Merge branch 'captcha' of github.com:matrix-org/synapse into develop
2014-09-05 23:32:51 -07:00
0b9e1e7b56
Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.
2014-09-05 17:58:06 -07:00
c03c255304
Better call bar (visually: still lacks ring[back] tones).
2014-09-06 00:14:02 +01:00
130458385e
Modified matrixService.register to specify if captcha results should be sent with the registration request. This is toggleable via useCaptcha in register-controller.
2014-09-05 13:56:36 -07:00
3be6156774
Created kick & unban methods in matrixService. Made some factorisation.
2014-09-05 17:30:50 +02:00
3501478828
BF: Make /unban work again
2014-09-05 16:56:50 +02:00
4b7a5b7bfa
Fixed empty display name (content.displayname in a room member can be null)
2014-09-05 15:54:34 +02:00
ec1cc29ecb
Revert "Fixed empty display name (content.displayname in a room member can be null)"
...
This reverts commit f286a4fcd4
2014-09-05 15:53:44 +02:00
f286a4fcd4
Fixed empty display name (content.displayname in a room member can be null)
2014-09-05 15:50:44 +02:00
3bc7bba262
switch IRC-style command parser to use regexps rather than split(" ") so that it doesn't choke on consecutive whitespaces
...
yield better errors for invalid commands
don't pass invalid commands through as messages
support kick reasons
2014-09-04 23:14:52 -07:00
1bf6c3faad
BF: presence PUT requests stopped to work with old "state" param yesterday evening :( - cda31fb755?diff=unified
2014-09-04 15:10:43 +02:00
3983bae160
Added mUserDisplayName, a filter to resolve a user display name from a user_id
2014-09-04 13:57:27 +02:00
7346ea85c0
Moved mRoomName filter into matrix-filter.js, a place for all generic filters using Matrix data.
2014-09-04 13:43:48 +02:00
d72ce4da64
Merge branch 'develop' of github.com:matrix-org/synapse into develop
...
Conflicts:
synapse/http/client.py
2014-09-03 18:25:17 +01:00
a25d1530ef
Make registering and logging in with a threepid work in the webclient.
2014-09-03 18:23:56 +01:00
66a5bc4fad
Fix ban path
2014-09-03 18:19:57 +01:00
0d75b9fa96
Fix a few cases where we used user_id instead of state_key
2014-09-03 18:03:10 +01:00
5dd1a738f8
Use /rooms/$room_id/state/m.room.member/$user_id to change the membership of another user
2014-09-03 18:33:51 +02:00
David Baker