OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,024 Commits
211 Branches
549 Tags
667 MiB
Commit Graph

5024 Commits (225c7ee6215a06af561eaab88df0e3f4a0da4952)

Author SHA1 Message Date
David Baker bdd96c6a9a Prepare changelog for v0.12.7-rc.3 2017-10-13 16:36:56 +01:00
David Baker e0de9cbdfe v0.12.7-rc.3 2017-10-13 16:36:07 +01:00
David Baker f555f2036e react-sdk rc.3 2017-10-13 16:35:41 +01:00
David Baker 3b2650e5ea Merge remote-tracking branch 'origin/develop' into release-v0.12.7 2017-10-13 16:33:55 +01:00
David Baker d1476e0cc7 Merge pull request #5275 from vector-im/dbkr/hide_join_group 
Hide the join group button
 2017-10-13 16:27:50 +01:00
David Baker b727944b11 Bump electron version 2017-10-13 16:27:01 +01:00
David Baker 398e0839f1 Hide the join group button 
Until it actually does something
 2017-10-13 16:15:17 +01:00
David Baker adceda7588 v0.12.7-rc.2 2017-10-13 15:06:18 +01:00
David Baker 577db02140 Prepare changelog for v0.12.7-rc.2 2017-10-13 15:06:18 +01:00
David Baker 4bd53eb821 v0.12.7-rc.2 2017-10-13 15:05:34 +01:00
David Baker b3da206a92 react-sdk rc.2 2017-10-13 15:03:43 +01:00
David Baker f8554ca2f2 v0.12.7-rc.1 2017-10-13 11:15:41 +01:00
David Baker 470ea8d6a7 Prepare changelog for v0.12.7-rc.1 2017-10-13 11:15:40 +01:00
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 783aebe5eb CSS for lonely room message 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-11 21:13:55 -06: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