79e5e6f6fe
Fix force completion and hide rooms with no alias
2016-09-13 18:02:33 +05:30
32b1b6f58a
WIP
2016-09-13 13:12:45 +01:00
c8def540c4
Merge pull request #464 from remram44/remove-mdown-breaks
...
Remove markdown line breaks
2016-09-13 13:11:18 +01:00
9a991a4dfd
Autocomplete fixes and improvements
2016-09-13 17:30:29 +05:30
538b68a6b2
Updated with the new createRoom DM stuff
2016-09-13 12:47:31 +01:00
524eeaa315
Merge up from develop
2016-09-13 12:37:52 +01:00
3b52081092
wip for collapsable RHS
2016-09-13 12:18:22 +01:00
fbf2d5f96c
Fix tests (wip)
2016-09-13 16:46:20 +05:30
cba76d651a
Moved the isValidAddress method to the Invite utilty object
2016-09-13 12:12:33 +01:00
0b267763e2
Small refactor to handle Direct Message chat as well as multi invite chat
2016-09-13 12:07:49 +01:00
b62622a814
Improve autocomplete behaviour
...
Fixes vector-im/vector-web#1761
2016-09-13 15:46:02 +05:30
d19686b96d
Fix un-marking rooms as DM rooms
2016-09-13 11:06:07 +01:00
ca2ba55288
Added error checking, and UI
2016-09-13 11:02:59 +01:00
99dfcb4ed2
It's no longer a onde to one chat dialog, as you can invite multiple people
2016-09-13 10:33:15 +01:00
a7ea193189
A supplied roomId property, will make the dialog use that room for the invites, rather than creating a new one
2016-09-13 10:29:17 +01:00
ce40fa1a8f
add missing dialog
2016-09-12 23:43:00 +01:00
9b7ab46a72
dedicated dialog box for E2E messages
2016-09-12 23:42:24 +01:00
8cab40d987
Disable markdown line breaks
...
Stop combinations of - and _ turning into a line break.
2016-09-12 17:51:59 -04:00
5a548c3d12
add an onclick to the e2e icons
2016-09-12 18:50:52 +01:00
2943db1072
Flag incoming DMs as such
...
* Add the 'is_direct' flag to rooms created for DMs
* For invites, look for the DM flag when getting the DM user ID for a room
* When accepting an invite, look for the flag and mark the room as a DM room if appropriate.
2016-09-12 18:32:44 +01:00
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
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
0f720dd6b8
Oops, toLowerCase call in wrong place
2016-09-12 17:41:32 +01:00
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
13eed6cd39
fix NPE in EventTile
2016-09-12 17:29:26 +01:00
5a0a72ee46
Added styling for unknown addresses
2016-09-12 17:25:14 +01:00
95d9df7534
Make an invalid mx user an unknown user AddressTile
2016-09-12 17:15:56 +01:00
44b8c29c84
Allow addresses to be added as text when space or comma are pressed
2016-09-12 17:06:43 +01:00
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
9eae1c5bb7
final e2e icons
2016-09-12 16:51:19 +01:00
937e195157
Merge remote-tracking branch 'origin/develop' into dbkr/createdoom_dm
2016-09-12 16:44:44 +01:00
8e7b1820b9
unbreak video thumbs
2016-09-12 16:28:39 +01:00
6ffa7c23cd
Don't re-use parted rooms for DMs
2016-09-12 16:05:51 +01:00
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
4836025a1d
First pass at adding multiple addresses, can only add from AddressSelector at the moment
2016-09-12 15:21:17 +01:00
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
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
7d58968ea6
Correctly positioning the selected element if list shrinks in size
2016-09-12 14:07:51 +01:00
28dcbb2a78
Refactored the queryList into seperate AddressSelector component
2016-09-12 13:00:44 +01:00
3a1159ce12
e2e look & feel
2016-09-12 01:37:51 +01:00
e6b4b8c1cb
bring back small avatars for info msgs otherwise the design breaks
2016-09-11 23:01:20 +01:00
8db2a4d46f
Fix linkification and bump linkifyjs dep
2016-09-12 03:30:00 +05:30
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
83209197f4
Merge branch 'develop' into matthew/notif-panel
2016-09-11 02:38:16 +01:00
34bb37aaba
layout for file & notif panel
2016-09-11 02:14:27 +01:00
bae6409edb
show badge menu on RoomTile hoverover
2016-09-11 00:30:43 +01:00
be33c35876
use new onRoomTimelineReset API to let notif timeline reset itself
2016-09-10 10:46:30 +01:00
6f270fd621
remove debug
2016-09-10 01:39:19 +01:00
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
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
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
8e518af96c
Merge remote-tracking branch 'origin/develop' into dbkr/dont_crash_if_no_dm_rooms
2016-09-09 17:38:13 +01:00
f1ed750246
Don't crash if no DM rooms with someone
...
...when opening MemberInfo.
getDMRoomsForUserId should always return a valid list, since it's a list of what DM rooms you have with somebody.
2016-09-09 17:35:35 +01:00
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
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
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
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
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
590d6d3ee8
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
2016-09-09 16:22:48 +01:00
aa0f15c46e
List common rooms in MemberInfo
2016-09-09 16:15:01 +01:00
9c290c4b8d
Return after sending an error
2016-09-09 16:14:41 +01:00
a306a5e694
Fix bug whereby refreshing Vector would not allow querying of membership state
...
This was caused by Vector only sending a room alias with the `view_room` action.
We now resolve this to a room ID if we don't have a room ID.
2016-09-09 16:06:19 +01:00
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
a6b0a7d5dc
Should supply the roomId
2016-09-09 15:01:40 +01:00
17b75a589f
Added the little green men for direct message rooms
2016-09-09 14:36:51 +01:00
fec1e4d4c1
Add some tests for the rich text editor
2016-09-09 18:07:42 +05:30
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
904348e62a
Merge branch 'develop' into matthew/notif-panel
2016-09-09 11:12:52 +01:00
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
6ddc31fb66
Merge pull request #443 from matrix-org/luke/post-messages
...
Scalar Messaging: Expose join_rules and restrict to currently viewed room
2016-09-09 09:57:48 +01:00
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
db61d8e8ad
another null check
2016-09-09 02:28:14 +01:00
f4d939da81
null checks on room in onRoomTimeline
2016-09-09 02:09:12 +01:00
4aef352a5c
update to use new API based on js-sdk PR input
2016-09-08 22:48:44 +01:00
f605b172a7
Better log
2016-09-08 17:38:51 +01:00
3c7864a7ad
remove unused _gatherTimelinePanelRef
2016-09-08 14:52:08 +01:00
f88ba9df11
fix comment & use room.getUnfilteredTimelineSet()
2016-09-08 14:38:34 +01:00
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
ee7c064690
I can't spell 'likely'
2016-09-08 13:56:45 +01:00
b0a4b017c3
Merge pull request #440 from aviraldg/feature-rte-formatbar
...
Formatting toolbar for RTE message composer.
2016-09-08 13:54:26 +01:00
d1974a75fd
Only Direct Message rooms, that aren't parted or forgotten are used
2016-09-08 13:09:54 +01:00
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
8da7b98ad0
RTE: Remove dead code, fix <del> styling
2016-09-08 11:21:39 +05:30
c882d66b0d
make NotificationPanel work
2016-09-08 03:02:31 +01:00
27b3f5f6b1
create a global notif timeline set for each client
2016-09-08 03:02:26 +01:00
7174648f94
don't show RRs if manageRRs is false
2016-09-08 03:01:38 +01:00
334564c814
unbreak tests
2016-09-07 22:54:38 +01:00
8f75bce29e
add fixmes
2016-09-07 22:54:37 +01:00
990d84df77
make FilePanel refresh when we switch rooms
2016-09-07 22:54:37 +01:00
e7074ef9af
apply FilePanel css and fix filtering
2016-09-07 22:54:37 +01:00
c2f2fb3816
use passive event listener for mousewheel
2016-09-07 22:54:37 +01:00
e5dd2e0b46
make FilePanel work, superficially at least
2016-09-07 22:54:37 +01:00
b4c1eca1c5
fix key warning
2016-09-07 22:54:37 +01:00
850578a973
FilePanel
2016-09-07 22:54:37 +01:00
e22d0a53b6
WIP switch-over of TimePanel from taking Rooms to taking EventTimelineSets
2016-09-07 22:54:37 +01:00
820cd579d8
fix stupid double-spacing issue
2016-09-07 22:54:37 +01:00
c3de035964
filepanel
2016-09-07 22:54:37 +01:00
ae34f2ed5c
placeholder NotificationPanel
2016-09-07 22:53:15 +01:00
d9ffe30a0d
WIP notif panel
2016-09-07 22:53:15 +01:00
c11232742b
Fix focus and toggling issues in formatting bar
2016-09-08 02:46:56 +05:30
8974442084
Hide empty autocomplete and remove word counter
2016-09-08 00:43:10 +05:30
802ec1169f
Fix Markdown conversion to not add extra \n
...
Fixes vector-im/vector-web#2094
2016-09-08 00:03:55 +05:30
f0f20beae0
RTE format bar enhancements
2016-09-08 00:03:54 +05:30
0c0c44b050
Formatting toggle, markdown indicator, quoting
...
Fixes vector-im/vector-web#1825
2016-09-08 00:02:55 +05:30
71251293e4
RTE formatbar (wip)
...
Fixes vector-im/vector-web#2024
2016-09-08 00:02:16 +05:30
ec4086c5fc
API for (un)marking rooms as DM rooms
2016-09-07 17:46:45 +01:00
7dfb8857d8
Merge branch 'develop' into wmwragg/one-to-one-chat
2016-09-07 17:22:10 +01:00
ce68a5bfc8
clean up
2016-09-07 17:08:02 +01:00
31d2a819f0
Get power levels before setting them
2016-09-07 17:06:57 +01:00
ca3910f5a8
Mouse actions on the queryList added, as well as better queryListElement styling
2016-09-07 16:18:50 +01:00
66b2944011
Convert Rooms.js to ES6
2016-09-07 11:45:32 +01:00
8a4606cfbf
Remove unused import
2016-09-07 11:34:55 +01:00
df1cc8748f
Change references to MatrixTools to Rooms
...
or remove where they were unused
2016-09-07 11:33:58 +01:00
db42d629aa
Rename MatrixTools to Rooms
...
Since all the functions therein are to do with rooms, so this name is probably more helpful
2016-09-07 11:30:09 +01:00
dd186dd612
Fixed wrong type to justified prop
2016-09-07 10:59:06 +01:00
7e60012bd4
Added justification for the AddressTile, when requested
2016-09-07 10:55:44 +01:00
094080629d
Actually commit changed path
2016-09-07 10:19:39 +01:00
8f6d413ebd
Move DMRoomMap to a util subdir
2016-09-07 10:07:43 +01:00
4bfa57b34e
Getting join rules does not need user ID
2016-09-07 09:58:48 +01:00
3977ea0074
Add ability to set power level
2016-09-07 09:57:07 +01:00
45256f5d58
Validation checks added
2016-09-06 17:46:00 +01:00
d5b23e9e0e
Save guessed DM rooms to account data
...
Also bugfix
2016-09-06 17:43:39 +01:00
52f050b5f9
Better scrolling UX, and fixed bug which created a room when no address supplied
2016-09-06 17:20:37 +01:00
c03f145f04
Basic keyboard scrolling of queryList
2016-09-06 17:00:28 +01:00
91b1c1f0fc
Initial highlighting selected address - styling not final
2016-09-06 16:39:50 +01:00
8401323156
Hopefully read DM rooms from account data
2016-09-06 16:39:21 +01:00
d1398b137a
Circumventing autofill by using a textarea rather than an input type=text
2016-09-06 16:15:48 +01:00
0f73c4326e
Added scrolling to queryList
2016-09-06 15:46:58 +01:00
391fe0ab77
Basic address list created, and UX tweaks for interaction
2016-09-06 15:24:23 +01:00
ddf1e4841a
Selecting users with arrow keys added
2016-09-06 13:07:06 +01:00
1fe85f37fd
Correct AddressTile and ChatInviteDialog styling, and performance tweak to searching
2016-09-06 11:34:38 +01:00
cb4df84d49
Missing curly bracket
2016-09-06 10:36:44 +01:00
fa3387b326
Code review
...
- use an empty state key
- swap switch for if
- s/not in view/not visible/
2016-09-06 10:29:38 +01:00
80dd927275
Merge pull request #445 from matrix-org/dbkr/fix_hide_conference_rooms
...
Fix: conference rooms were no longer hidden
2016-09-05 18:39:15 +01:00
04889a89ec
Only count rooms we're in as DM rooms
2016-09-05 18:35:32 +01:00
50ef695740
Fix: conference rooms were no longer hidden
2016-09-05 17:42:22 +01:00
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
3dd84e2b8a
Initial AddressTile added
2016-09-05 17:28:08 +01:00
d782d5bbc7
Fix error dialog on conf call error
2016-09-05 17:03:10 +01:00
310e6602ca
Fix ref to dispatcher
2016-09-05 15:24:05 +01:00
efccdab0ad
Better error message for room not viewed
2016-09-05 15:16:22 +01:00
1c29c95990
Only current room works with postMessage
2016-09-05 15:13:48 +01:00
54f21c9acc
Expose join rules of a room
2016-09-05 14:58:16 +01:00
d9c6448a0f
Adding better deafults and ErrorDialog message
2016-09-05 14:29:21 +01:00
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
9c0f51fb82
Merge branch 'develop' into wmwragg/one-to-one-chat
2016-09-05 12:06:31 +01:00
ca443e01d8
Initial commit of the new ChatInviteDialog
2016-09-05 12:03:16 +01:00
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
67c623d410
Rename the action to make it clearer what it is doing
2016-09-05 10:29:03 +01:00
6e2fd85760
Merge pull request #437 from matrix-org/kegan/starter-links
...
Implement starter link support
2016-09-05 09:10:39 +01:00
Aviral Dasgupta