5c354dda23
Fix messagePanelSpinner flex order in RightPanel
2018-02-15 14:34:44 +00:00
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
e3dcaebe9b
Merge branch 'develop' into patch-2
2018-02-15 13:16:34 +01:00
f6255906d8
Merge pull request #6143 from vector-im/luke/dnd-group-view-tag-panel
...
Implement riot-web side of dragging GroupTile avatars to TagPanel
2018-02-15 11:05:25 +00:00
f64fefa9ae
Use `grab` as some browsers e.g. firefox support it
2018-02-15 10:52:10 +00:00
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
594d510f4f
Simplify MyGroups hierachy
2018-02-14 17:54:29 +00:00
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
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
b3bb2d2aa5
Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first
2018-02-14 10:51:20 +00:00
8c1d2a4555
Merge pull request #6140 from vector-im/luke/fix-tag-panel-css
...
Fix LeftPanel size being incorrect when TagPanel disabled
2018-02-14 10:42:49 +00:00
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
7aea7f9400
Merge pull request #6134 from vector-im/luke/fix-tag-panel-collapse
...
Fix TagPanel from collapsing to < 60px when LP collapsed
2018-02-13 22:02:58 +00:00
9abda76d9e
Merge branch 'develop' into luke/fix-tag-panel-collapse
2018-02-13 22:02:49 +00:00
a966cc7dec
Merge pull request #6138 from vector-im/rxl881/llpFix
...
Temporary hack to constrain LLP container size.
2018-02-13 20:45:39 +00:00
55cacfba82
Temporary hack to constrain LLP container size.
2018-02-13 20:42:46 +00:00
0b5fe1232f
Merge pull request #6137 from rbozhkova/patch-1
...
Fix typo
2018-02-13 17:32:50 +00:00
3a808411f5
Merge pull request #6127 from vector-im/luke/feature-tag-panel-tile-context-menu
...
Add context menu to TagPanel
2018-02-13 17:28:47 +00:00
db5f4193ec
Fix typo
2018-02-13 18:22:01 +01:00
11b0cc8211
Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu
2018-02-13 17:00:19 +00:00
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
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
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
ec0dd63470
Merge pull request #6130 from vector-im/luke/move-groups-button-tp
...
Move groups button to TagPanel
2018-02-13 11:00:53 +01:00
2269c94579
Move groups button to TagPanel
2018-02-13 09:44:25 +00:00
e36baa8c3a
Fix quotes on import
2018-02-12 18:47:29 +00:00
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
1d2f5bafda
Merge branch 'master' into develop
2018-02-09 12:46:28 +00:00
9e614a54da
v0.13.5
2018-02-09 12:43:45 +00:00
30087e5c73
Prepare changelog for v0.13.5
2018-02-09 12:43:45 +00:00
1d222e3507
v0.13.5
2018-02-09 12:38:23 +00:00
b20dea58c6
Bump react-sdk version
2018-02-09 12:36:19 +00:00
d904212033
Merge branch 'release-v0.13.5' into develop
2018-02-09 12:28:26 +00:00
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
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
495090c9ba
Remove now unused RoomSubList code
2018-02-08 14:08:20 +00:00
d484a1cd85
Merge pull request #6106 from vector-im/luke/fix-long-group-name
...
Fix long group name pushing settings cog into void
2018-02-07 18:03:43 +00:00
4b7561a75e
Fix long group name pushing settings cog into void
2018-02-07 17:40:00 +00:00
5c3e2dca17
Merge pull request #6103 from vector-im/luke/fix-composer-horizontal-scroll
...
Fix horizontal scrollbar under certain circumstances
2018-02-07 12:14:10 +00:00
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
662942ec29
Use dispatch to change room tags from RoomTileContextMenu
2018-02-06 11:52:39 +00:00
83996c09d9
General delint, cleanup
2018-02-06 11:51:46 +00:00
e46f436a47
Prefer context.matrixClient in LeftPanel
2018-02-06 11:50:34 +00:00
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
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
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
456aebe240
Merge pull request #6040 from sim6/sim6_catalan
...
Add Catalan
2018-02-01 10:47:01 +00:00
66e20298a7
Merge pull request #5777 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2018-02-01 10:45:56 +00:00
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
Luke Barnard