db66d728c9
more e2e disclaimers
Matthew Hodgson
2016-09-15 16:38:37 +01:00
866164c4d9
Merge pull request #2222 from vector-im/wmwragg/correct-incoming-call-positioning
Matthew Hodgson
2016-09-15 15:59:14 +01:00
70011410cf
Merge pull request #478 from matrix-org/wmwragg/correct-incoming-call-positioning
Matthew Hodgson
2016-09-15 15:59:06 +01:00
5ceb1e641f
Placing the incomingCallBox in the sticky element, so it sticks when the header sticks
wmwragg
2016-09-15 15:34:11 +01:00
d3f50dc2da
Tweaking the positoning of the incomingCallBox
wmwragg
2016-09-15 15:33:08 +01:00
514d667db2
Add ability to set plumbing state in a room
Luke Barnard
2016-09-15 15:24:08 +01:00
f3cbb9fe90
Make the network dropdown work
David Baker
2016-09-15 15:18:12 +01:00
fe4371bf45
Merge pull request #2211 from vector-im/wmwragg/remove-old-filter
Matthew Hodgson
2016-09-15 15:01:37 +01:00
2bd408983d
Merge pull request #475 from matrix-org/wmwragg/remove-old-filter
Matthew Hodgson
2016-09-15 15:01:19 +01:00
45f17eb973
Added incomingCallBox to header and removed from roomTile
wmwragg
2016-09-15 14:39:34 +01:00
cde3f33db3
Added incomingCallBox to header and removed from roomTile
wmwragg
2016-09-15 14:37:53 +01:00
09b3395710
Merge pull request #476 from matrix-org/wmwragg/use-return-to-invite
Matthew Hodgson
2016-09-15 14:24:48 +01:00
82e257b4ea
make DM naming consistent
Matthew Hodgson
2016-09-15 13:23:17 +01:00
54a65f8bd7
Corrected onKeyUp misstype and return can now be used instead of clicking the button
wmwragg
2016-09-15 12:17:32 +01:00
3907da064e
Removed no longer used MultiInviteDialog, as it's now been replaced with the ChatInviteDialog
wmwragg
2016-09-15 11:46:35 +01:00
27456d0e20
Removed no longer used MultiInviteDialog, as it's now been replaced with the ChatInviteDialog
wmwragg
2016-09-15 11:46:06 +01:00
faa39eb482
Removed the nolonger used InviteMemberList
wmwragg
2016-09-15 11:39:59 +01:00
f43530e1ef
Tweaked font size to match the design spec
wmwragg
2016-09-15 11:39:21 +01:00
f6fb1561d7
Update the version of olm to 1.3.0
Mark Haines
2016-09-15 11:33:37 +01:00
c54b9c911f
Add the olm version to the settings page.
Mark Haines
2016-09-15 11:31:54 +01:00
0d4eb4d22c
Removed all the InviteMemberList from the MemberList, and added a srearch box
wmwragg
2016-09-15 11:31:49 +01:00
a1e3ec1d19
Added query to CSS and removed nolonger used SearchableEntityList
wmwragg
2016-09-15 11:30:46 +01:00
43b87e1f82
Add network selector that doesn't do anything yet
David Baker
2016-09-15 11:29:27 +01:00
f95a74951e
label device IDs
Matthew Hodgson
2016-09-15 02:49:25 +01:00
ce655c7f50
improve device info
Matthew Hodgson
2016-09-15 02:44:55 +01:00
2a85b2271c
tweak MemberInfo CSS
Matthew Hodgson
2016-09-15 02:44:34 +01:00
cb2c2c1b36
basic verification UI
Matthew Hodgson
2016-09-15 01:55:59 +01:00
8bda0bb095
basic verification UI
Matthew Hodgson
2016-09-15 01:55:51 +01:00
d8770b2b41
oops
Matthew Hodgson
2016-09-15 00:49:10 +01:00
499783d697
hide room settings when you launch scalar if you haven't made changes
Matthew Hodgson
2016-09-15 00:43:30 +01:00
c5a52d89be
Merge pull request #2198 from vector-im/wmwragg/multi-invite-bugfix
Matthew Hodgson
2016-09-14 22:06:44 +01:00
1a126fee54
Merge pull request #473 from matrix-org/wmwragg/multi-invite-bugfix
Matthew Hodgson
2016-09-14 22:06:28 +01:00
acd999be45
better describe keys
Matthew Hodgson
2016-09-14 18:23:14 +01:00
6a91948469
Removed the Email (Invite by email) section
wmwragg
2016-09-14 18:01:07 +01:00
efa574c452
The invite group, will no longer be shown when the directory listing is being shown
wmwragg
2016-09-14 17:13:06 +01:00
a06896f96c
Added the room name to the error message
wmwragg
2016-09-14 16:28:44 +01:00
435570a022
Better error reporting for failed multi invites
wmwragg
2016-09-14 16:19:09 +01:00
75c9f707e0
Don't show current user in queryList
wmwragg
2016-09-14 15:35:04 +01:00
d3a709f98e
Missed a _isDmChat call when refactoring
wmwragg
2016-09-14 15:19:57 +01:00
c3566e0b49
_isDmChat needs to check the passed in addrs rather than the state.inviteList as they may now differ
wmwragg
2016-09-14 15:17:29 +01:00
a7a81c8a32
A manual address doesn't have to be converted to an address tile before it can be used if it is the still in the input field when the start/invite button is pressed
wmwragg
2016-09-14 15:09:23 +01:00
2a8518b72b
Tab can now be used for selection of address from list, as well as adding a manual mxid or email address
wmwragg
2016-09-14 14:53:13 +01:00
66ef5213b8
Increased hitbox area to the whole invite section, not just the icon
wmwragg
2016-09-14 14:32:30 +01:00
370612135f
The scrollbars are nolonger always visible for the AddressSelector and ChatInviteDialog invite list
wmwragg
2016-09-14 13:55:10 +01:00
2752d6b444
improve e2e and scalar settings UI
Matthew Hodgson
2016-09-14 02:07:37 +01:00
ec05d1b9bd
improve e2e and scalar settings UI
Matthew Hodgson
2016-09-14 02:07:23 +01:00
0473b14564
fix e2e icon transitions
Matthew Hodgson
2016-09-14 01:25:43 +01:00
fd707f6f62
s/Direct Messages/People/
Matthew Hodgson
2016-09-13 19:47:41 +01:00
089951012b
actually, sod it, let's just call it Start chat
Matthew Hodgson
2016-09-13 19:42:35 +01:00
7d7cb35e15
Merge pull request #471 from matrix-org/revert-460-fix-linkify
Matthew Hodgson
2016-09-13 19:36:58 +01:00
ee672d06de
Revert "Fix linkification and bump linkifyjs dep"
Matthew Hodgson
2016-09-13 19:36:46 +01:00
c6a9614372
Merge pull request #2181 from vector-im/wmwragg/chat-multi-invite
Matthew Hodgson
2016-09-13 19:31:05 +01:00
8508e006f0
Merge pull request #469 from matrix-org/wmwragg/chat-multi-invite
Matthew Hodgson
2016-09-13 19:30:02 +01:00
17cf2fc745
Merge pull request #470 from matrix-org/matthew/right-panel-collapse
Matthew Hodgson
2016-09-13 19:09:18 +01:00
a623430c2b
Merge pull request #2182 from vector-im/matthew/right-panel-collapse
Matthew Hodgson
2016-09-13 19:08:54 +01:00
b247c8a87f
rename 'start chat' tooltip
Matthew Hodgson
2016-09-13 19:08:43 +01:00
eadcc5e2b9
repin linkify
Matthew Hodgson
2016-09-13 19:02:44 +01:00
91b90aa1fd
Merge pull request #460 from aviraldg/fix-linkify
Matthew Hodgson
2016-09-13 19:01:56 +01:00
eb6a4f97ba
make it work
Matthew Hodgson
2016-09-13 19:00:35 +01:00
7fa102998c
Added valid but unknown mx user
wmwragg
2016-09-13 17:09:40 +01:00
56606c01a0
Added valid but unknown mx user
wmwragg
2016-09-13 17:09:01 +01:00
283e1ccf4c
Merge pull request #468 from matrix-org/dbkr/create_room_modal
David Baker
2016-09-13 17:05:24 +01:00
5450e93df1
Verbiage
David Baker
2016-09-13 16:56:53 +01:00
f82629aed0
Merge pull request #463 from matrix-org/dbkr/flag_incoming_dms
David Baker
2016-09-13 16:42:24 +01:00
3741768a3a
Add modal dialog on new room button
David Baker
2016-09-13 16:40:15 +01:00
890100a5bc
Silly mistake fixed, spotted by Dave (cheers)
wmwragg
2016-09-13 16:28:35 +01:00
8bb9422907
Merge pull request #466 from aviraldg/feature-autocomplete-behaviour
Matthew Hodgson
2016-09-13 16:17:23 +01:00
eb2a55445c
Merge pull request #2175 from aviraldg/feature-autocomplete-behaviour
Matthew Hodgson
2016-09-13 16:17:14 +01:00
272dd82b9d
Added multi invite functionality
wmwragg
2016-09-13 16:06:04 +01:00
f7f907a0c7
Merge pull request #467 from matrix-org/dbkr/wmwragg/chat-multi-invite
William Wragg
2016-09-13 15:22:06 +01:00
3fe8b503e5
Fixed over collapse on Safari, and now hide the RHS footer Invite when collapsed
wmwragg
2016-09-13 14:57:58 +01:00
406771532d
Correct path for MultiInviter
David Baker
2016-09-13 14:56:54 +01:00
a53e009198
Missed a brace
David Baker
2016-09-13 14:55:16 +01:00
e95a6228e0
Merge remote-tracking branch 'origin/wmwragg/chat-multi-invite' into dbkr/wmwragg/chat-multi-invite
David Baker
2016-09-13 14:51:46 +01:00
2fd9e2a98f
Pull out multi-inviting from MultiInviteDialog
David Baker
2016-09-13 14:47:56 +01:00
bdee2d3b28
Shifting icon to center of collapsed section
wmwragg
2016-09-13 14:44:54 +01:00
15ee2578c5
Tweak to font colour
wmwragg
2016-09-13 14:36:13 +01:00
f8c9a28194
Updated to correct invite icon
wmwragg
2016-09-13 14:33:19 +01:00
2db8f4ae67
Added pass through of roomId
wmwragg
2016-09-13 14:30:37 +01:00
ca1bb0f700
Added new Invite button in the RHS footer which calls the new 'view_invite' action
wmwragg
2016-09-13 14:28:03 +01:00
768f11fe58
Added new Invite button in the RHS footer
wmwragg
2016-09-13 14:27:23 +01:00
acdcb21830
Fixed weird margin bug when LHS panel is collapsed
wmwragg
2016-09-13 13:32:50 +01:00
79e5e6f6fe
Fix force completion and hide rooms with no alias
Aviral Dasgupta
2016-09-13 18:02:33 +05:30
32b1b6f58a
WIP
Matthew Hodgson
2016-09-13 13:12:45 +01:00
c8def540c4
Merge pull request #464 from remram44/remove-mdown-breaks
Matthew Hodgson
2016-09-13 13:11:18 +01:00
ed2595e300
Merge pull request #465 from matrix-org/dbkr/fix_unset_dm
Matthew Hodgson
2016-09-13 13:08:31 +01:00
9a991a4dfd
Autocomplete fixes and improvements
Aviral Dasgupta
2016-09-13 17:29:17 +05:30
538b68a6b2
Updated with the new createRoom DM stuff
wmwragg
2016-09-13 12:47:31 +01:00
1530568354
Merge branch 'develop' into wmwragg/chat-multi-invite
wmwragg
2016-09-13 12:38:45 +01:00
524eeaa315
Merge up from develop
wmwragg
2016-09-13 12:37:52 +01:00
3b52081092
wip for collapsable RHS
Matthew Hodgson
2016-09-13 12:18:22 +01:00
7b25f4e069
wip for collapsable RHS
Matthew Hodgson
2016-09-13 12:18:09 +01:00
Matthew Hodgson