Matthew Hodgson
96fd460cc8
fix import
2016-09-16 23:29:35 +01:00
Matthew Hodgson
cfba600961
Merge pull request #482 from aviraldg/fix-2165
...
Replace <p>s with <br/>s consistently
2016-09-16 22:46:41 +01:00
Matthew Hodgson
00d2fd471d
Merge pull request #483 from matrix-org/dbkr/scrollpanel_start_at_bottom
...
Add 'startAtBottom' flag
2016-09-16 22:38:21 +01:00
Matthew Hodgson
c322a191af
turn on E2E and Scalar by default
2016-09-16 18:36:03 +01:00
Matthew Hodgson
08543a66c4
fix race between setting canonical alias and creating aliases
2016-09-16 18:01:14 +01:00
David Baker
d0fd6e985f
Document paranoia on the startAtBottom param
2016-09-16 17:48:08 +01:00
Matthew Hodgson
67565f88fa
Merge pull request #474 from matrix-org/markjh/olm_version
...
Add the olm version to the settings page.
2016-09-16 17:30:35 +01:00
David Baker
806ef11fde
Add 'startAtBottom' flag
...
Controls whether a scrollPanel starts off at the bottom.
This may not be necessary and could either be derived from stickyBottom, but
this means I can be sure that the behaviour of ScrollPanel is completely
unchanged for all other uses to avoid breaking any other uses of
ScrollPanel.
2016-09-16 17:18:58 +01:00
Aviral Dasgupta
6befb09509
Replace <p>s with <br/>s consistently
...
Also, allow newlines in /commands.
Fixes vector-im/vector-web#2114 , vector-im/vector-web#2165 .
2016-09-16 21:40:00 +05:30
David Baker
1341ffca59
Merge pull request #479 from matrix-org/dbkr/directory_network_selector
...
Pass through config for Room Directory
2016-09-16 17:08:44 +01:00
Matthew Hodgson
a28aab42c4
fix NPE in guest access
2016-09-16 16:45:43 +01:00
Matthew Hodgson
891578d800
Merge pull request #481 from aviraldg/fix-autocomplete-unicode
...
Fix unicode completions in autocomplete.
2016-09-16 16:44:47 +01:00
Matthew Hodgson
e1bd97d509
don't try to set DM data for guests
2016-09-16 16:15:34 +01:00
Matthew Hodgson
88d92d1b61
Merge pull request #477 from matrix-org/luke/pm-plumbing-state
...
Add ability to set plumbing state in a room
2016-09-16 14:57:15 +01:00
Matthew Hodgson
b852756332
DM title
2016-09-16 14:35:43 +01:00
Aviral Dasgupta
2913e4605f
Fix unicode completions in autocomplete.
...
Fixes vector-im/vector-web#2208
2016-09-16 15:38:29 +05:30
Matthew Hodgson
2b9258d377
use new rawDisplayName in AddressTile
2016-09-16 03:19:33 +01:00
Matthew Hodgson
1c1c31eafc
fix tinter for LeftPanel
2016-09-16 02:53:41 +01:00
Matthew Hodgson
2c7c382d56
stop continuations leaking on filepanel
2016-09-16 02:40:09 +01:00
Matthew Hodgson
ff00474aa5
show RightPanel when people click on users
2016-09-16 02:37:06 +01:00
Matthew Hodgson
8519756c8c
add dialog keyboard shortcuts.
2016-09-16 02:26:17 +01:00
Matthew Hodgson
eeb01563f8
add dialog keyboard shortcuts. download keys on demand
2016-09-16 02:26:09 +01:00
Matthew Hodgson
77595320a7
close the RoomSettings when you close Scalar
2016-09-15 22:56:12 +01:00
Matthew Hodgson
3fcea1bfc7
only apply verified css to genuinely verified tiles
2016-09-15 22:56:12 +01:00
Matthew Hodgson
c21309fdf6
remove stale state
2016-09-15 22:56:12 +01:00
Matthew Hodgson
f2a8ead42a
Merge pull request #480 from aviraldg/develop
...
Disable username and room decorators
2016-09-15 22:36:33 +01:00
Aviral Dasgupta
39d213429d
Disable username and room decorators
2016-09-16 02:47:27 +05:30
Matthew Hodgson
b98c2ae25e
update crypto state of the room in realtime when turned on
2016-09-15 19:25:53 +01:00
David Baker
44fa851275
Pass through config for Room Directory
2016-09-15 17:18:53 +01:00
Matthew Hodgson
1899d61893
textual event for m.room.encryption
2016-09-15 17:01:02 +01:00
Matthew Hodgson
db66d728c9
more e2e disclaimers
2016-09-15 16:38:37 +01:00
Matthew Hodgson
70011410cf
Merge pull request #478 from matrix-org/wmwragg/correct-incoming-call-positioning
...
Wmwragg/correct incoming call positioning
2016-09-15 15:59:06 +01:00
wmwragg
d3f50dc2da
Tweaking the positoning of the incomingCallBox
2016-09-15 15:33:08 +01:00
Luke Barnard
514d667db2
Add ability to set plumbing state in a room
...
This takes the form:
The bridge will not create an admin room if there is plumbing state in the room of the form:
```JS
m.room.plumbing: {
content: {
status: "enabled"
},
...
}
```
2016-09-15 15:24:08 +01:00
Matthew Hodgson
2bd408983d
Merge pull request #475 from matrix-org/wmwragg/remove-old-filter
...
Wmwragg/remove old filter
2016-09-15 15:01:19 +01:00
wmwragg
45f17eb973
Added incomingCallBox to header and removed from roomTile
2016-09-15 14:39:34 +01:00
Matthew Hodgson
09b3395710
Merge pull request #476 from matrix-org/wmwragg/use-return-to-invite
...
Corrected onKeyUp misstype and return can now be used instead of clic…
2016-09-15 14:24:48 +01:00
wmwragg
54a65f8bd7
Corrected onKeyUp misstype and return can now be used instead of clicking the button
2016-09-15 12:17:32 +01:00
wmwragg
27456d0e20
Removed no longer used MultiInviteDialog, as it's now been replaced with the ChatInviteDialog
2016-09-15 11:46:06 +01:00
wmwragg
faa39eb482
Removed the nolonger used InviteMemberList
2016-09-15 11:39:59 +01:00
Mark Haines
c54b9c911f
Add the olm version to the settings page.
2016-09-15 11:31:54 +01:00
wmwragg
0d4eb4d22c
Removed all the InviteMemberList from the MemberList, and added a srearch box
2016-09-15 11:31:49 +01:00
Matthew Hodgson
f95a74951e
label device IDs
2016-09-15 02:49:25 +01:00
Matthew Hodgson
ce655c7f50
improve device info
2016-09-15 02:44:55 +01:00
Matthew Hodgson
8bda0bb095
basic verification UI
2016-09-15 01:55:51 +01:00
Matthew Hodgson
d8770b2b41
oops
2016-09-15 00:49:10 +01:00
Matthew Hodgson
499783d697
hide room settings when you launch scalar if you haven't made changes
2016-09-15 00:43:38 +01:00
Matthew Hodgson
1a126fee54
Merge pull request #473 from matrix-org/wmwragg/multi-invite-bugfix
...
Wmwragg/multi invite bugfix
2016-09-14 22:06:28 +01:00
Matthew Hodgson
acd999be45
better describe keys
2016-09-14 18:23:14 +01:00
wmwragg
6a91948469
Removed the Email (Invite by email) section
2016-09-14 18:01:07 +01:00
