gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,694 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

995 Commits

Author SHA1 Message Date
Luke Barnard 324774ec2f Reword the BugReportDialog.js as per @lampholder 
See https://github.com/matrix-org/matrix-react-sdk/pull/1740#issuecomment-369597662
 2018-03-20 10:52:50 +00:00
Luke Barnard f5a58258f9 Take TagPanel out of labs 2018-03-19 14:11:48 +00:00
Luke Barnard 7dc82e2e7a Force update RoomSubList after reading a room 
so that the notification count is updated.

Previously we relied on a force update from RoomList, which was
removed as part of the optimisations in
  https://github.com/matrix-org/matrix-react-sdk/pull/1801
 2018-03-16 17:55:29 +00:00
Luke Barnard 71786116d8 Ensure entire LeftPanel is faded when settings open 
so as to prevent interaction with TagPanel.

Fixes https://github.com/vector-im/riot-web/issues/6184
 2018-03-16 15:56:25 +00:00
Luke Barnard fd8b36eb1c Use React.PureComponent instead of reimplementing it 2018-03-15 13:09:29 +00:00
Luke Barnard 04b1678c7f Implement a simple shouldComponentUpdate for DNDRoomTile 
because otherwise beautiful dnd spends a lot of time requesting
animation frames pointlessly.
 2018-03-14 15:06:13 +00:00
Luke Barnard afb9fdf4ec Fix bug where cannot send group invite on GroupMemberInfo phase 
by not reusing the same function and invoking separate conditions
to decide what the function does but instead using different
functions.

Also, show the GroupMemberList after inviting a member, otherwise
we might end up looking at the member we were already looking at
instead of the updated list of members.
 2018-03-12 17:18:30 +00:00
Luke Barnard 8d5717b812 Allow arbitrary React nodes in RoomTooltip 2018-03-08 14:11:06 +00:00
Richard Lewis 6785d75ad2 Remove logging. 2018-03-06 14:46:40 +00:00
Richard Lewis 78ae1ada3c Fix tooltip vertical positioning. 2018-03-06 14:21:31 +00:00
Richard Lewis d77ab891a0 Update tooltip position on scroll. 2018-03-06 11:25:15 +00:00
Richard Lewis 9fc7435ea2 Correctly position tooltips relative to parent element. 2018-03-06 10:47:53 +00:00
Luke Barnard 174061db57 Add setting to disable TagPanel 2018-02-28 18:16:37 +00:00
Richard Lewis c198dd381f Pull in changes from develop 2018-02-23 17:31:24 +00:00
Matthew Hodgson 3bf04095b1
Merge pull request #6223 from vector-im/luke/fix-tag-tile-context-tinting 
Fix un-tinted "View Community" icon in TagTile context menu
 2018-02-23 16:42:55 +00:00
Matthew Hodgson 93c2462089
Merge pull request #6160 from vector-im/luke/fix-room-list-drop-target-bg 
Fix RoomDropTarget and emptySubListTip to have containers
 2018-02-23 16:36:14 +00:00
lukebarnard c0055ebbeb Fix un-tinted "View Community" icon in TagTile context menu 2018-02-21 21:27:02 +00:00
Luke Barnard 0605d96014 Only use DNDRoomTile for editable sub lists 
Otherwise, the DND tile will expect to be within a Droppable,
which is not supported by react-beautiful-dnd. This was causing
errors when receiving an invite.

Fixes #6144
 2018-02-16 11:02:52 +00:00
Luke Barnard 9e1e7e0dbe Fix RoomDropTarget and emptySubListTip to have containers 
so that the correct background colour can be used to surround both.
 2018-02-15 14:09:38 +00:00
Luke Barnard 453b7d1007 Implement riot-web side of dragging GroupTile avatars to TagPanel 
for adding groups to the TagPanel.
 2018-02-14 16:37:32 +00:00
