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
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
David Baker
df1cc8748f
Change references to MatrixTools to Rooms
...
or remove where they were unused
2016-09-07 11:33:58 +01:00
David Baker
094080629d
Actually commit changed path
2016-09-07 10:19:39 +01:00
David Baker
d5b23e9e0e
Save guessed DM rooms to account data
...
Also bugfix
2016-09-06 17:43:39 +01:00
David Baker
8401323156
Hopefully read DM rooms from account data
2016-09-06 16:39:21 +01:00
David Baker
50ef695740
Fix: conference rooms were no longer hidden
2016-09-05 17:42:22 +01:00
wmwragg
9c0f51fb82
Merge branch 'develop' into wmwragg/one-to-one-chat
2016-09-05 12:06:31 +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
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
Kegan Dougal
6ec7e5df28
Move scalar auth stuff to ScalarAuthClient from RoomSettings
2016-09-02 16:03:24 +01:00
wmwragg
4c05edb71b
Refactor of the RoomTooltip, so that it is easier to use, and also works with Safari
2016-09-02 15:47:40 +01:00
Matthew Hodgson
f9d8829ba2
let you join confs either as voice or video
2016-09-02 15:38:28 +01:00
Matthew Hodgson
5543c126e6
fix tests
2016-08-30 15:22:52 +01:00
wmwragg
c30ff57c62
Better comments
2016-08-30 12:29:25 +01:00
wmwragg
8061a2f279
Fixed historical scetion not scrolling up when clicked if not hidden and stuck
2016-08-30 11:55:51 +01:00
wmwragg
769e7d3b2e
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-30 11:19:54 +01:00
wmwragg
83c4fd4b2f
Code clean up, and better comments
2016-08-30 10:45:17 +01:00
wmwragg
2b1ed707c4
Better comments, and correct bottom header sticky calc to allow clicking
2016-08-28 19:18:41 +01:00
wmwragg
123d9b56c8
calculating the scrollAreaHeight correctly taking into account the different scroll methods available on macOSX, i.e. System Preferences>General>Show Scroll Bars
2016-08-28 16:25:20 +01:00
wmwragg
8f7d3394e6
Always setup stickies, even if we aren't going to use them so that the following map can fire
2016-08-28 12:02:20 +01:00
wmwragg
7631539584
Fixed incorrect init calculation of originalPosition attribute
2016-08-28 11:39:47 +01:00
Matthew Hodgson
50d09f73f5
add leave/forget button to RoomSettings
2016-08-28 00:00:22 +01:00
wmwragg
73dd05b01d
Corrected incorrect offset from top of window for the scrollArea
2016-08-26 18:31:02 +01:00
wmwragg
8ccb1d482a
Better comments, and adjusted the top sticky logic, so that the very top header isn't allways stuck
2016-08-26 15:52:57 +01:00
wmwragg
5f9c794f0c
Tweaking autoscroll to only adjust if header stuck at top and not at bottom
2016-08-26 15:36:16 +01:00
wmwragg
b9e95865af
Click on stuck header scrolls to that header, collapses expands for none stuck header
2016-08-26 15:09:13 +01:00
wmwragg
71e829fd32
Getting click to not collapse expand when header is stuck
2016-08-26 14:36:39 +01:00
wmwragg
774e24a3b4
Added some logic to turn off sticky headers when the scroll area isn't large enough to support them
2016-08-26 11:01:04 +01:00
wmwragg
c8c2f733e2
Re-calculate sticky header positions when sublist header is clicked
2016-08-26 09:56:07 +01:00
wmwragg
7fcdd0f77a
Initial pass at sticky headers for the LHS panel section labels
2016-08-25 19:46:01 +01:00
Richard van der Hoff
c8b2d5106f
Merge pull request #430 from matrix-org/rav/fix_search_regression
...
Fix NPE when we don't know the sender of an event
2016-08-25 19:31:16 +01:00
Richard van der Hoff
96567dad0d
Fix NPE when we don't know the sender of an event
...
Fixes a bug introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/426 .
Particularly when we are showing search results, we may not recognise the
sender of an event; attempting to create a MemberAvatar for it will lead to
null-reference errors.
Also a bit of untangling of the logic of needsSenderProfile. Since
https://github.com/matrix-org/matrix-react-sdk/pull/422 ,
EventTileType.needsSenderProfile was only being called on MessageEvents, and
therefore only returned true. It's a shame to see all this logic going into
EventTile rather than the individual EventTileTypes, but since it's there,
let's not leave the unused logic lying around in the EventTileType
implementations.
2016-08-25 16:55:09 +01:00
Matthew Hodgson
36d8fa9786
fix avatar clicking in memberinfo
2016-08-25 16:20:38 +01:00
Matthew Hodgson
2f0599aae1
Merge pull request #419 from aviraldg/feature-autocomplete-improvements
...
Update autocomplete design and scroll it correctly
2016-08-24 14:47:22 +01:00
Matthew Hodgson
08c0d7e298
Merge pull request #426 from matrix-org/wmwragg/chat-message-presentation
...
Added event/info message avatars back in
2016-08-23 17:14:11 +01:00
wmwragg
ae8234ffe3
Added event/info message avatars back in
2016-08-23 15:58:27 +01:00
Kegsay
c10208a203
Merge pull request #423 from matrix-org/kegan/scalar-postmessage-api
...
Add postMessage API required for integration provisioning
2016-08-23 15:00:44 +01:00
wmwragg
6a4d02ffc5
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-23 12:49:21 +01:00
wmwragg
c362d4ff01
Added updating of count when room tile notification state changed
2016-08-23 12:40:28 +01:00
Kegan Dougal
9162a0ff01
Add postMessage API required for integration provisioning
...
Supports querying member state and creating invites only.
2016-08-23 12:00:11 +01:00
wmwragg
6d1f9003e2
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-23 10:52:50 +01:00
Aviral Dasgupta
884abbd7e9
Cleanup autocomplete
2016-08-23 00:36:31 +05:30
wmwragg
edb7301b37
Moving the drirect messages above rooms
2016-08-22 14:10:51 +01:00
wmwragg
48a2567b82
Merge branch 'develop' into wmwragg/chat-message-presentation
2016-08-19 17:19:30 +01:00
wmwragg
993333490d
Removal of the mini avatars for action (info) messages
2016-08-19 16:38:05 +01:00
wmwragg
afd1ab1582
Comment to describe what info messages are
2016-08-18 22:19:23 +01:00
wmwragg
a55c4a2a52
Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message
2016-08-18 21:53:37 +01:00
Richard van der Hoff
e29be619c9
Merge pull request #420 from matrix-org/dbkr/make_notif_silder_work
...
Make the notification slider work
2016-08-18 15:23:45 +01:00
David Baker
fc2c62e896
We can use the new consts here
2016-08-18 15:19:24 +01:00
David Baker
af48b8920e
Various PR feedback
2016-08-18 14:00:14 +01:00
David Baker
9e45279894
Use enumalike thing
2016-08-18 13:44:58 +01:00
David Baker
73e486cc58
Hide red highlight badge in mute mode
2016-08-18 11:58:27 +01:00
David Baker
dd088794c2
Remove the mute toggle from room settings
...
As it now incorrectly represents the mute as a binary toggle rather than a quad-state
2016-08-17 18:50:34 +01:00
David Baker
87f94bde62
Fix up notification setting listener in roomtile
...
The previous dispatch only did binary muted/non-muted but we now have 4 states. We now just listen for the push rules account data and update on that so it stays in sync if the pishrules are changed elsewhere.
Also add util functions used here for getting the notif state and in vector for both getting and setting it.
2016-08-17 18:26:37 +01:00
Richard van der Hoff
69e8cb6f44
Merge branch 'rav/no_deviceload_if_disabled' into develop
2016-08-17 14:41:18 +01:00
Richard van der Hoff
0356f04b9c
MemberInfo: initialise _enableDevices in componentWillMount
...
... to avoid referencing it in render() before it is set
2016-08-17 14:40:10 +01:00
Aviral Dasgupta
e173900808
Update autocomplete design and scroll it correctly
2016-08-17 17:27:19 +05:30
Richard van der Hoff
30168a1b9c
Don't download E2E devices if feature disabled
...
If the user hasn't enabled the E2E setting in the labs, there is no point in
firing off the device download request when the MemberInfo is opened.
2016-08-17 09:57:06 +01:00
wmwragg
52f5061cc5
Made the menu button a clickable image rather than an input element
2016-08-16 17:34:33 +01:00
wmwragg
58d9789645
Increase main avatar size
2016-08-16 16:03:34 +01:00
wmwragg
c359358101
Initial context menu positioning and style change
2016-08-16 11:59:26 +01:00
wmwragg
6fd61f5816
Initial reposition of the timestamp
2016-08-16 10:26:27 +01:00
Matthew Hodgson
2a3b0e85ea
add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/
2016-08-15 21:37:26 +01:00
David Baker
fc0c5a5c58
Tidy up fix to multi-invite
2016-08-12 10:02:55 +01:00
Matthew Hodgson
d1eec57118
fix inviting some more
2016-08-11 17:11:51 -05:00
Matthew Hodgson
3bedad69cd
unbreak inviting :(
2016-08-11 17:08:17 -05:00
wmwragg
7713f0d587
refactoring out the direct message section
2016-08-11 17:32:39 +01:00
wmwragg
cc1cec8431
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-11 16:48:31 +01:00
wmwragg
a07833e7fc
Merge branch 'develop' into wmwragg/direct-chat-sublist
2016-08-11 16:47:19 +01:00
David Baker
109184aab7
Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style
...
Only show Autocomplete if autocomplete is enabled
2016-08-11 16:47:07 +01:00
wmwragg
4aea2caefc
Initial pass at creating a direct message section
2016-08-11 16:45:19 +01:00
David Baker
7cb663d39d
Only show Autocomplete if autocomplete is enabled
...
It was just never used, but it has 1px top border which makes the top border on chat look too big
2016-08-11 16:28:32 +01:00
Matthew Hodgson
3704e2c648
Merge pull request #402 from matrix-org/wmwragg/room-tag-menu
...
Wmwragg/room tag menu
2016-08-11 08:59:32 -05:00
David Baker
4780f9000d
Merge pull request #403 from matrix-org/dbkr/multi_invite
...
Better support for inviting multiple people
2016-08-11 12:34:16 +01:00
David Baker
f42d619e7d
Missing comma
2016-08-11 12:30:37 +01:00
David Baker
5b71b28dcf
Fix member info
2016-08-11 11:34:14 +01:00
David Baker
46899a0086
Merge pull request #395 from aviraldg/fix-emoji
...
Various fixes and improvements to emojification.
2016-08-11 10:23:00 +01:00
David Baker
806477dcce
s/then/done/
2016-08-11 10:08:14 +01:00
