David Baker
03ac0c91ae
Merge branch 'videocalls' into develop
...
Conflicts:
webclient/room/room.html
2014-09-19 16:26:46 +01:00
Emmanuel ROHEE
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
Emmanuel ROHEE
e9670fd144
SYWEB-13: disabled "Send image" button if the browser does not support HTML5 file API
2014-09-19 17:20:33 +02:00
Emmanuel ROHEE
f9688d7519
SYWEB-13: Do not start the app if the browser does not support WEBStorage.
...
Internet Explorer case: Launch the app only for versions 9 and higher.
2014-09-19 17:20:33 +02:00
David Baker
da8b5a5367
First working version of UI chrome for video calls.
2014-09-19 16:18:15 +01:00
Erik Johnston
28bcd01e8d
SYN-47: Fix bug where we still returned events for rooms we had left.
...
SYN-47 #resolve
2014-09-19 14:45:21 +01:00
Kegan Dougal
fba67ef951
Small formatting fixes
2014-09-19 14:19:02 +01:00
Kegan Dougal
3fa01be9e4
formatting
2014-09-19 12:04:26 +01:00
David Baker
270825ab2a
Fix undefined variable error
2014-09-19 11:41:49 +01:00
Emmanuel ROHEE
008515c844
A kind of the typo in the fix of SYWEB-44
2014-09-19 09:25:51 +02:00
Emmanuel ROHEE
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
Emmanuel ROHEE
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
Erik Johnston
beed1ba089
Merge branch 'develop' of github.com:matrix-org/synapse
2014-09-18 18:25:23 +01:00
Matthew Hodgson
2ab7e23790
fix SYWEB-41 (hopefully)
2014-09-18 18:18:30 +01:00
Emmanuel ROHEE
0dac2f7a8d
Fixed missing component dependency which created a crash
2014-09-18 19:12:21 +02:00
Kegan Dougal
6a6a718898
Added test directory, karma conf, and angular-mocks. Expect it to work? Pah, not yet.
2014-09-18 17:59:15 +01:00
Emmanuel ROHEE
faec6f7f31
Oops. Removed dev logs
2014-09-18 17:48:20 +02:00
Emmanuel ROHEE
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
Erik Johnston
3108accdee
Remove lie from change log.
2014-09-18 16:31:18 +01:00
Erik Johnston
e0f060d89b
Merge branch 'master' of github.com:matrix-org/synapse into develop
2014-09-18 16:22:14 +01:00
Erik Johnston
380852b58e
Bump Changelog and version
2014-09-18 16:20:53 +01:00
Kegan Dougal
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
David Baker
0505014152
add unprefixed filter css as well
2014-09-18 16:15:48 +01:00
David Baker
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
Matthew Hodgson
d583aaa0c3
fix wordwrap
2014-09-18 15:25:25 +01:00
Matthew Hodgson
3a7375f15e
fix binger description
2014-09-18 15:25:11 +01:00
Erik Johnston
79a5fb469b
Merge branch 'master' of github.com:matrix-org/synapse into develop
2014-09-18 14:52:19 +01:00
Erik Johnston
9fd0c74e90
Bump changelog and versions
2014-09-18 14:46:23 +01:00
Erik Johnston
335e5d131c
Merge branch 'test-sqlite-memory' of github.com:matrix-org/synapse into develop
...
Conflicts:
tests/handlers/test_profile.py
2014-09-18 14:31:47 +01:00
Emmanuel ROHEE
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
Emmanuel ROHEE
0db0528e8e
Reverted patches done for SYWEB-40
2014-09-18 15:19:35 +02:00
Erik Johnston
704e7e9f44
Merge branch 'release-v0.3.0' of github.com:matrix-org/synapse
2014-09-18 13:05:07 +01:00
Erik Johnston
c58f7f293d
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.3.0
2014-09-18 12:03:30 +01:00
Erik Johnston
19095552aa
Update Change log
2014-09-18 12:03:08 +01:00
Kegan Dougal
a64ff63a41
SYWEB-3 : Boldify if the join_rule is public, rather than visibility so it plays nicer with federation.
2014-09-18 12:02:52 +01:00
Erik Johnston
17db2b27bf
Update version in UPGRADE
2014-09-18 12:02:52 +01:00
Kegan Dougal
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
Kegan Dougal
a6f5c88b47
Still add the room to the filtered list even if you can't work out the number of users in the room.
2014-09-18 12:02:51 +01:00
David Baker
1c0408de08
unbreak calls in firefox
2014-09-18 11:59:27 +01:00
Kegan Dougal
9cebfd9d90
SYWEB-3 : Boldify if the join_rule is public, rather than visibility so it plays nicer with federation.
2014-09-18 11:35:59 +01:00
David Baker
e932e5237e
WIP video chat layout
2014-09-18 11:04:45 +01:00
Kegan Dougal
fbf221ae6d
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 10:35:44 +01:00
Kegan Dougal
32808e4111
Still add the room to the filtered list even if you can't work out the number of users in the room.
2014-09-18 10:05:34 +01:00
Matthew Hodgson
9f94f9de48
freenode verification
2014-09-17 23:53:53 +01:00
Paul "LeoNerd" Evans
4571cf7baa
Merge branch 'develop' into test-sqlite-memory
2014-09-17 18:27:47 +01:00
Paul "LeoNerd" Evans
bfae582fa3
Remark on remaining storage modules that still need unit tests
2014-09-17 18:27:30 +01:00
David Baker
575852e6b5
add note to upgrade.rst about web client spec breaking change.
2014-09-17 17:51:22 +01:00
Erik Johnston
10b4291b54
Bump versions
2014-09-17 17:49:01 +01:00
Paul "LeoNerd" Evans
bcf5121937
Neaten more of the storage layer tests with assertObjectHasAttributes; more standardisation on test layout
2014-09-17 16:58:59 +01:00
Kegan Dougal
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
