PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
8628 commits 1 branch 0 tags 338 MiB
Commit graph

2967 commits

Author SHA1 Message Date
lukebarnard
701abb6a21 Move management of room lists to RoomListStore 
this is part maintenance to make RoomList clearer and part
allowing room list state to be modified via a dispatch.
 2018-01-25 22:16:03 +01:00
lukebarnard
d0e3319bd9 Remove DragDropContext from TagPanel and RoomList 
So that we can have one context that can handle DND between
the TagPanel and RoomList.
 2018-01-25 22:05:20 +01:00
Michael Telatynski
56bd4b7d06 Fix not showing Invited section if all invites are 3PID 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-25 12:18:02 +00:00
David Baker
ebfdd7c718
Merge pull request #1715 from matrix-org/t3chguy/rich_quoting_linear 
Linear Rich Quoting
 2018-01-24 18:53:29 +01:00
Michael Telatynski
e3e3535072
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 17:02:20 +00:00
Michael Telatynski
4490715b60
Merge branch 'develop' into t3chguy/rich_quoting_linear 2018-01-22 16:46:20 +00:00
Michael Telatynski
a6cefb83f8
basic error handling for malformed quotes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 16:41:32 +00:00
Michael Telatynski
3b1d69edbb
Change Quotes to be linearly rendered rather than recursively nested 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 16:34:47 +00:00
Michael Telatynski
33995b053e
Add class to EventTile Line's that are quotes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 16:34:14 +00:00
Michael Telatynski
61b3d050ab Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/group_create_dialog_fixes 2018-01-20 13:39:57 +00:00
Michael Telatynski
2705397bf6 Add local GID==='' check, because Synapse says Group rather than Community 
Reset createError when doing check because it is now stale

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-20 13:16:33 +00:00
Luke Barnard
a8320fe7e2
Merge pull request #1711 from matrix-org/luke/roomlist-beautiful-dnd 
Swap RoomList to react-beautiful-dnd
 2018-01-19 14:49:49 +00:00
lukebarnard
6106b3ce44 newOrder defaults null, allows check for newOrder on line 357 2018-01-19 14:12:27 +00:00
lukebarnard
54f6d305d7 Null-guard for newTag 2018-01-19 14:11:05 +00:00
lukebarnard
75a1922731 Fix linting 2018-01-19 14:07:13 +00:00
Matthew Hodgson
6c15bd8599 fix NPE when getGroupProfiles returns null 2018-01-19 10:39:38 +00:00
lukebarnard
6f0d799912 Fix indentation 2018-01-18 18:15:34 +00:00
lukebarnard
59f4661bfd Add comment 2018-01-18 18:01:31 +00:00
lukebarnard
dfecad181a Swap RoomList to react-beautiful-dnd 2018-01-18 17:59:29 +00:00
Matthew Hodgson
d3292d9388 fix typos and NPE. fixes #5999 2018-01-17 23:28:14 +00:00
Luke Barnard
62caa4f096
Merge pull request #1705 from matrix-org/luke/tag-panel-beautiful-dnd 
Replace TagPanel react-dnd with react-beautiful-dnd
 2018-01-16 11:26:44 +00:00
lukebarnard
16c13fb079 Replace TagPanel react-dnd with react-beautiful-dnd 
This new library handles the simple case of an ordered vertical
(or horizontal) list of items that can be reordered.

It provides animations, handles positioning of items mid-drag
and exposes a much simpler API to react-dnd (with a slight loss
of potential function, but we don't need this flexibility here
anyway).

Apart from this, TagOrderStore had to be changed in a highly
coupled way, but arguably for the better. Instead of being
updated incrementally every time an item is dragged over
another and having a separate "commit" action, the
asyncronous action `moveTag` is used to reposition the tag in
the list and both dispatch an optimistic update and carry out
the request as before. (The MatrixActions.accountData is still
used to indicate a successful reordering of tags).

The view is updated instantly, in an animated way, and this
is handled at the layer "above" React by the DND library.
 2018-01-15 18:12:27 +00:00
lukebarnard
408f13f68c Only set selected tags state when updating rooms 
instead of every time we get an update from a GroupStore/otherwise.

This was leading to many setStates and renders at startup when we
receive many group /members /rooms etc. responses.

Also, use the rate limited version of refreshRoomList.
 2018-01-15 14:42:41 +00:00
David Baker
99a72b5b2b Fix autofocus broken in https://github.com/matrix-org/matrix-react-sdk/pull/1674 
'focus' attribute was on the wrong thing
 2018-01-12 10:52:51 +00:00
