Commit Graph

4890 Commits (79154e26fc22e61441a612d770fdd14a750770ef)

Author SHA1 Message Date
David Baker 79154e26fc v0.12.7-rc.1 2017-10-13 11:14:31 +01:00
David Baker 64cfc9b717 js & react sdk rc.1 2017-10-13 11:13:54 +01:00
Luke Barnard bbcf46bb69 Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-10-12 18:12:14 +01:00
David Baker 832465655b Merge pull request #5203 from vector-im/t3chguy/riot.im-logos
switch to new logos, and use import rather than VAR
2017-10-12 17:49:29 +01:00
David Baker 392fea1207 Merge pull request #5266 from turt2live/travis/doc_integs
Clarify what an integrations server is
2017-10-12 17:48:30 +01:00
David Baker 0c093b5ca2 Merge pull request #5269 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
2017-10-12 17:47:39 +01:00
Weblate 8216d8999c Merge branch 'develop' of https://github.com/vector-im/riot-web into develop
Conflicts:
	src/i18n/strings/cs.json
	src/i18n/strings/fr.json
	src/i18n/strings/nb_NO.json
	src/i18n/strings/nl.json
	src/i18n/strings/pt_BR.json
2017-10-12 16:24:36 +00:00
Carlos Marques 7d12e2f64b Translated using Weblate (Portuguese)
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/
2017-10-12 16:22:01 +00:00
Kevin Brubeck Unhammer bbf859aad7 Translated using Weblate (Norwegian Bokmål)
Currently translated at 54.7% (122 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/
2017-10-12 16:22:01 +00:00
Travis Ralston eb6ce753aa Clarify what an integrations server is
Possibly helps resolve #1698

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 19:52:10 -06:00
Michael Telatynski 6df69138a2
switch to new logos, and use import rather than VAR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-11 16:46:05 +01:00
Luke Barnard ca0d8e425e Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-10-11 16:00:34 +01:00
Luke Barnard ae1a5a50b0 Move inline CSS for flair
Also, move vertical align from mx_Flair to img otherwise the SenderProfile has increased height when Flair is present, causing bug with scroll position
2017-10-11 16:00:26 +01:00
Luke Barnard e405d6cbd6 Merge pull request #5167 from vector-im/t3chguy/quickfix
Remove trailing comma in JSON
2017-10-11 16:40:29 +02:00
Luke Barnard 508ff4f917 Merge pull request #3849 from psaavedra/set_default_federate_by_settings
Added default_federate property
2017-10-11 16:28:25 +02:00
David Baker 83f7af5d7e Merge pull request #5197 from vector-im/dbkr/say_which_homeserver
CSS for greying out login form
2017-10-11 14:12:20 +01:00
David Baker 27a81c25d2 CSS for greying out login form 2017-10-11 14:06:12 +01:00
David Baker e39730d52e Say which translation file failed (#5196)
So we can see which i18n file is invalid when it fails
2017-10-11 09:56:38 +01:00
Andrey 415ffac978 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/
2017-10-10 17:29:36 +00:00
Morgan Bazalgette 16764382a5 Translated using Weblate (Italian)
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/it/
2017-10-10 17:29:36 +00:00
Xose M fd7ddd9ec8 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/
2017-10-10 17:29:36 +00:00
David Baker 20d2a6685f Remove spurious comma 2017-10-10 18:28:15 +01:00
Morgan Bazalgette 25413b2b35 Translated using Weblate (Italian)
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/it/
2017-10-08 20:27:21 +00:00
Xose M e1f17e2cdc 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/
2017-10-06 13:35:38 +00:00
Michael Telatynski a5e41102bc Remove trailing comma in JSON 2017-10-04 23:42:27 +01:00
Michael Telatynski 85a590ad5a Remove trailing comma in JSON 2017-10-04 23:41:54 +01:00
Michael Telatynski bf6a3470b4
Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings 2017-10-04 22:35:58 +01:00
Luke Barnard 3d7b1cb382 Merge pull request #5164 from vector-im/luke/fix-no-roomlist-placeholders
Fix bug that made sub list placeholders not show for ILAG etc.
2017-10-04 16:13:45 +01:00
Luke Barnard 70bbf2df7a Fix bug that made sub list placeholders not show for ILAG etc. 2017-10-04 15:58:40 +01:00
Luke Barnard 56c366ebd3 Merge pull request #5161 from vector-im/luke/refactor-editable-list-from-alias-settings
Factor out EditableItemList component from AliasSettings
2017-10-04 10:56:21 +01:00
Luke Barnard a9d308004e Factor out EditableItemList component from AliasSettings 2017-10-04 10:30:09 +01:00
Walter a75fa7fd3e 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/
2017-10-04 09:24:42 +00:00
Danilo Resende 44162d5c8a 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/
2017-10-04 09:24:42 +00:00
Luke Barnard ec414147d1 Merge pull request #5110 from pafcu/mark-and-remove-translations
Mark and remove some translations
2017-10-04 10:24:36 +01:00
Danilo Resende 23c1a3233b 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/
2017-10-03 22:19:54 +00:00
pafcu 9680bcb117 Implement reviewer suggestions 2017-10-03 18:22:58 +02:00
Bamstam f040a248d6 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/
2017-10-03 14:34:35 +00:00
Walter 171353a87d Translated using Weblate (Ukrainian)
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/uk/
2017-10-03 12:38:04 +00:00
Weblate 65e73c71cd Merge remote-tracking branch 'origin/develop' into develop 2017-10-03 10:45:12 +00:00
syamkumar 3b8ad0e12e Translated using Weblate (Malayalam)
Currently translated at 93.2% (208 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ml/
2017-10-03 10:45:12 +00:00
Xose M 834801e9d7 Translated using Weblate (Galician)
Currently translated at 44.8% (100 of 223 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/gl/
2017-10-03 10:45:11 +00:00
Nathan van Beelen 233a611c22 Translated using Weblate (Dutch)
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/nl/
2017-10-03 10:45:11 +00:00
Luke Barnard d082e44d94 Merge pull request #5141 from vector-im/luke/groups-remove-room
CSS for "remove" button on GroupRoomTile
2017-10-03 11:45:07 +01:00
Luke Barnard 195395e7ee Adjust CSS for groupRoomTile and add QuestionDialog right padding
(The confirmation dialog for removing a room needed padding)
2017-10-03 11:14:43 +01:00
Xose M a8767e823a Added translation using Weblate (Galician) 2017-10-02 10:24:25 +00:00
Silke fa4a22cd2e Translated using Weblate (Dutch)
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/nl/
2017-09-30 09:36:16 +00:00
Luke Barnard 014464d82b CSS for "remove" button on GroupRoomTile 2017-09-29 17:58:42 +01:00
Weblate 9f7823f2df Merge remote-tracking branch 'origin/develop' into develop 2017-09-29 16:23:06 +00:00
Luke Barnard f35289a664 Merge pull request #5140 from vector-im/luke/groups-room-icons
Create basic icon for the GroupRoomList tab and adding rooms to groups
2017-09-29 17:23:02 +01:00
Luke Barnard d3b8d8bf9d Create basic icon for the GroupRoomList tab and adding rooms to groups 2017-09-29 17:03:58 +01:00