gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,165 Commits 2 Branches 0 Tags 25 MiB
Commit Graph

4059 Commits

Author SHA1 Message Date
Klaus Marx a316face83 Translated using Weblate (German) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2018-02-27 16:06:42 +00:00
Weblate 9ad9c82c85 Merge remote-tracking branch 'origin/develop' into develop 2018-02-27 15:11:26 +00:00
daniel tygel 80d0f196c4 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
 2018-02-27 15:11:26 +00:00
Luke Barnard 56ca1bc7ee
Merge pull request #6257 from vector-im/luke/groups-my-groups-microcopy 
CSS for my groups microcopy
 2018-02-27 15:11:21 +00:00
Luke Barnard 14824c2b77 CSS for my groups microcopy 2018-02-27 09:39:04 +00:00
daniel tygel fb6c01a0ea Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
 2018-02-26 20:43:32 +00:00
Weblate 2410fc9754 Merge remote-tracking branch 'origin/develop' into develop 2018-02-26 12:19:37 +00:00
Matthew Hodgson 09619339fd
Merge pull request #6245 from spantaleev/wider-media-dropdown 
Make media dropdown wider
 2018-02-26 12:19:32 +00:00
Weblate bb87cf6996 Merge remote-tracking branch 'origin/develop' into develop 2018-02-26 12:18:59 +00:00
Matthew Hodgson aeb423ce1b
Merge pull request #6244 from spantaleev/gracefully-degrading-dropdowns 
Make dropdowns with long options degrade more gracefully
 2018-02-26 12:18:53 +00:00
Weblate 2a65a43039 Merge remote-tracking branch 'origin/develop' into develop 2018-02-26 09:50:33 +00:00
Ralitsa Bozhkova d0a99c4f2d Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-26 09:50:32 +00:00
Luke Barnard 514338ec8a Remove distracting highlight on unfilter button background 2018-02-26 09:49:35 +00:00
Katie Wolfe 53cfaa3c45 Translated using Weblate (Esperanto) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
 2018-02-24 14:55:16 +00:00
