5961cf3958
Merge pull request #1684 from matrix-org/luke/fix-tag-panel-shift-ctrl-click
...
Fix shift and shift-ctrl click in TagPanel
2018-01-04 17:08:01 +00:00
c294e336b5
Merge pull request #1344 from matrix-org/t3chguy/hide_left_chats_memberinfo
...
skip direct chats which either you or the target have left
2018-01-04 16:49:17 +00:00
831a3f7e42
Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo
2018-01-04 16:41:16 +00:00
d5e2a73d99
Add alt condition back in, rename to specify igorance of shift
...
because this is really what this function is for - we want to
ignore specifically shift but not necessarily alt (despite
this probably not having any real impact).
2018-01-04 12:06:19 +00:00
d3e47fa99d
Merge pull request #1682 from Nostradamos/fix_riot_web_4821
...
Make scroll on paste in RTE compatible with https://github.com/vector-im/riot-web/pull/5900
2018-01-03 15:48:43 +00:00
63335f70e5
Merge pull request #1685 from matrix-org/dbkr/remove-double-fullstop
...
Remove extra full stop
2018-01-03 13:41:13 +00:00
613e3b7ac1
Remove extra full stop
2018-01-03 11:57:49 +00:00
d495519986
Fix shift-ctrl-click
...
isOnlyCtrlOrCmdKeyEvent is predicated on !shiftKey, so another function was needed for cases where we ignore other keys
2018-01-03 11:39:15 +00:00
85cdd888e8
Combine TagOrderStore and FilterStore
...
so that shift-click semantics can work. The store that computes the shift-click
rules has to be aware of the actual order of tags displayed, so they must be done
in the same store.
2018-01-03 11:33:59 +00:00
2189fe9256
removed console.log
2018-01-03 01:52:02 +01:00
e543f55572
refactored code
2018-01-03 01:50:03 +01:00
36df3acf4d
Merge remote-tracking branch 'origin/develop' into fix_riot_web_4821
2018-01-02 23:07:47 +01:00
03f88df66e
Make the scrolling compatible with our riot-web fix for https://github.com/vector-im/riot-web/issues/4821
2018-01-02 22:44:18 +01:00
57fb09dfb7
Fix dodgy merge done in 874a7bf
...
where develop branch should have been used for a chunk of code
2018-01-02 19:26:56 +00:00
5abf0440c6
Merge pull request #1666 from matrix-org/luke/fix-duplicate-group-profile-requests
...
Dedupe requests to fetch group profile data
2018-01-02 19:02:50 +00:00
8eef09335a
Merge pull request #1667 from matrix-org/luke/fix-naive-tag-panel-group-profile-requesting
...
Get Group profile from TagTile instead of TagPanel
2018-01-02 19:02:33 +00:00
2338fba2ee
Merge pull request #1664 from matrix-org/luke/fix-room-list-group-store-leak
...
Fix leaking of GroupStore listeners in RoomList
2018-01-02 18:58:22 +00:00
479e88cff7
Log an error to get group profile data
2018-01-02 18:55:50 +00:00
45e860de7a
Document GroupStore.registerListener
2018-01-02 18:12:08 +00:00
874a7bf1de
Merge branch 'develop' into luke/fix-room-list-group-store-leak
2018-01-02 16:19:37 +00:00
133837cdbe
Document initial state
2018-01-02 15:59:10 +00:00
833cd321f3
Log warning in case of failed group profile fetch
2018-01-02 15:58:24 +00:00
31855f18f8
Initialise profile state
2018-01-02 15:56:32 +00:00
2cb4c897ce
Move `getInitialState` before `componentWillMount`
2018-01-02 13:45:19 +00:00
3cb128094d
Add more comments to TagTile to explain what it is
2018-01-02 13:44:22 +00:00
80f11e5c77
Comment tag PropType
2018-01-02 13:34:47 +00:00
3947a72d1b
Fix to allow subsequent group profile requests if one fails
...
Also, delete the groupProfilePromise immediately after setting
the group profile (the first if-statement will prevent a new
request from being started).
2018-01-02 10:42:48 +00:00
b5f6d97fa2
Ignore postmessage requests with api field set.
2017-12-19 15:39:13 +00:00
fa14bc9b8d
don't gutwrench
2017-12-18 22:49:23 +00:00
e65c67ca15
fix https://github.com/vector-im/riot-web/issues/5841
2017-12-18 22:47:28 +00:00
b91bd52edd
Merge pull request #1658 from pafcu/annotate-t
...
Add option to also output untranslated string
2017-12-18 22:46:48 +00:00
32bdbdb2f3
Merge pull request #1669 from turt2live/travis/integ-theme
...
Give the current theme to widgets and the integration manager
2017-12-18 17:35:06 +00:00
e5df0dcf1e
$riot_theme -> $theme
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-18 09:19:54 -07:00
201d8f04c0
Merge pull request #1671 from oivoodoo/riot-web-issue-1953-multiple-file-upload
...
Allow multiple file uploads using drag & drop for RoomView
2017-12-18 14:56:31 +00:00
779e4d026c
Merge pull request #1670 from oivoodoo/issue/phone-number-preview
...
Fix issue with preview of phone number on register and waiting for sms code confirmation code
2017-12-18 13:04:22 +00:00
d051a2e0b3
Remove extra space
2017-12-18 15:59:21 +03:00
78af02b29b
Replace lodash/every by Array.prototype.every function
2017-12-18 15:51:01 +03:00
c07c4fd1cb
Allow multiple file uploads on drag & drop
2017-12-18 13:20:18 +03:00
fddbf3a2a2
Fix issue with preview of phone number on register and waiting for sms code confirmation code
2017-12-18 12:23:54 +03:00
678d87ef20
Give the current theme to the integration manager
...
For integration managers which would like to theme themselves to match Riot.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-16 20:13:27 -07:00
94ef80c008
Support sending the current theme to widgets
...
This is a namespaced variable because some clients may not be able to support themes, or may have varying definitions of what "light" means. Widgets are recommended to opt for per-client checks, or accept that some clients may differ.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-16 20:11:00 -07:00
adaea9ad5b
Merge pull request #1647 from matrix-org/luke/tag-panel-improve-performance
...
Attempt to improve TagPanel performance
2017-12-15 17:38:15 +00:00
71740cc176
Merge branch 'develop' into luke/fix-room-list-group-store-leak
2017-12-15 17:36:36 +00:00
d292dab9c6
More doc
2017-12-15 17:30:21 +00:00
56affd3d42
Rename for clarity
2017-12-15 17:29:06 +00:00
d2066f41d5
Merge pull request #1656 from matrix-org/luke/fix-scroll-jump-on-message-decryption
...
Fix one variant of a scroll jump that occurs when decrypting an m.text
2017-12-15 17:25:21 +00:00
653137f6ec
Update comment
2017-12-15 17:21:20 +00:00
6f896098e3
Get Group profile from TagTile instead of TagPanel
...
So that instead of getting all group profiles everytime the tags
change order, get them when the TagTile mounts for a group tag.
2017-12-15 17:18:46 +00:00
0a944e0746
Merge pull request #1665 from matrix-org/luke/fix-matrix-chat-logged-in-view-ref
...
Avoid NPEs by using ref method for collecting loggedInView in MatrixChat
2017-12-15 16:30:35 +00:00
6e832c7d73
Dedupe requests to fetch group profile data
2017-12-15 16:28:50 +00:00
David Baker