8961c87cf9
feat: Autocomplete selection wraparound
2016-07-03 01:11:34 +05:30
cd928fe6f5
Merge remote-tracking branch 'upstream/develop' into feature-autocomplete
2016-07-03 00:00:02 +05:30
a671e07da7
Merge pull request #326 from matrix-org/dbkr/fix_user_links
...
Fix user links
2016-06-30 17:43:08 +01:00
ce39822957
Merge pull request #327 from theworldbright/1492-fix-ordering-memberlist
...
Fix ordering of Memberlist
2016-06-29 10:21:15 +01:00
7609b9eba8
Simplify logic for timestamp ordering of memberlist
2016-06-29 17:45:24 +09:00
b3d871aa6a
Add back comment
2016-06-29 17:33:41 +09:00
69cb0a8f1c
Switch ordering of Idle users
2016-06-29 17:08:17 +09:00
72a1d5a0de
Remove unused comments
2016-06-29 16:58:08 +09:00
174caceabf
Use lastActiveAgo to reorder member list
2016-06-29 16:57:59 +09:00
ba47c5a198
Merge remote-tracking branch 'origin/develop' into dbkr/fix_user_links
2016-06-28 17:15:17 +01:00
e8337b2119
More PR feedback
2016-06-28 17:11:47 +01:00
548c392236
PR feedback
2016-06-28 14:59:45 +01:00
c016eb78c8
Fix user links
...
'Start chat' was broken on the sidebar if the panel was displayed by clicking on a link to a user. This adds null checking for the hack that we use to display users in the member panel.
2016-06-28 14:28:05 +01:00
98c03869a7
Display an error message if room not found
...
Fixes https://github.com/vector-im/vector-web/issues/1012
2016-06-24 15:34:07 +01:00
a1dd427420
Implement device blocking
...
This is the react-sdk part of
https://github.com/matrix-org/matrix-js-sdk/pull/146 . It adds 'Block'/'Unblock'
buttons to the device list, and updates the deviceVerified listeners to listen
for deviceVerificationChanged instead.
Also adds an extra <div> to the deviceinfo section to help me with the
CSS.
2016-06-23 17:30:04 +01:00
cdaf317f1d
Merge pull request #321 from matrix-org/rav/encrypt_room_setting
...
RoomSettings: add encryption setting
2016-06-23 13:40:30 +01:00
3a21958faf
RoomSettings: add encryption setting
...
Add a knob to RoomSettings which will send the appropriate event to enable
encryption in the room.
2016-06-23 12:21:31 +01:00
7a7d7c0e02
Fix a pair of warnings from RoomSettings
...
- initialise the 'publish' checkbox correctly so react doesn't grumble about it
turning from uncontrolled into controlled
- PowerSelector's 'controlled' property isn't really required, so mark it as
such.
2016-06-23 11:15:55 +01:00
a04f03669c
RoomSettings: refactor permissions calculations
...
The logic for calculating who had permission for what was impenetrable (and
wrong, in parts), so rewrite it to be a bit clearer.
2016-06-23 10:36:16 +01:00
a74db3a815
Get basic keyboard selection working
2016-06-21 18:33:39 +05:30
fb6eec0f7d
Hide/show autocomplete based on selection state
2016-06-21 15:46:20 +05:30
442291c0a4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-autocomplete
2016-06-21 04:09:22 +05:30
4af983ed90
Style changes and improvements in autocomplete
2016-06-20 13:52:55 +05:30
94aec10512
Merge branch 'develop' into dbkr/scalar
2016-06-19 22:40:48 +01:00
ad00abe9c0
Support for making devices unverified
...
Because its useful for testing
Requires support from js-sdk, and (ideally) css from vector-web
2016-06-17 16:24:23 +01:00
b9d7743e5a
Emoji provider, DDG working, style improvements
2016-06-17 04:58:09 +05:30
769b3f0c2a
Merge branch 'develop' into feature-autocomplete
2016-06-17 00:37:39 +05:30
8b1332cd29
Use different keys for new MessageComposerInput
2016-06-16 14:46:09 +05:30
3f1b57b35b
Fix cursor bug, persist editor mode & rte default
2016-06-15 00:13:34 +05:30
5199cd04a2
Merge pull request #292 from aviraldg/feature-rte
...
Rich Text Editor
2016-06-14 15:27:39 +01:00
ba69e4365d
more RTE fixes
2016-06-14 19:28:51 +05:30
8cb086ef31
use constants for keycodes in RTE
2016-06-14 19:14:09 +05:30
e973d18085
Hide e2e features if not enabled
...
Don't show the device info in the MemberInfo and UserSettings unless the user
has ticked the 'labs' box.
2016-06-14 11:57:08 +01:00
34be17cc7e
use rte labs setting
2016-06-14 00:10:43 +05:30
4bc8ec3e6d
room, user, ddg autocomplete providers (wip)
2016-06-12 17:02:46 +05:30
0df201c483
Merge branch 'develop' into feature-autocomplete
2016-06-12 14:10:23 +05:30
8f45f168d5
Fix highlighting behaviour on switch
...
Hopefully made the code a little bit clearer.
2016-06-12 01:08:31 +02:00
a5a3e4e915
Basic Markdown highlighting
2016-06-12 01:07:16 +02:00
c0d7629980
get /commands working again
2016-06-12 00:11:27 +05:30
b960d220d2
cleanup, better comments, markdown hotkeys
2016-06-11 22:24:09 +05:30
e4217c3fb7
rte improvements, markdown mode
2016-06-11 15:52:08 +05:30
bf8e56e04c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte
2016-06-10 04:43:44 +05:30
4e0720db12
Fix MessageComposerInput.setLastTextEntry
2016-06-10 00:03:40 +05:30
29cdd1fc41
user and room decorators, history & typing notifs
2016-06-09 23:53:09 +05:30
049e3a968b
Merge pull request #303 from matrix-org/rav/factor_out_createroom
...
Factor out common parts of room creation
2016-06-09 11:05:22 +01:00
de36aa63fb
Factor out common parts of room creation
...
Take the duplicated code out of MatrixChat and MemberInfo, and put it in a
separate 'createRoom' module
2016-06-09 10:58:25 +01:00
2352661513
MemberInfo: remove spinner if device query fails
...
If the request to /keys/query fails (for example, because we are a guest), we
need to remove the spinner.
2016-06-09 10:57:19 +01:00
85770feb31
device verification: use a js-sdk event
...
We'll probably want to be able to bubble up device verifications from the
js-sdk at some point, so let's use a js-sdk event for this.
2016-06-08 21:25:42 +01:00
7ce49c752f
Wire up events to update UI on device verification
...
Use the dispatcher to update event tiles and memberdeviceinfo when a device is
marked as verified.
2016-06-08 18:35:43 +01:00
1616431d27
EventTile: add classes to indicate verifiedness
...
Add a couple of CSS classes to event tiles to reflect whether encrypted events
have been verified or not.
2016-06-08 17:02:42 +01:00
Aviral Dasgupta