David Baker
aa5d42d045 Remove spurious dot 2018-01-12 10:32:36 +00:00
Michael Telatynski
23bd612730
Focus composer when clicking Reply (quote event) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 19:29:00 +00:00
Michael Telatynski
192cba2b79
allow text&onSenderProfileClick for tileShape===quote 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 19:25:43 +00:00
Michael Telatynski
8ad4da54cb
Fix missing negation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 12:04:53 +00:00
David Baker
292a6c5767
Merge pull request #1674 from aidalgol/rebase-dialogs 
Normalise dialogs
 2018-01-11 10:49:40 +00:00
David Baker
efb96cdd2a
Merge pull request #1695 from matrix-org/dbkr/send_without_verifying 
Add 'send without verifying' to status bar
 2018-01-11 10:34:56 +00:00
Michael Telatynski
94167e2b8b
Run gen-i18n.js and embed the ellipsis into the base string 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:52:20 +00:00
Michael Telatynski
1a7dc22a8d
make wantsDateSeparator generic and throw into DateUtils 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:06:24 +00:00
Michael Telatynski
e45fcf10c7
Refactor DateUtils to ES6 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:00:11 +00:00
Michael Telatynski
9e2238e884
remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:56:36 +00:00
Michael Telatynski
1bc9d344ae
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/views/messages/TextualBody.js
 2018-01-10 11:54:58 +00:00
Michael Telatynski
454fd23f25
fix typo shsape->shape 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:51:48 +00:00
Michael Telatynski
a977ab9be4
change handler name to suit convention 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:51:23 +00:00
David Baker
4c101628b5 Add 'send without verifying' to status bar 
Fixes other part of https://github.com/vector-im/riot-web/issues/5936
 2018-01-09 13:52:37 +00:00
Aidan Gauland
9365860075 Update copyright line 2018-01-09 18:40:12 +13:00
David Baker
587a6f8e2b
Merge pull request #1687 from matrix-org/luke/perf-tag-panel-selected 
Improve performance of tag panel selection (when tags are selected)
 2018-01-05 15:55:24 +00:00
lukebarnard
8ade357349 Handle newly added rooms and removed rooms. 2018-01-05 12:33:26 +00:00
Michael Telatynski
c61d09464a
Merge pull request #1683 from matrix-org/t3chguy/memberinfo_warn_demote_self 
small refactor && warn on self-demotion
 2018-01-05 12:18:15 +00:00
Michael Telatynski
a8bd4bf858
add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 11:56:18 +00:00
David Baker
5aed77c752
Merge pull request #1677 from aidalgol/PropTypes 
Remove use of deprecated React.PropTypes
 2018-01-05 11:53:55 +00:00
Michael Telatynski
222b01e000
Merge pull request #1691 from matrix-org/t3chguy/lazy_save_relatedGroupSettings 
only save RelatedGroupSettings if it was modified. Otherwise perms issue
 2018-01-05 11:53:30 +00:00
Michael Telatynski
a473971c7b
negate for less indentation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 11:11:20 +00:00
Michael Telatynski
293bb15ccc
check PL and compare arrays rather than tracking changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 10:53:55 +00:00
lukebarnard
7606e60188 Merge branch 'develop' into luke/perf-tag-panel-selected 2018-01-05 10:26:03 +00:00
David Baker
c7accb732c
Merge pull request #1624 from matrix-org/t3chguy/room_dict_refactor 
make RoomDetailRow reusable for the Room Directory
 2018-01-04 18:26:06 +00:00
lukebarnard
f1b60287fb Merge branch 'develop' into luke/fix-get-users-rooms-for-joined-groups 2018-01-04 17:56:34 +00:00
lukebarnard
55bfff24c4 Fix forgotten rename during d5e2a73d99 2018-01-04 17:46:44 +00:00
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
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
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
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
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
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
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
Michael Telatynski
05434e782a
change Composer placeholder text based on replying/rich quoting state 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-18 19:49:38 +00:00
Michael Telatynski
47d4e5f8d1
nest quotes, but only when people want to click through them 
loads pre-emptively

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-18 19:28:01 +00:00
Richard Lewis
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
Travis Ralston
e5df0dcf1e
$riot_theme -> $theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-18 09:19:54 -07:00
Alexandr Korsak
d051a2e0b3 Remove extra space 2017-12-18 15:59:21 +03:00
Alexandr Korsak
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
Michael Telatynski
882068078d
fix missing space 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-17 20:53:53 +00:00
Michael Telatynski
9603b21199
s/Quote/Reply/ and ES6 tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-17 20:20:45 +00:00