Matthew Hodgson
|
ce40fa1a8f
|
add missing dialog
|
2016-09-12 23:43:00 +01:00 |
|
Matthew Hodgson
|
9b7ab46a72
|
dedicated dialog box for E2E messages
|
2016-09-12 23:42:24 +01:00 |
|
Remi Rampin
|
8cab40d987
|
Disable markdown line breaks
Stop combinations of - and _ turning into a line break.
|
2016-09-12 17:51:59 -04:00 |
|
Matthew Hodgson
|
5a548c3d12
|
add an onclick to the e2e icons
|
2016-09-12 18:50:52 +01:00 |
|
David Baker
|
e49547eb3e
|
Merge pull request #461 from matrix-org/dbkr/dont_reuse_parted_rooms
Don't re-use parted rooms for DMs
|
2016-09-12 18:30:55 +01:00 |
|
David Baker
|
f6478f111a
|
Merge pull request #458 from matrix-org/dbkr/createdoom_dm
Update createRoom to support creating DM rooms
|
2016-09-12 18:29:43 +01:00 |
|
wmwragg
|
0f720dd6b8
|
Oops, toLowerCase call in wrong place
|
2016-09-12 17:41:32 +01:00 |
|
wmwragg
|
96299e864a
|
Need cto push the actual userId not the toLowerCase version, as userId's are case sensitive
|
2016-09-12 17:38:32 +01:00 |
|
Matthew Hodgson
|
13eed6cd39
|
fix NPE in EventTile
|
2016-09-12 17:29:26 +01:00 |
|
wmwragg
|
5a0a72ee46
|
Added styling for unknown addresses
|
2016-09-12 17:25:14 +01:00 |
|
wmwragg
|
95d9df7534
|
Make an invalid mx user an unknown user AddressTile
|
2016-09-12 17:15:56 +01:00 |
|
wmwragg
|
44b8c29c84
|
Allow addresses to be added as text when space or comma are pressed
|
2016-09-12 17:06:43 +01:00 |
|
wmwragg
|
5b2cc555a3
|
Refactored AddressTile to use string address rather than user object, so it can user email as well mx userId
|
2016-09-12 16:52:04 +01:00 |
|
Matthew Hodgson
|
9eae1c5bb7
|
final e2e icons
|
2016-09-12 16:51:19 +01:00 |
|
David Baker
|
937e195157
|
Merge remote-tracking branch 'origin/develop' into dbkr/createdoom_dm
|
2016-09-12 16:44:44 +01:00 |
|
Matthew Hodgson
|
8e7b1820b9
|
unbreak video thumbs
|
2016-09-12 16:28:39 +01:00 |
|
David Baker
|
6ffa7c23cd
|
Don't re-use parted rooms for DMs
|
2016-09-12 16:05:51 +01:00 |
|
wmwragg
|
e28a3f10a0
|
Don't allow someone who is already on the invite list to appear in the AddressSelector
|
2016-09-12 15:48:32 +01:00 |
|
wmwragg
|
4836025a1d
|
First pass at adding multiple addresses, can only add from AddressSelector at the moment
|
2016-09-12 15:21:17 +01:00 |
|
wmwragg
|
5acdb8233b
|
The dismiss function now correctly deletes the dismissed element. Also the query render, will now render all invitees
|
2016-09-12 15:04:32 +01:00 |
|
wmwragg
|
d538377b82
|
Added an inviteList state to hold all the users to invite, but currently pretend it only has one users (the first one)
|
2016-09-12 14:48:00 +01:00 |
|
wmwragg
|
7d58968ea6
|
Correctly positioning the selected element if list shrinks in size
|
2016-09-12 14:07:51 +01:00 |
|
wmwragg
|
28dcbb2a78
|
Refactored the queryList into seperate AddressSelector component
|
2016-09-12 13:00:44 +01:00 |
|
Matthew Hodgson
|
3a1159ce12
|
e2e look & feel
|
2016-09-12 01:37:51 +01:00 |
|
Matthew Hodgson
|
e6b4b8c1cb
|
bring back small avatars for info msgs otherwise the design breaks
|
2016-09-11 23:01:20 +01:00 |
|
Matthew Hodgson
|
46205ad83c
|
back out small avatars for emotes for now as they conflict with the E2E artwork.
they will be reintroduced once we have lozenges
|
2016-09-11 22:49:05 +01:00 |
|
Matthew Hodgson
|
83209197f4
|
Merge branch 'develop' into matthew/notif-panel
|
2016-09-11 02:38:16 +01:00 |
|
Matthew Hodgson
|
34bb37aaba
|
layout for file & notif panel
|
2016-09-11 02:14:27 +01:00 |
|
Matthew Hodgson
|
bae6409edb
|
show badge menu on RoomTile hoverover
|
2016-09-11 00:30:43 +01:00 |
|
Matthew Hodgson
|
86da0e0d63
|
Merge pull request #459 from VShell/fix-cas
Fix CAS support by using a temporary Matrix client
|
2016-09-09 21:19:19 +01:00 |
|
Shell Turner
|
1380bf705a
|
Fix CAS support by using a temporary Matrix client
Signed-off-by: Shell Turner <cam.turn@gmail.com>
|
2016-09-09 21:01:10 +01:00 |
|
David Baker
|
96fabe09d2
|
Update createRoom to support creating DM rooms
* Make ChatInviteDialog and MemberInfo createRoom use it
* Fix bug in setDMRoom
|
2016-09-09 19:25:00 +01:00 |
|
David Baker
|
9cff4d59ca
|
Merge pull request #456 from matrix-org/dbkr/dm_rooms_correct_section
Don't always show DM rooms in Direct Messages
|
2016-09-09 17:35:02 +01:00 |
|
David Baker
|
78f53bd403
|
Merge pull request #455 from matrix-org/dbkr/memberinfo_list_rooms
Add DM rooms with that person to the MemberInfo panel
|
2016-09-09 17:30:32 +01:00 |
|
David Baker
|
4c5db7cc9f
|
Don't always show DM rooms in Direct Messages
Favourites belong in favourites & parted ones belong in Historical, etc.
|
2016-09-09 17:23:15 +01:00 |
|
Matthew Hodgson
|
fed3f48297
|
Merge pull request #452 from aviraldg/test-rte
Add some tests for the rich text editor
|
2016-09-09 17:16:04 +01:00 |
|
David Baker
|
6f2e0a4cdf
|
Make rooms in MemberInfo update when necessary
Factor out the chunk of code that looks through a read receipt event
to see if it contain a read receipt from a given user, now we use it
in 2 places.
|
2016-09-09 16:59:59 +01:00 |
|
David Baker
|
590d6d3ee8
|
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
|
2016-09-09 16:22:48 +01:00 |
|
David Baker
|
aa0f15c46e
|
List common rooms in MemberInfo
|
2016-09-09 16:15:01 +01:00 |
|
Matthew Hodgson
|
4de0e19ef3
|
Merge pull request #453 from matrix-org/wmwragg/one-to-one-indicators
Wmwragg/one to one indicators
|
2016-09-09 15:08:48 +01:00 |
|
wmwragg
|
a6b0a7d5dc
|
Should supply the roomId
|
2016-09-09 15:01:40 +01:00 |
|
wmwragg
|
17b75a589f
|
Added the little green men for direct message rooms
|
2016-09-09 14:36:51 +01:00 |
|
Aviral Dasgupta
|
fec1e4d4c1
|
Add some tests for the rich text editor
|
2016-09-09 18:07:42 +05:30 |
|
Richard van der Hoff
|
b724b0c6b6
|
Update MemberDeviceInfo display
Show the displayname when we have it
Show the deviceid in a tooltip
Show the Ed25519 public key to help verify
|
2016-09-09 11:41:56 +01:00 |
|
Matthew Hodgson
|
904348e62a
|
Merge branch 'develop' into matthew/notif-panel
|
2016-09-09 11:12:52 +01:00 |
|
Matthew Hodgson
|
dce2dd36ec
|
Merge pull request #448 from matrix-org/wmwragg/one-to-one-chat
Wmwragg/one to one chat
|
2016-09-09 10:46:11 +01:00 |
|
wmwragg
|
840bfe84c1
|
Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters
|
2016-09-09 06:57:30 +01:00 |
|
Matthew Hodgson
|
db61d8e8ad
|
another null check
|
2016-09-09 02:28:14 +01:00 |
|
Matthew Hodgson
|
4aef352a5c
|
update to use new API based on js-sdk PR input
|
2016-09-08 22:48:44 +01:00 |
|
David Baker
|
c9475e2ae5
|
Merge pull request #449 from matrix-org/dbkr/toggle_dm_room
API for (un)marking rooms as DM rooms
|
2016-09-08 14:11:22 +01:00 |
|
Matthew Hodgson
|
b0a4b017c3
|
Merge pull request #440 from aviraldg/feature-rte-formatbar
Formatting toolbar for RTE message composer.
|
2016-09-08 13:54:26 +01:00 |
|
wmwragg
|
d1974a75fd
|
Only Direct Message rooms, that aren't parted or forgotten are used
|
2016-09-08 13:09:54 +01:00 |
|
wmwragg
|
d0523cae70
|
If a Direct Message room already exists for the users specified, then just go to that room, rather than creating another one
|
2016-09-08 11:45:09 +01:00 |
|
Aviral Dasgupta
|
8da7b98ad0
|
RTE: Remove dead code, fix <del> styling
|
2016-09-08 11:21:39 +05:30 |
|
Matthew Hodgson
|
b4c1eca1c5
|
fix key warning
|
2016-09-07 22:54:37 +01:00 |
|
Matthew Hodgson
|
820cd579d8
|
fix stupid double-spacing issue
|
2016-09-07 22:54:37 +01:00 |
|
Aviral Dasgupta
|
c11232742b
|
Fix focus and toggling issues in formatting bar
|
2016-09-08 02:46:56 +05:30 |
|
Aviral Dasgupta
|
8974442084
|
Hide empty autocomplete and remove word counter
|
2016-09-08 00:43:10 +05:30 |
|
Aviral Dasgupta
|
802ec1169f
|
Fix Markdown conversion to not add extra \n
Fixes vector-im/vector-web#2094
|
2016-09-08 00:03:55 +05:30 |
|
Aviral Dasgupta
|
f0f20beae0
|
RTE format bar enhancements
|
2016-09-08 00:03:54 +05:30 |
|
Aviral Dasgupta
|
0c0c44b050
|
Formatting toggle, markdown indicator, quoting
Fixes vector-im/vector-web#1825
|
2016-09-08 00:02:55 +05:30 |
|
Aviral Dasgupta
|
71251293e4
|
RTE formatbar (wip)
Fixes vector-im/vector-web#2024
|
2016-09-08 00:02:16 +05:30 |
|
David Baker
|
ec4086c5fc
|
API for (un)marking rooms as DM rooms
|
2016-09-07 17:46:45 +01:00 |
|
wmwragg
|
7dfb8857d8
|
Merge branch 'develop' into wmwragg/one-to-one-chat
|
2016-09-07 17:22:10 +01:00 |
|
wmwragg
|
ca3910f5a8
|
Mouse actions on the queryList added, as well as better queryListElement styling
|
2016-09-07 16:18:50 +01:00 |
|
David Baker
|
df1cc8748f
|
Change references to MatrixTools to Rooms
or remove where they were unused
|
2016-09-07 11:33:58 +01:00 |
|
wmwragg
|
dd186dd612
|
Fixed wrong type to justified prop
|
2016-09-07 10:59:06 +01:00 |
|
wmwragg
|
7e60012bd4
|
Added justification for the AddressTile, when requested
|
2016-09-07 10:55:44 +01:00 |
|
David Baker
|
094080629d
|
Actually commit changed path
|
2016-09-07 10:19:39 +01:00 |
|
wmwragg
|
45256f5d58
|
Validation checks added
|
2016-09-06 17:46:00 +01:00 |
|
David Baker
|
d5b23e9e0e
|
Save guessed DM rooms to account data
Also bugfix
|
2016-09-06 17:43:39 +01:00 |
|
wmwragg
|
52f050b5f9
|
Better scrolling UX, and fixed bug which created a room when no address supplied
|
2016-09-06 17:20:37 +01:00 |
|
wmwragg
|
c03f145f04
|
Basic keyboard scrolling of queryList
|
2016-09-06 17:00:28 +01:00 |
|
wmwragg
|
91b1c1f0fc
|
Initial highlighting selected address - styling not final
|
2016-09-06 16:39:50 +01:00 |
|
David Baker
|
8401323156
|
Hopefully read DM rooms from account data
|
2016-09-06 16:39:21 +01:00 |
|
wmwragg
|
d1398b137a
|
Circumventing autofill by using a textarea rather than an input type=text
|
2016-09-06 16:15:48 +01:00 |
|
wmwragg
|
0f73c4326e
|
Added scrolling to queryList
|
2016-09-06 15:46:58 +01:00 |
|
wmwragg
|
391fe0ab77
|
Basic address list created, and UX tweaks for interaction
|
2016-09-06 15:24:23 +01:00 |
|
wmwragg
|
ddf1e4841a
|
Selecting users with arrow keys added
|
2016-09-06 13:07:06 +01:00 |
|
wmwragg
|
1fe85f37fd
|
Correct AddressTile and ChatInviteDialog styling, and performance tweak to searching
|
2016-09-06 11:34:38 +01:00 |
|
David Baker
|
50ef695740
|
Fix: conference rooms were no longer hidden
|
2016-09-05 17:42:22 +01:00 |
|
wmwragg
|
5ed680e5ce
|
Picking the top of the queryList not _userList, as the queryList is the query filtered _userList
|
2016-09-05 17:34:20 +01:00 |
|
wmwragg
|
3dd84e2b8a
|
Initial AddressTile added
|
2016-09-05 17:28:08 +01:00 |
|
wmwragg
|
d9c6448a0f
|
Adding better deafults and ErrorDialog message
|
2016-09-05 14:29:21 +01:00 |
|
wmwragg
|
3d66dff0aa
|
Basic ChatInviteDialog functionality - Creates new room, and tries to invite the address typed into the text box, and reports errors, if any
|
2016-09-05 14:16:21 +01:00 |
|
wmwragg
|
9c0f51fb82
|
Merge branch 'develop' into wmwragg/one-to-one-chat
|
2016-09-05 12:06:31 +01:00 |
|
wmwragg
|
ca443e01d8
|
Initial commit of the new ChatInviteDialog
|
2016-09-05 12:03:16 +01:00 |
|
Richard van der Hoff
|
31e09e6137
|
Merge pull request #441 from matrix-org/rav/get_stored_devices_for_user
Make MemberInfo to use client.getStoredDevicesForUser
|
2016-09-05 10:38:24 +01:00 |
|
Kegsay
|
6e2fd85760
|
Merge pull request #437 from matrix-org/kegan/starter-links
Implement starter link support
|
2016-09-05 09:10:39 +01:00 |
|
Kegan Dougal
|
56ac0004e5
|
Use href='#' hack to make link text look like a link
|
2016-09-05 09:10:15 +01:00 |
|
Richard van der Hoff
|
fc40bdcbfc
|
Make MemberInfo to use client.getStoredDevicesForUser
It's more powerful than listDeviceKeys, and isn't deprecated.
|
2016-09-05 00:08:16 +01:00 |
|
Richard van der Hoff
|
a316c652b7
|
Convert MemberDeviceInfo to ES6 class
|
2016-09-04 21:49:06 +01:00 |
|
wmwragg
|
f9ab2fa957
|
When zoomed in, the sticky headers should correctly position themselves
|
2016-09-04 08:01:04 +01:00 |
|
wmwragg
|
721baf8d42
|
Tolltip tweak to not require the passing in of the parent
|
2016-09-04 07:42:09 +01:00 |
|
Richard van der Hoff
|
bc8e7724e8
|
Make the 'encrypt this room' knob be megolm
|
2016-09-03 18:42:54 +01:00 |
|
wmwragg
|
03e74f48f8
|
Positioned Tooltip better
|
2016-09-03 13:44:44 +01:00 |
|
Matthew Hodgson
|
fdfd6ecfd9
|
let users join confs as voice or video
|
2016-09-03 13:27:46 +01:00 |
|
wmwragg
|
405dcf76eb
|
Further tweaks to the tooltip to better handle its position, and simplify it's use
|
2016-09-03 12:44:55 +01:00 |
|
wmwragg
|
bffefd9261
|
Tweak of the RoomTooltip to use DOM element for the parent rather than a React component
|
2016-09-02 18:41:44 +01:00 |
|
Kegan Dougal
|
45ada1887d
|
Implement starter link support
This involves modal dialogs because browsers are *terrible*.
|
2016-09-02 16:36:43 +01:00 |
|