24fcea8a0a
fix indenting
2018-01-15 02:19:15 +00:00
a233af67ea
initial pseudocode WIP for e2e online backups
2018-01-15 02:02:48 +00:00
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
aa5d42d045
Remove spurious dot
2018-01-12 10:32:36 +00:00
23bd612730
Focus composer when clicking Reply (quote event)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-11 19:29:00 +00:00
192cba2b79
allow text&onSenderProfileClick for tileShape===quote
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-11 19:25:43 +00:00
8ad4da54cb
Fix missing negation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-11 12:04:53 +00:00
292a6c5767
Merge pull request #1674 from aidalgol/rebase-dialogs
...
Normalise dialogs
2018-01-11 10:49:40 +00:00
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
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
1a7dc22a8d
make wantsDateSeparator generic and throw into DateUtils
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-10 12:06:24 +00:00
e45fcf10c7
Refactor DateUtils to ES6
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-10 12:00:11 +00:00
9e2238e884
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-10 11:56:36 +00:00
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
454fd23f25
fix typo shsape->shape
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-10 11:51:48 +00:00
a977ab9be4
change handler name to suit convention
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-10 11:51:23 +00:00
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
9365860075
Update copyright line
2018-01-09 18:40:12 +13:00
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
8ade357349
Handle newly added rooms and removed rooms.
2018-01-05 12:33:26 +00:00
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
a8bd4bf858
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-05 11:56:18 +00:00
5aed77c752
Merge pull request #1677 from aidalgol/PropTypes
...
Remove use of deprecated React.PropTypes
2018-01-05 11:53:55 +00:00
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
a473971c7b
negate for less indentation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-05 11:11:20 +00:00
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
7606e60188
Merge branch 'develop' into luke/perf-tag-panel-selected
2018-01-05 10:26:03 +00:00
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
f1b60287fb
Merge branch 'develop' into luke/fix-get-users-rooms-for-joined-groups
2018-01-04 17:56:34 +00:00
55bfff24c4
Fix forgotten rename during d5e2a73d99
2018-01-04 17:46:44 +00:00
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
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
831a3f7e42
Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo
2018-01-04 16:41:16 +00:00
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
2282f5c26f
Remove unused selectedRoom prop
2018-01-04 14:19:10 +00:00
cdd1a57569
Calculate visible rooms when tags change
...
instead of every time we getRoomLists
2018-01-04 11:50:33 +00:00
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
2baacfa562
Handle case where ordering is not yet known
2018-01-03 14:12:28 +00:00
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
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
f67d405732
small refactor && warn on self-demotion
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-02 23:15:36 +00: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
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
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
Matthew Hodgson