David Baker
b34f360f96
Merge pull request #1690 from matrix-org/luke/remove-selected-room-prop
...
Remove unused selectedRoom prop
2018-01-04 17:33:36 +00:00
David Baker
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
Michael Telatynski
831a3f7e42
Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo
2018-01-04 16:41:16 +00:00
Michael Telatynski
be48460595
Singularise unsent message prompt, if applicable
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-04 15:05:08 +00:00
Michael Telatynski
f5f3c894d7
only save RelatedGroupSettings if it was modified. Otherwise perms issue
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-04 14:24:13 +00:00
lukebarnard
2282f5c26f
Remove unused selectedRoom prop
2018-01-04 14:19:10 +00:00
lukebarnard
cdd1a57569
Calculate visible rooms when tags change
...
instead of every time we getRoomLists
2018-01-04 11:50:33 +00:00
Richard Lewis
b85efa08ce
Merge branch 'rxl881/snapshot' of github.com:matrix-org/matrix-react-sdk into rxl881/snapshot
2018-01-04 09:53:29 +00:00
Richard Lewis
e96d199b28
Inject stickers
2018-01-04 09:53:26 +00:00
lukebarnard
5c5307c665
Improve performance of tag panel selection (when tags are selected)
...
Deselecting all tags is now slightly less performant than selecting a tag
but mostly due to the number of RoomTiles being rendered.
Swapping between different tags (a supposed common use-case) feels much
more spritely!
2018-01-03 17:12:31 +00:00
Luke Barnard
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
lukebarnard
2baacfa562
Handle case where ordering is not yet known
2018-01-03 14:12:28 +00:00
lukebarnard
a2bb240dcb
Fetch group data for all tags instead of those selected
...
so that tag switching is not delayed by fetching group data, i.e group members and rooms.
2018-01-03 14:07:29 +00:00
David Baker
613e3b7ac1
Remove extra full stop
2018-01-03 11:57:49 +00:00
lukebarnard
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
lukebarnard
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
nostradamos
2189fe9256
removed console.log
2018-01-03 01:52:02 +01:00
nostradamos
e543f55572
refactored code
2018-01-03 01:50:03 +01:00
Michael Telatynski
f67d405732
small refactor && warn on self-demotion
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-02 23:15:36 +00:00
nostradamos
36df3acf4d
Merge remote-tracking branch 'origin/develop' into fix_riot_web_4821
2018-01-02 23:07:47 +01:00
nostradamos
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
lukebarnard
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
Luke Barnard
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
lukebarnard
874a7bf1de
Merge branch 'develop' into luke/fix-room-list-group-store-leak
2018-01-02 16:19:37 +00:00
lukebarnard
133837cdbe
Document initial state
2018-01-02 15:59:10 +00:00
lukebarnard
833cd321f3
Log warning in case of failed group profile fetch
2018-01-02 15:58:24 +00:00
lukebarnard
31855f18f8
Initialise profile state
2018-01-02 15:56:32 +00:00
lukebarnard
2cb4c897ce
Move getInitialState
before componentWillMount
2018-01-02 13:45:19 +00:00
lukebarnard
3cb128094d
Add more comments to TagTile to explain what it is
2018-01-02 13:44:22 +00:00
lukebarnard
80f11e5c77
Comment tag PropType
2018-01-02 13:34:47 +00:00
Michael Telatynski
875eb3d34f
Hide status bar on visible->hidden transition
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-01 21:15:26 +00:00
Richard Lewis
a408b98504
Set widget ID on WidgetMessaging instance.
2017-12-29 14:34:52 +00:00
Richard Lewis
7660176079
Fix comment linting errors.
...
Stop listening and cleanup endpoints correctly.
2017-12-28 22:27:12 +00:00
Aidan Gauland
35780f5ae0
Remove use of deprecated React.PropTypes
...
Replace all uses of React.PropTypes with PropTypes and importing PropTypes from
'prop-types'.
2017-12-26 14:03:18 +13:00
Aidan Gauland
9531b219d2
Remove unused imports
2017-12-26 12:53:01 +13:00
Aidan Gauland
e4b86f0730
Fix use of deprecated module
...
Use PropTypes from "prop-types" instead of the deprecated React.PropTypes
submodule.
2017-12-26 11:55:15 +13:00
Travis Ralston
cc5eb77658
Remove presence management
...
The feature is incredibly buggy and doesn't work as expected due to server behaviour and client interaction. One of the major problems is the constantly confused presence state - this is caused by the mobile apps conflicting on the state of the web app, causing it to consider the user offline or online (and rarely away) depending on how riot-android/ios is behaving at the time.
This reverts two PRs:
* https://github.com/matrix-org/matrix-react-sdk/pull/1620
* https://github.com/matrix-org/matrix-react-sdk/pull/1482
The changes to the context menu positioning were not reverted as they are useful outside of presence management.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-12-25 14:25:13 -07:00
Aidan Gauland
e6dbc3b863
Use DialogButtons in UnknownDeviceDialog
...
Use DialogButtons to eliminate duplicate button code.
2017-12-23 17:02:19 +13:00
Aidan Gauland
2674fcb6d3
Use DialogButtons in TextInputDialog
...
Use DialogButtons to eliminate duplicate button code.
2017-12-23 17:02:19 +13:00
Aidan Gauland
a11146f39d
Use DialogButtons in SessionRestoreErrorDialog
...
Use DialogButtons to eliminate duplicate button code.
2017-12-23 17:02:19 +13:00
Aidan Gauland
93b789438b
Use DialogButtons in ConfirmUserActionDialog
...
Use DialogButtons to eliminate duplicate button code.
2017-12-23 17:02:19 +13:00
Aidan Gauland
7a761dbf6b
Use DialogButtons in ChatCreateOrReuseDialog
...
Use DialogButtons to eliminate duplicate button code.
2017-12-23 17:02:19 +13:00
Aidan Gauland
aecb4650bc
Correct order of buttons in CreateGroupDialog
...
We can't use DialogButtons because the primary button is an <input> element.
2017-12-23 17:02:19 +13:00
Aidan Gauland
c863dbfc76
Use DialogButtons in CreateRoomDialog
...
Use DialogButtons to eliminate duplicate button code.
2017-12-23 17:02:19 +13:00
Aidan Gauland
0f6125e749
Use DialogButtons in AddressSelector
...
Use DialogButtons to eliminate duplicate button code.
2017-12-23 17:02:19 +13:00
Aidan Gauland
3b2c61e456
Use DialogButtons in QuestionDialog
...
Use DialogButtons to eliminate duplicate button code.
2017-12-23 17:02:19 +13:00
Aidan Gauland
45d86ea7ca
Add DialogButton component
...
A component to normalise the buttons in dialogs.
2017-12-23 17:02:19 +13:00
Aidan Gauland
9ebd58852c
Rebase DeactivateAccountDialog on BaseDialog
2017-12-23 17:02:19 +13:00
Aidan Gauland
c5284eb070
Allow BaseDialog to take a class for the title <div>
...
Some dialogs need to set additional classes on the `mx_Dialog_title` `div`
element (for example `danger`).
2017-12-23 17:02:19 +13:00
Aidan Gauland
8bb16466d6
Rebase AddressSelector on BaseDialog
2017-12-23 17:02:19 +13:00