Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,683 Commits 3 Branches 492 Tags 100 MiB
90897b0741
Commit Graph

3751 Commits

Author SHA1 Message Date
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
Matthew Hodgson
15b7af9a84
Merge pull request #6154 from rugk/patch-2 
Fix syntax error of wrong use of self-closing HTML tag
 2018-02-23 16:28:28 +00:00
Matthew Hodgson
c315a59717
remove doubly-closed tag 2018-02-23 16:27:34 +00:00
Luke Barnard
1139a3fa89 Simplify roomsublist bg colour 
This should not have a noticeable effect on the end result.
 2018-02-22 11:49:29 +00:00
Luke Barnard
f67b4570a8 Use translucent black for RoomSubList bg to fix tinting 
The alternative is to specify yet another colour that we have to
worry about when applying tinting, which is currently quite
fragile and requires changes to many parts of the app, including
all themes that don't require the colour to be tinted.

By using translucent black, we effectively take the secondary
accent colour of the LeftPanel and make it more black.

Note: This does not preserve the previous colour we were using,
although the alternative above does allow for this.
 2018-02-22 11:48:48 +00:00
lukebarnard
c0055ebbeb Fix un-tinted "View Community" icon in TagTile context menu 2018-02-21 21:27:02 +00:00
Luke Barnard
15d8878ac0 Rename TagPanel_logo to TagPanel_clearButton 2018-02-21 17:14:25 +00:00
Luke Barnard
2deb07a25b CSS for changing "R" to "X" for clearing group filter 2018-02-21 15:05:51 +00:00
Matthew Hodgson
bc5129f839 actually, simpler globe 2018-02-20 17:15:17 +00:00
Matthew Hodgson
fb5369f7d2 globe icon 2018-02-20 17:15:17 +00:00
Luke Barnard
e3e60bd372
Merge pull request #6187 from vector-im/luke/feature-tag-panel-global-filter 
CSS for new global TagPanel filter
 2018-02-19 09:59:25 +00:00
Travis Ralston
514e042eec
Separate the middle panel from the room list 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-02-16 14:53:52 -07:00
Luke Barnard
86d554b1dc CSS for new global TagPanel filter 2018-02-16 17:44:27 +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
332640c4ba
Merge pull request #6131 from vector-im/luke/fix-scrollbars-on-jump-to-first 
Adjust CSS to prevent scrollbars on message panel spinner
 2018-02-15 14:51:06 +00:00
Luke Barnard
5c354dda23 Fix messagePanelSpinner flex order in RightPanel 2018-02-15 14:34:44 +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
rugk
e3dcaebe9b
Merge branch 'develop' into patch-2 2018-02-15 13:16:34 +01:00
Luke Barnard
f64fefa9ae Use grab as some browsers e.g. firefox support it 2018-02-15 10:52:10 +00:00
rugk
ba7991deba
Fix syntax error of wrong use of self-closing HTML tag 
Firefox complaint about this in the source code view:
 2018-02-15 02:36:05 +01:00
Luke Barnard
594d510f4f Simplify MyGroups hierachy 2018-02-14 17:54:29 +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
7ac350ea36 Give mx_RoomView_messageListWrapper its min-height: 100% back 
because the spinner now exists separately to it
(as mx_RoomView_messagePanelSpinner) so their CSS is disentangled.
 2018-02-14 11:17:21 +00:00
Luke Barnard
b3bb2d2aa5 Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first 2018-02-14 10:51:20 +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
Richard Lewis
55cacfba82 Temporary hack to constrain LLP container size. 2018-02-13 20:42:46 +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
85c0b8dea3 Adjust CSS to prevent scrollbars on message panel spinner 
when clicking on permalinks/jump to first
 2018-02-13 14:15:22 +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
4b7561a75e Fix long group name pushing settings cog into void 2018-02-07 17:40:00 +00:00
lukebarnard
95c45362d5 Fix horizontal scrollbar under certain circumstances 
specifically when trailing whitespace is not wrapped onto the next
line of the block.

Fixes #6077
 2018-02-07 12:02:00 +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
Luke Barnard
680a0191be
Merge pull request #6067 from vector-im/t3chguy/fix_usercontent_pointer 
Split MImageBody into MFileBody to match JS Classes.
 2018-02-05 14:27:57 +00:00
Michael Telatynski
3abf1458fb
Add cursor:pointer so that calculated CSS includes it for iframe style 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-05 13:25:43 +00:00
Michael Telatynski
00b7cc512b
Split MImageBody into MImageBody,MFileBody to match react-sdk 
and having the classnames match their components.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-05 13:25:09 +00:00
Weblate
a6155c98ec Merge branch 'develop' of https://github.com/vector-im/riot-web into develop 
Conflicts:
	src/i18n/strings/eo.json
 2018-02-01 10:24:21 +00:00
Марко М. Костић
a26473b722 Translated using Weblate (Serbian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
 2018-02-01 09:48:47 +00:00
Xose M
ed5162ef4e Translated using Weblate (Galician) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
 2018-02-01 09:48:46 +00:00