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

8635 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
665ddccb0d
restrict to m.text for now 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-20 15:45:25 +00:00
Michael Telatynski
90f9badbf3
s/Reply/ReplyThread/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-20 15:40:19 +00:00
Michael Telatynski
7048d85246
attach message_sent and replies to file uploads 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-19 23:42:04 +00:00
Michael Telatynski
34b427d15e
s/quote_event/reply_to_event/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-19 23:41:07 +00:00
Michael Telatynski
6510989ac6
move unmounted init to willMount 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-19 14:28:31 +00:00
Michael Telatynski
8fa56f8c9a
update and improve comments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-19 14:27:10 +00:00
Michael Telatynski
4c08c51044
Reply; delay call to onWidgetLoad until after async setState completes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 21:24:42 +00:00
Michael Telatynski
0d6fc9bd3a
fix Composer focus after twiddling with Replies 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 21:17:41 +00:00
Michael Telatynski
f1a3592eff
fix 12/24h in Reply/ReplyPreview 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 21:14:03 +00:00
Michael Telatynski
cb293a852d
reply and reply_preview only differ in whether they contain <Reply /> 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 21:07:25 +00:00
Michael Telatynski
8062494692
show replies in ReplyPreview 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-16 20:58:39 +00:00
Michael Telatynski
2e3cbb309e
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-02-16 14:35:04 +00:00
Matthew Hodgson
07b691a45d typo 2018-02-15 20:20:25 +00:00
Luke Barnard
1a880761e0
Merge pull request #1747 from matrix-org/luke/fix-scrollbars-on-jump-to-first 
Change CSS class for message panel spinner
 2018-02-15 14:51:12 +00:00
David Baker
0c5b0fd52c
Merge pull request #1752 from matrix-org/dbkr/roomliststore_unregister 
Remove RoomListStore listener
 2018-02-15 13:35:08 +00:00
David Baker
55dc49f4ff Merge remote-tracking branch 'origin/develop' into dbkr/roomliststore_unregister 2018-02-15 13:29:30 +00:00
David Baker
44964e80a9 undo unintentional commit 2018-02-15 11:25:40 +00:00
David Baker
ceec405519 Remove RoomListStore listener 
This caused the the RoomList component to leak (although in practice
only accross logins because that's the only time it's unmounted)
 2018-02-15 11:23:00 +00:00
Luke Barnard
c8ccbed0b1
Merge pull request #1751 from matrix-org/luke/dnd-group-view-tag-panel 
Implement GroupTile avatar dragging to TagPanel
 2018-02-15 11:05:28 +00:00
Luke Barnard
3948ee8ca1 Give each GroupTile avatar its own droppable 
so that they can be dragged and dropped
without interacting with each other, as
they would do if GroupView contained
one droppable to contain them all.
 2018-02-14 17:53:54 +00:00
Luke Barnard
389d96bc46 Use optimistic removedTagsAccountData state in TagOrderStore 
when receiving TagOrderActions.moveTag.pending, which now exposes
this state.
 2018-02-14 16:47:29 +00:00
Luke Barnard
3850b552a5 Make GroupTile avatar draggable 2018-02-14 16:46:06 +00:00
Luke Barnard
74c8a74e7d Add Droppable to GroupView 
to contain the GroupTiles as Draggables
 2018-02-14 16:43:01 +00:00
Luke Barnard
b626420eb9 Move DND context to LoggedInView 
so that we can drag things from any part of the logged in app to
another. (Specifically GroupView and TagPanel).
 2018-02-14 16:40:58 +00:00
Luke Barnard
db4f0cb0bf Handle adding previously removed tags 2018-02-14 16:40:24 +00:00
David Baker
ca763faf96
Merge pull request #1750 from matrix-org/luke/fix-room-list-custom-tag-ordering2 
Fix custom tags not being ordered manually
 2018-02-14 11:40:59 +00:00
David Baker
46b8fb9a19
Merge pull request #1746 from matrix-org/luke/fix-room-settings-resets 
Store component state for editors
 2018-02-14 11:33:48 +00:00