Luca Weiss 7487ac75f7 Translated using Weblate (Esperanto) 
Currently translated at 98.6% (220 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
 2018-02-24 14:54:10 +00:00
Katie Wolfe 54e0aaf8e0 Translated using Weblate (Esperanto) 
Currently translated at 98.2% (219 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
 2018-02-24 14:52:08 +00:00
Slavi Pantaleev e73b7c973d Make media dropdown wider 
The media dropdown would sometimes contain options
with long text, which can't possibly fit in 200px.
(e.g. `Monitor of Built-in Audio Digital Stereo (HDMI)`)

Dedicating some more space resolves the problem.

Signed-off-by: Slavi Pantaleev <slavi@devture.com>
 2018-02-24 10:02:32 +02:00
Slavi Pantaleev 985dd44b66 Make dropdowns with long options degrade more gracefully 
If not enough space was dedicated to a dropdown,
it would previously make option text overlap.

With this patch, each option can potentially span
multiple lines. This is weird, but it's a better
degradation than making option text overlap.

Signed-off-by: Slavi Pantaleev <slavi@devture.com>
 2018-02-24 09:54:45 +02:00
Richard Lewis c198dd381f Pull in changes from develop 2018-02-23 17:31:24 +00:00
Weblate e80bd9b4e5 Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 16:43:01 +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
Weblate 912f953f85 Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 16:36:20 +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
Weblate a991960998 Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 16:28:34 +00:00
Ralitsa Bozhkova 447373676b Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-23 16:28:32 +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
Slavi Pantaleev aedecfb06c Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-23 16:08:15 +00:00
Xose M 15231615d4 Translated using Weblate (Galician) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
 2018-02-23 07:26:53 +00:00
Weblate 2d093a8c2a Merge remote-tracking branch 'origin/develop' into develop 2018-02-22 14:50:51 +00:00
Slavi Pantaleev 030d5e04a3 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-22 14:50:49 +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
Weblate 8bdf9d75cf Merge remote-tracking branch 'origin/develop' into develop 2018-02-21 18:05:59 +00:00
Ralitsa Bozhkova d4dea52c6b Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-21 18:05:57 +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
Weblate e0a872a7c5 Merge remote-tracking branch 'origin/develop' into develop 2018-02-20 17:15:26 +00:00
Ralitsa Bozhkova 48f3b90208 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-20 17:15:24 +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
Weblate f6bcab18be Merge remote-tracking branch 'origin/develop' into develop 2018-02-19 09:59:30 +00:00
Kacper Fronc a35a80ca4f Translated using Weblate (Polish) 
Currently translated at 97.3% (217 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
 2018-02-19 09:59:29 +00:00
Andrey Silversburg 0da2034a3e Translated using Weblate (Indonesian) 
Currently translated at 86.9% (194 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/id/
 2018-02-19 09:59:29 +00:00
Slavi Pantaleev 4ab94b397a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-19 09:59:28 +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
Weblate d0a38df67a Merge remote-tracking branch 'origin/develop' into develop 2018-02-16 22:22:37 +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
Weblate 57b34267c5 Merge remote-tracking branch 'origin/develop' into develop 2018-02-16 11:53:35 +00:00
Tulir Asokan 4fc49850e1 Translated using Weblate (Finnish) 
Currently translated at 99.5% (222 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fi/
 2018-02-16 11:53:34 +00:00
Ralitsa Bozhkova 5e25844ea8 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-16 11:53:33 +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
Марко М. Костић 37a912e7ee Translated using Weblate (Serbian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
 2018-02-16 10:40:39 +00:00
Weblate f33bddaadd Merge remote-tracking branch 'origin/develop' into develop 2018-02-15 14:51:12 +00:00
Ralitsa Bozhkova 5740274528 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-15 14:51:10 +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
Osoitz 8c17fafaca Translated using Weblate (Basque) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
 2018-02-15 13:35:24 +00:00
Ralitsa Bozhkova ac5e42d0dd Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-15 13:14:21 +00:00
rugk e3dcaebe9b
Merge branch 'develop' into patch-2 2018-02-15 13:16:34 +01:00
Weblate 7fe65703f7 Merge remote-tracking branch 'origin/develop' into develop 2018-02-15 11:05:31 +00:00
Ralitsa Bozhkova 9d3b96e746 Translated using Weblate (Spanish) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2018-02-15 11:05:31 +00:00
Ralitsa Bozhkova e47c22a23e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 98.6% (220 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
 2018-02-15 11:05:30 +00:00
Ralitsa Bozhkova 06818761ef Translated using Weblate (Bulgarian) 
Currently translated at 66.8% (149 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-15 11:05:29 +00:00
Ralitsa Bozhkova 6419fc73f5 Translated using Weblate (Belarusian) 
Currently translated at 32.2% (72 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/be/
 2018-02-15 11:05:29 +00:00
Aziz Ibrahimov c62b4ed9b1 Translated using Weblate (Azerbaijani) 
Currently translated at 13.4% (30 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/az/
 2018-02-15 11:05:29 +00:00
Luke Barnard f64fefa9ae Use `grab` as some browsers e.g. firefox support it 2018-02-15 10:52:10 +00:00
Aziz Ibrahimov 2f5fc5a764 Added translation using Weblate (Azerbaijani) 2018-02-15 10:02:14 +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
Weblate 9139dcbd1e Merge remote-tracking branch 'origin/develop' into develop 2018-02-14 10:42:55 +00:00
Ralitsa Bozhkova 14b0e85850 Translated using Weblate (Bulgarian) 
Currently translated at 16.1% (36 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-14 10:42:52 +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
Szimszon 0d85a46e84 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2018-02-14 07:52:15 +00:00
Weblate d05b221a6c Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 22:03:03 +00:00
Ralitsa Bozhkova 54f4563303 Translated using Weblate (Bulgarian) 
Currently translated at 14.3% (32 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-13 22:03:02 +00:00
Matthew Hodgson 9abda76d9e
Merge branch 'develop' into luke/fix-tag-panel-collapse 2018-02-13 22:02:49 +00:00
Weblate 42582c7ccd Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 20:45:44 +00:00
Simó Albert i Beltran c88a59c228 Translated using Weblate (Spanish) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2018-02-13 20:45:44 +00:00
Ralitsa Bozhkova b54f949fe6 Translated using Weblate (Bulgarian) 
Currently translated at 13.4% (30 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/bg/
 2018-02-13 20:45:43 +00:00
Richard Lewis 55cacfba82 Temporary hack to constrain LLP container size. 2018-02-13 20:42:46 +00:00
Walter 3bc1eef39b Translated using Weblate (Russian) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2018-02-13 18:56:54 +00:00
Simó Albert i Beltran ee7add05ae Translated using Weblate (Catalan) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2018-02-13 18:46:42 +00:00
Kévin C e7d1c04bb5 Translated using Weblate (French) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2018-02-13 18:25:15 +00:00
Simó Albert i Beltran 247a3cebb9 Translated using Weblate (Spanish) 
Currently translated at 100.0% (223 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2018-02-13 18:00:42 +00:00
Weblate 03be7eb32c Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 17:28:52 +00:00
Ralitsa Bozhkova 2524c5f861 Added translation using Weblate (Bulgarian) 2018-02-13 17:22:45 +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
Weblate 084ebe6e16 Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 14:18:56 +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
Weblate aec3c9961c Merge remote-tracking branch 'origin/develop' into develop 2018-02-13 10:00:58 +00:00
Oskars c7aafd8410 Translated using Weblate (Latvian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lv/
 2018-02-13 10:00:57 +00:00
lighthawk c0720d5d24 Translated using Weblate (Japanese) 
Currently translated at 33.3% (74 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
 2018-02-13 10:00:57 +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
Oskars 93a381218c Translated using Weblate (Latvian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lv/
 2018-02-10 12:34:50 +00:00
Richard Lewis 095130a569 Hide apps drawer 2018-02-09 13:23:56 +00:00
Weblate 47df5d2d60 Merge remote-tracking branch 'origin/develop' into develop 2018-02-09 12:28:42 +00:00
Osoitz d3c1072842 Translated using Weblate (Basque) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
 2018-02-09 12:28:40 +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
Марко М. Костић f41a70fe1f Translated using Weblate (Serbian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
 2018-02-07 20:36:40 +00:00
Weblate bdbf0427a1 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 18:03:48 +00:00
lukebarnard 4b7561a75e Fix long group name pushing settings cog into void 2018-02-07 17:40:00 +00:00
Simó Albert i Beltran 31af7c583f Translated using Weblate (Spanish) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2018-02-07 13:57:00 +00:00
Weblate 2d0ea28a39 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 12:14:15 +00:00
Марко М. Костић 0f475a0e10 Translated using Weblate (Serbian) 
Currently translated at 98.6% (219 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
 2018-02-07 12:14:15 +00:00
Robert A. Viana f3bae5c090 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.5% (221 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
 2018-02-07 12:14:14 +00:00
Szimszon ca2767fd04 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2018-02-07 12:14:14 +00:00
Krombel c659c81341 Translated using Weblate (German) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2018-02-07 12:14:14 +00:00
Kévin C 7eab0eca5b Translated using Weblate (French) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2018-02-07 12:14:14 +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
Jeff Huang 8efce30d7f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2018-02-07 11:57:50 +00:00
Peter Vágner 44a727b205 Translated using Weblate (Slovak) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
 2018-02-07 08:56:04 +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
Simó Albert i Beltran 3cbaa95184 Translated using Weblate (Catalan) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ca/
 2018-02-06 10:41:59 +00:00
Weblate 8c75bed687 Merge remote-tracking branch 'origin/develop' into develop 2018-02-05 14:28:03 +00:00
Марко М. Костић 481476f835 Translated using Weblate (Serbian) 
Currently translated at 98.6% (219 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
 2018-02-05 14:28:03 +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
Nathan van Beelen 2a58de5cfc Translated using Weblate (Dutch) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2018-02-04 14:24:39 +00:00
Osoitz c3b000a368 Translated using Weblate (Basque) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
 2018-02-02 08:28:22 +00:00
Kévin C 675bebee33 Translated using Weblate (French) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2018-02-01 17:46:52 +00:00
Szimszon cefd744aba Translated using Weblate (Hungarian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2018-02-01 16:15:54 +00:00
Krombel 325c9662c5 Translated using Weblate (German) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2018-02-01 15:13:02 +00:00
Andrey 8b35a7b10f Translated using Weblate (Russian) 
Currently translated at 100.0% (222 of 222 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2018-02-01 11:33:01 +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
Tong Hui 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
Simó Albert i Beltran 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
Osoitz 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
Walter 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
Iru Cai (vimacs) 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
Xose M 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
d1d4c 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
Ramon Vilar 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
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
d1d4c 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
David Baker b0a3bd6591
Merge pull request #6017 from vector-im/t3chguy/rich_quoting_linear 
Linear Rich Quoting
 2018-01-24 18:53:33 +01:00
d1d4c 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
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
Michael Telatynski c2aa8137bb sort components scss 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-23 20:02:47 +00:00
d1d4c 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
Peter Vágner 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
A.G 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
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 d57a10e0b2
Merge branches 'develop' and 't3chguy/rich_quoting_linear' of github.com:vector-im/riot-web into t3chguy/rich_quoting_linear 2018-01-22 16:53:51 +00:00
Michael Telatynski 202f0e2163
Add EventTile_quote styling for less margin-right when in QuotePreview 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-22 16:42:08 +00:00
pincopallopino 77d8fe3ef1 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-20 23:00:26 +00:00
A.G 3e5833e9f2 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-20 22:59:29 +00:00
pincopallopino 2b26be73f6 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-20 22:59:22 +00:00
A.G ce6338b853 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-20 22:59:12 +00:00
vricci 52c5293a12 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-20 22:59:04 +00:00
A.G 568e1f4f90 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-20 22:58:48 +00:00
vricci 29f05c09d6 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-20 22:58:18 +00:00
A.G 888a77b4bb 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-20 22:57:00 +00:00
pebles 4eeb7989f6 Translated using Weblate (Spanish) 
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/es/
 2018-01-20 16:34:07 +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
Peter Vágner 189b7236af 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-20 11:54:14 +00:00
Matthew Hodgson 8855cc294e converge on 'noisy' to mean noisy notifs 2018-01-19 16:52:54 +00:00
Weblate 935b85afe7 Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 14:49:58 +00:00
Марко М. Костић 68f19f9558 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-01-18 21:05:10 +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 c340032bd1 Move sticker related CSS to its own file. 2018-01-17 15:49:03 +00:00
Richard Lewis de597d4f5d Make background lighter. 2018-01-17 15:13:29 +00:00
Richard Lewis 854b537695 Update sticker toggle icons. 2018-01-17 11:27:57 +00:00
Richard Lewis f4816b99ff Add stickerpack manage integration link styling. 2018-01-17 00:05:16 +00:00
Richard Lewis 56ae96fc75 Sticker content styling 2018-01-16 21:46:50 +00:00
Richard Lewis f8643e9a96 Add styling and image for stickerpack placeholder. 2018-01-16 18:35:04 +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
Weblate ff70af3f34 Merge remote-tracking branch 'origin/develop' into develop 2018-01-16 13:05:37 +00:00
Xose M 6f47a9b8c3 Translated using Weblate (Galician) 
Currently translated at 99.5% (219 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
 2018-01-16 13:05:36 +00:00
Luke Barnard a94208e230
Merge pull request #5992 from vector-im/luke/tag-panel-beautiful-dnd 
CSS required as part of moving TagPanel from react-dnd to react-beautiful-dnd
 2018-01-16 13:05:31 +00:00
Michael Telatynski 4386d45a97
remove 'use strict' 2018-01-16 10:27:47 +00:00
lukebarnard c269abd434 CSS required as part of moving TagPanel from react-dnd to react-beautiful-dnd 2018-01-16 09:40:15 +00:00
Weblate 152f28bf2a Merge remote-tracking branch 'origin/develop' into develop 2018-01-15 13:45:20 +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
Richard Lewis 7924a149b4 Remove transparent background and fix z-index of popover. 2018-01-15 11:14:30 +00:00
Weblate cf00ac34d9 Merge remote-tracking branch 'origin/develop' into develop 2018-01-15 10:06:12 +00:00
toriko a50e9d2b6b Translated using Weblate (Japanese) 
Currently translated at 33.1% (73 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
 2018-01-15 10:06:11 +00:00
Jeff Huang e2ef885aa6 Translated using Weblate (Chinese (Traditional)) 
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_Hant/
 2018-01-15 10:06:10 +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
Neo_Chen b99e87ba0a Translated using Weblate (Chinese (Traditional)) 
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_Hant/
 2018-01-13 00:44:59 +00:00
Richard Lewis a24c3ada53 Sticker styling 2018-01-12 17:36:09 +00:00
Klaus Marx b023cc790b Translated using Weblate (German) 
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/de/
 2018-01-12 09:32:20 +00:00
Michael Telatynski 5aec6840bf
Add cursor:pointer so that it actually looks clickable 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 19:33:21 +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
Osoitz 26f377decf 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-01-11 12:55:14 +00:00
Szimszon 004ccc47b3 Translated using Weblate (Hungarian) 
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/hu/
 2018-01-11 12:34:32 +00:00
Andrey fbd7860a9b Translated using Weblate (Russian) 
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/ru/
 2018-01-11 10:47:32 +00:00
Kévin C 586533d6ea Translated using Weblate (French) 
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/fr/
 2018-01-11 10:36:52 +00:00
Bamstam c8bd89ce4c Translated using Weblate (German) 
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/de/
 2018-01-11 10:36:29 +00:00
Weblate 1a9b86b27f Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:34:48 +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
Richard Lewis 50271b7123 Remove padding on last component of MessageComposer (sticker toggle icons) 2018-01-10 20:48:22 +00:00
Richard Lewis 409bb5ff4d Improved icons. 2018-01-09 16:01:33 +00:00
Richard Lewis fa1059e202 Show / hide stickers icon styling 2018-01-09 15:59:28 +00:00
Richard Lewis f8e00e43e3 Show / hide sitckers icons 2018-01-09 15:59:04 +00:00
Weblate 54cafec57a Merge remote-tracking branch 'origin/develop' into develop 2018-01-08 15:18:08 +00:00
David Baker 24e16e5c18
Revert "Add a &nbsp; after timestamp" 2018-01-08 15:17:05 +00:00
Weblate 9c7783b439 Merge remote-tracking branch 'origin/develop' into develop 2018-01-08 15:00:51 +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
Iru Cai (vimacs) 97cc7f88ef Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2018-01-08 02:02:11 +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
Weblate 9289d1a57d Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 14:30:51 +00:00
David Baker c8af65fff4 Merge branch 'hide-options-cp' of https://github.com/rubo77/vector-web into rubo77-hide-options-cp 2018-01-05 14:30:21 +00:00
Weblate d2a676cad2 Merge remote-tracking branch 'origin/develop' into develop 2018-01-03 15:48:44 +00:00
Sejo 33cf966f34 Translated using Weblate (Spanish) 
Currently translated at 99.0% (217 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2018-01-03 15:48:44 +00:00
Peter Vágner 760b961e19 Translated using Weblate (Slovak) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
 2018-01-03 15:48:44 +00:00
Joachim Nielandt 2660e70e00 Translated using Weblate (Dutch) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2018-01-03 15:48:43 +00:00
Milan Korecký f3f608b35f Translated using Weblate (Czech) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2018-01-03 15:48:42 +00:00
Osoitz 34a3ef7e1d Translated using Weblate (Basque) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
 2018-01-03 15:48:42 +00:00
nostradamos 762f6aaf0f Merge remote-tracking branch 'upstream/develop' into fix_4821 2018-01-02 12:58:30 +01:00
Nostradamos 3600d1c667 moved max-height/min-height/overflow attributes to higher level to also include DraftEditorPlaceholder. Could fix https://github.com/vector-im/riot-web/issues/4821 2018-01-02 12:14:54 +01:00
Travis Ralston 504a575feb Revert "Merge pull request #5286 from turt2live/travis/presence" 
This reverts commit 3e72d8d969.
 2017-12-25 14:29:50 -07:00
Nathan van Beelen ec5c960ebb Translated using Weblate (Dutch) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2017-12-22 19:01:48 +00:00
Joachim Nielandt 1f26a17b29 Translated using Weblate (Dutch) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2017-12-22 07:52:44 +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
Xose M 17e0d3f8a0 Translated using Weblate (Galician) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
 2017-12-20 06:27:56 +00:00
Weblate 97116bb268 Merge remote-tracking branch 'origin/develop' into develop 2017-12-19 17:04:51 +00:00