Luke Barnard 009e01c1b0 Fix LeftPanel size being incorrect when TagPanel disabled 
A previous PR (#6134) assumed that the TagPanel feature
would always be enabled, leading to strangeness when it
wasn't: #6136.

(FTR the original layout bug was #6133)
 2018-02-14 10:18:12 +00:00
Matthew Hodgson 9abda76d9e
Merge branch 'develop' into luke/fix-tag-panel-collapse 2018-02-13 22:02:49 +00:00
Luke Barnard 11b0cc8211 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu 2018-02-13 17:00:19 +00:00
Luke Barnard 285c4f91d3 Fix TagPanel from collapsing to < 60px when LP collapsed 
Fixes https://github.com/vector-im/riot-web/issues/6133
 2018-02-13 15:17:51 +00:00
David Baker e67147213b
Merge pull request #6096 from vector-im/luke/room-list-flux 
Make room tagging flux-y
 2018-02-13 14:18:50 +00:00
Luke Barnard 2269c94579 Move groups button to TagPanel 2018-02-13 09:44:25 +00:00
Luke Barnard e36baa8c3a Fix quotes on import 2018-02-12 18:47:29 +00:00
Luke Barnard d47c9d8b6e Add context menu to TagPanel 
See https://github.com/matrix-org/matrix-react-sdk/pull/1743
 2018-02-12 18:02:55 +00:00
David Baker d904212033 Merge branch 'release-v0.13.5' into develop 2018-02-09 12:28:26 +00:00
David Baker 62e90ceb0d Sanity check URLs with isUrlPermitted 
Thanks to walle303 for letting us know these weren't being checked.
 2018-02-09 12:20:31 +00:00
Luke Barnard 0cdebcce89 Move sublist sorting to RoomListStore 
NB: fixUndefinedOrdering was removed completely because it was
code dealing with legacy favourites.

see matrix-org/matrix-react-sdk@9b0df191
 2018-02-08 16:28:42 +00:00
Luke Barnard 495090c9ba Remove now unused RoomSubList code 2018-02-08 14:08:20 +00:00
lukebarnard 662942ec29 Use dispatch to change room tags from RoomTileContextMenu 2018-02-06 11:52:39 +00:00
lukebarnard 83996c09d9 General delint, cleanup 2018-02-06 11:51:46 +00:00
lukebarnard e46f436a47 Prefer context.matrixClient in LeftPanel 2018-02-06 11:50:34 +00:00
lukebarnard 37fe3ac676 Prevent RoomTiles from being dragged into other droppables 
for the time being at least.
 2018-01-25 22:51:40 +01:00
lukebarnard 2926154dce Modify LeftPanel to include a DragDropContext 
that handles drag and drop for TagPanel and RoomList. This is to
allow the future feature of dragging between the two components.
 2018-01-25 22:30:58 +01:00
Michael Telatynski 662a6297e7
FilteredList, now being a controlled component does not need state 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-25 21:06:35 +00:00
Michael Telatynski 04bca93e0d
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools-118247 2018-01-25 20:59:31 +00:00
Michael Telatynski 22b7298542 add comments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-23 20:28:39 +00:00
Michael Telatynski 9d1a3c9011 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-23 20:19:27 +00:00
Luke Barnard 9d387c32a5
Merge pull request #5929 from vector-im/t3chguy/num_members_tooltip 
T3chguy/num members tooltip
 2018-01-22 22:21:50 +00:00
Michael Telatynski f5fc86258f s/Highlight/SyntaxHighlight/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 18:59:18 +00:00
Michael Telatynski 321f16d8a3 rename variable as it was horrible to read camelCased 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 18:54:22 +00:00
Michael Telatynski 3764a5d4b7 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-20 13:55:52 +00:00
Matthew Hodgson 8855cc294e converge on 'noisy' to mean noisy notifs 2018-01-19 16:52:54 +00:00
lukebarnard d55d3658f0 Use classNames instead of inline `style` 
Theres no benefit to using inline styles
 2018-01-18 18:08:18 +00:00
lukebarnard 3481283af8 Swap RoomList to react-beautiful-dnd 
Includes themeing

See matrix-org/matrix-react-sdk#1711
 2018-01-18 17:54:39 +00:00
Richard Lewis 738b59fd42 Call for update on window resize. 2018-01-18 12:01:29 +00:00
Richard Lewis a7f0b11002 Add generic element context menu / popover. 2018-01-16 18:15:17 +00:00
Michael Telatynski 670f02acf8 Merge branches 'develop' and 't3chguy/highlight_things' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-16 18:04:08 +00:00
Michael Telatynski 4386d45a97
remove 'use strict' 2018-01-16 10:27:47 +00:00
David Baker f940dfdd79
Merge pull request #5984 from vector-im/t3chguy/datesep 
fix&refactor DateSeparator and MessageTimestamp
 2018-01-15 13:45:14 +00:00
Michael Telatynski f97395f40f change exports to default to retain compatibility with existing imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-14 18:41:44 +00:00
Michael Telatynski b65fdf6ab0 refactor MessageTimestamp, as it was missing a PropTypes def for ts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-14 18:35:53 +00:00
Michael Telatynski 22c024cc94 Refactor DateSep, use new Dateutils.formatFullDateNoTime 
as it is not desired for it to include the time.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-14 18:34:38 +00:00
Michael Telatynski 17c4839029
only show reply button on REAL (not pending) m.room.message events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 19:21:02 +00:00
David Baker 56300f9578
Merge pull request #5804 from vector-im/t3chguy/nvl/rich_quoting 
Implement Rich Quoting/Replies
 2018-01-11 10:34:43 +00:00
Michael Telatynski 77e2ceba9e
switch to new ES6 DateUtils imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 21:50:32 +00:00
David Baker 24e16e5c18
Revert "Add a &nbsp; after timestamp" 2018-01-08 15:17:05 +00:00
David Baker b6c002b587
Fix merge 2018-01-08 14:35:39 +00:00
David Baker 9c3e4a1202
Merge branch 'develop' into patch-1 2018-01-08 14:31:21 +00:00
Michael Telatynski 290bf54d4f pluralise properly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:55:32 +00:00
Michael Telatynski c68c54618f delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:19:43 +00:00
Michael Telatynski 3788fde711 Add a tooltip to members button and badge with actual count 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:16:21 +00:00
Michael Telatynski 8a7477f50c
Highlight ViewSource and Devtools ViewSource 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-20 20:40:41 +00:00
Matthew Hodgson bfb60265cb
Merge pull request #5610 from vector-im/t3chguy/devtools-1 
add dark theme styling to devtools input box
 2017-12-18 21:44:43 +00:00
Michael Telatynski 2961e1949f
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-16 19:07:32 +00:00
Michael Telatynski 304d281ed2
change reply to be its own thing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-16 19:01:56 +00:00
Michael Telatynski 54a9ccdee7
throw new quoting behind flags 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-12 23:36:10 +00:00
Michael Telatynski 10c6f24a83
CSS and Context Menu tweaks for Rich Quoting/Replies 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-10 12:52:00 +00:00
Luke Barnard 608a359e0a Move DND wrapper to top level component 2017-12-06 14:54:35 +00:00
Luke Barnard b0d115a64a Implement renumeration of ordered tags upon collision 
I was being bitten by this enough for me to want to fix it. This implementation really ought to be improved such that it doesnt tend towards being broken the more it is used.
 2017-12-01 18:20:38 +00:00
Luke Barnard e80c4fadea Linting 2017-12-01 18:18:48 +00:00
Luke Barnard 1ccffb7e58 Update imports for accessing KeyCode 2017-12-01 10:56:25 +00:00
Michael Telatynski 43578d2366
make FilteredList controlled, such that it can externally persist filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-28 22:16:53 +00:00
Luke Barnard bbdafeff77 getGroupStore no longer needs a matrix client 2017-11-28 13:17:30 +00:00
Stefan Parviainen 0bd68ce068 Add some aria-labels to RightPanel 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-21 09:18:59 +01:00
lukebarnard 7cb59bddb0 Use badge count format for member count in RightPanel 
(to avoid cosmetic disasters with >9999 members in a room, e.g. HQ)
 2017-11-20 13:12:55 +00:00
Luke Barnard cb235a29fa
Merge pull request #5613 from pafcu/simplify-translation 
Refactor translations
 2017-11-16 11:54:52 +00:00
Stefan Parviainen 4949f2f763 Fix typo and update strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-15 20:43:45 +01:00
Michael Telatynski b00cf8c939
add dark theme styling to devtools input box 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-15 17:13:39 +00:00
Travis Ralston a583c2b658 Merge branch 'develop' into travis/granular 2017-11-14 19:16:35 -07:00
Matthew Hodgson 3e72d8d969
Merge pull request #5286 from turt2live/travis/presence 
CSS/components for custom presence controls
 2017-11-14 23:53:26 +00:00
Stefan Parviainen ca4b71b6e2 Update to use newer _t() 2017-11-14 21:54:00 +01:00
Travis Ralston 977599a660 Use the SettingsStore to get the theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-13 13:14:29 -07:00
Travis Ralston 7570ce580f Merge branch 'develop' into travis/granular 2017-11-13 12:25:56 -07:00
Matthew Hodgson 5abee4fddc replace some of the status.im theme with general config options 2017-11-11 23:47:03 +00:00
Matthew Hodgson 47d9e7f2a1 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-10 15:29:37 -08:00
Luke Barnard 277a6dee10 Make groups a fully-fleged baked-in feature 2017-11-10 15:38:50 +00:00
Matthew Hodgson d4128af224 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-08 04:29:44 -08:00
Luke Barnard e1d16acddb Implement general-purpose tooltip "(?)"-style 2017-11-07 14:09:04 +00:00
Luke Barnard cd26f63315 Do not init a group store when no groupId specified 
(in RightPanel), otherwise the store will happily send requests to the server for the `undefined` group.
 2017-11-06 10:16:03 +00:00
Travis Ralston 63607f29e7 Use SettingsStore for notification settings 
Signed-off-by: Travis Ralstron <travpc@gmail.com>
 2017-11-04 22:27:34 -07:00
Matthew Hodgson 816042d3a8 Merge branch 'develop' into matthew/status 2017-11-04 23:51:20 +00:00
Matthew Hodgson adedf23cfb remove unnamespaced CSS fail 2017-11-04 22:19:06 +00:00
Travis Ralston 69939e2fe3 Merge branch 'develop' into travis/granular 2017-11-03 21:56:46 -06:00
Matthew Hodgson c0b343c89f
Merge pull request #5471 from vector-im/t3chguy/devtools-1 
T3chguy/devtools 1
 2017-11-03 23:10:00 +00:00
Matthew Hodgson c90834114b
Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms 
Use margin to separate "perms" in the room directory
 2017-11-03 22:44:41 +00:00
Matthew Hodgson 923295973b Merge branch 'develop' into matthew/status 2017-11-03 15:11:23 +00:00