e3dcaebe9b
Merge branch 'develop' into patch-2
2018-02-15 13:16:34 +01: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
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
9abda76d9e
Merge branch 'develop' into luke/fix-tag-panel-collapse
2018-02-13 22:02:49 +00:00
55cacfba82
Temporary hack to constrain LLP container size.
2018-02-13 20:42:46 +00: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
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
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
4b7561a75e
Fix long group name pushing settings cog into void
2018-02-07 17:40:00 +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
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
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
930deaea9d
Translated using Weblate (Chinese (Simplified))
...
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/zh_Hans/
2018-02-01 09:48:45 +00:00
b80be62bb7
Translated using Weblate (Catalan)
...
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/ca/
2018-02-01 09:48:45 +00:00
11806f2aa2
Translated using Weblate (Basque)
...
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/eu/
2018-02-01 09:48:45 +00:00
078d156824
Translated using Weblate (Ukrainian)
...
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/uk/
2018-01-29 17:06:45 +00:00
88c4cb6eba
Translated using Weblate (Chinese (Simplified))
...
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/zh_Hans/
2018-01-27 16:55:15 +00:00
bc4f8c4c2a
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-01-26 14:26:24 +00:00
7ee205a447
Translated using Weblate (Catalan)
...
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/ca/
2018-01-26 13:06:57 +00:00
f6c49a2472
Translated using Weblate (Catalan)
...
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/ca/
2018-01-26 02:25:21 +00:00
37fe3ac676
Prevent RoomTiles from being dragged into other droppables
...
for the time being at least.
2018-01-25 22:51:40 +01:00
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
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
04bca93e0d
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools-118247
2018-01-25 20:59:31 +00:00
5c6a265b86
Translated using Weblate (Catalan)
...
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/ca/
2018-01-24 17:53:36 +00:00
b0a3bd6591
Merge pull request #6017 from vector-im/t3chguy/rich_quoting_linear
...
Linear Rich Quoting
2018-01-24 18:53:33 +01:00
8b7a941a6e
Translated using Weblate (Catalan)
...
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/ca/
2018-01-24 08:55:16 +00:00
22b7298542
add comments
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-23 20:28:39 +00:00
9d1a3c9011
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things
2018-01-23 20:19:27 +00:00
c2aa8137bb
sort components scss
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-23 20:02:47 +00:00
4d0b02c683
Translated using Weblate (Catalan)
...
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/ca/
2018-01-23 19:46:06 +00:00
0df6f85843
Translated using Weblate (Slovak)
...
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/sk/
2018-01-22 22:21:55 +00:00
13dd8e2c76
Translated using Weblate (Italian)
...
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/it/
2018-01-22 22:21:55 +00:00
rugk