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

4493 commits

Author SHA1 Message Date
David Baker
4c17b5f1c7
Merge pull request #1724 from matrix-org/t3chguy/nvl/rich_quoting_nullguard 
Null guard against falsey (non-null) props.node, to make react happy
 2018-01-31 18:10:52 +00:00
lukebarnard
c5a3a02e1d Fix order calculation logic when reordering a room 2018-01-30 10:14:05 +00:00
Michael Telatynski
6dd63ae644
Null guard against falsey (non-null) props.node, to make react happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-29 19:17:46 +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
Will Hunt
5206c9d18b Show a warning if the user attempts to leave a room that is invite only 2018-01-19 22:52:43 +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
lukebarnard
00dc077271 Remove react-dnd, revert fa14bc9 as no longer needed 2018-01-19 13:34:56 +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
80d3edfbb3 simplify the 'send anyway' text, as 'mark devices known' is meaningless to users 2018-01-18 09:57:29 +00:00
Matthew Hodgson
d3292d9388 fix typos and NPE. fixes #5999 2018-01-17 23:28:14 +00:00
David Baker
c64b4e1b1c Merge remote-tracking branch 'origin/develop' into dbkr/dont_paginate_while_decrypting 2018-01-16 17:38:32 +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
f19dcd8114 Comment workaround to atlassian/react-beautiful-dnd#273 2018-01-16 11:07:25 +00:00
lukebarnard
bda2d6b0a6 Work around atlassian/react-beautiful-dnd#273 
For some reason, after dragging an item
the parent draggable receives a mouse click. The workaround is
to use onMouseDown for deselecting tags
 2018-01-16 10:44:11 +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
David Baker
0a6018a945
Merge pull request #1704 from matrix-org/luke/perf-room-list 
Only set selected tags state when updating rooms
 2018-01-15 15:01:57 +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
Michael Telatynski
b526fc057c Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep 2018-01-14 18:32:17 +00:00
David Baker
e42bea6277 Don't paginate whilst decrypting events 
As comment hopefully explains. This meant loading the app on an e2e
room would often be very slow as it tried to pull hundreds of events
into the timeline.
 2018-01-12 18:17:03 +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
b152bd4ab9
Merge pull request #1625 from matrix-org/t3chguy/analytics_info 
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
 2018-01-11 11:02:34 +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
9dd9a5be4b Wording tweak 2018-01-09 17:59:49 +00:00
David Baker
dbb8f878cb Tidy up imports 2018-01-09 17:57:18 +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