Luke Barnard
3020c8cd94 Fix custom tags not being ordered manually 
Actually fixes vector-im/riot-web#6135 unlike #1748, which
incorrectly assumed that custom tags would be included in
listOrders.

This fix makes sure that the `default` case in the `switch`
is actually used.
 2018-02-14 11:23:29 +00:00
Luke Barnard
47c232b5b3 Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first 2018-02-14 11:00:27 +00:00
David Baker
7cc82a682c
Merge pull request #1745 from matrix-org/luke/fix-login-page-feedback 
Give the login page its spinner back
 2018-02-14 10:31:36 +00:00
Luke Barnard
c670b76ec8
Merge pull request #1743 from matrix-org/luke/feature-tag-panel-tile-context-menu 
Add context menu to TagTile
 2018-02-13 17:28:43 +00:00
Luke Barnard
a34fea8af8 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu 2018-02-13 16:51:00 +00:00
Luke Barnard
e0d598fb19
Merge pull request #1748 from matrix-org/luke/fix-manually-ordered-custom-tagged-rooms 
If a tag is unrecognised, assume manual ordering
 2018-02-13 16:15:49 +00:00
Luke Barnard
f16bc93fee If a tag is unrecognised, assume manual ordering 
(as we did previously)

Fixes https://github.com/vector-im/riot-web/issues/6135
 2018-02-13 16:09:17 +00:00
Luke Barnard
5af560f625 Make removedTags a Set for perf 2018-02-13 14:43:34 +00:00
David Baker
a0aa3df893
Merge pull request #1719 from matrix-org/luke/room-list-flux 
Move RoomList state to RoomListStore
 2018-02-13 14:18:46 +00:00
Luke Barnard
36e8bf1f20 Change CSS class for message panel spinner 
to stop scrollbars appearing when we
 - jump to a message or,
 - permalink that is to an not paginated in event
 2018-02-13 14:13:47 +00:00
Luke Barnard
8377abcd19 Store component state for editors 
to prevent a forceUpdate from /sync causing the editors to revert
before the user had a chance to hit "Save".

Part of fixing https://github.com/vector-im/riot-web/issues/6019
 2018-02-13 12:01:36 +00:00
Luke Barnard
493116b17e Give the login page its spinner back 2018-02-13 11:43:22 +00:00
Luke Barnard
db0ea9eb0e Merge branch 'develop' into luke/room-list-flux 2018-02-13 10:18:24 +00:00
David Baker
03921bad79
Merge pull request #1744 from matrix-org/luke/move-groups-button-tp 
Move groups button to TagPanel
 2018-02-13 11:00:49 +01:00
Luke Barnard
6d3634a06c Move groups button to TagPanel 2018-02-13 09:44:00 +00:00
Luke Barnard
322012cf88 Add comment to explain hacky optimism 2018-02-12 18:46:36 +00:00
Luke Barnard
3eeef064bf Remove unused asyncId 2018-02-12 18:37:54 +00:00
Luke Barnard
7a4c1994c3 Use Boolean() instead of assuming filter is based on truthiness 2018-02-12 18:35:13 +00:00
Luke Barnard
e3f68f12c8 Add context menu to TagTile 
With two options: View Community and Remove, which
removes the tag from the panel.
 2018-02-12 18:01:08 +00:00
David Baker
b4aa9f37f6
Merge pull request #1738 from tulir/timestamp-hover-seconds 
Add seconds to timestamp on hover
 2018-02-12 11:23:08 +01:00
Michael Telatynski
aeedf48d84
fix weird in op behaviour with null 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-11 11:45:13 +00:00
Matthew Hodgson
40cee9bb02
Merge pull request #1739 from matrix-org/luke/fix-autocomplete-truncated-users 
Do not truncate autocompleted users in composer
 2018-02-10 18:38:43 +00:00
Michael Telatynski
7bf05b0715
add unmounted guard 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-10 16:01:19 +00:00