67a9b6502b
Merge branch 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff
2017-06-20 14:33:09 +01:00
fe1b0b5cd8
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff
2017-06-20 14:32:19 +01:00
8dade0d84e
Merge pull request #4366 from vector-im/luke/feature-user-settings-password-warning
...
Give _t to PasswordNagBar, add CSS for UserSettings password warning
2017-06-20 14:31:12 +01:00
499b1c2e70
add missing semicolon
2017-06-20 14:05:17 +01:00
047b255e14
Add en_EN translations
2017-06-20 13:33:38 +01:00
3926e4dd98
Merge branch 'master' into develop
2017-06-20 13:18:58 +01:00
639b17c663
v0.11.3
2017-06-20 13:15:36 +01:00
ea8a49f1b7
Prepare changelog for v0.11.3
2017-06-20 13:15:35 +01:00
eda3f20b26
v0.11.3
2017-06-20 13:13:28 +01:00
6ef32f182a
react-sdk 0.9.6
2017-06-20 13:13:03 +01:00
6bae293bdf
Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-20 13:12:14 +01:00
d5d29c1c92
Give _t to PasswordNagBar, add CSS for UserSettings password warning
...
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1123
2017-06-20 11:23:34 +01:00
556ff24c5f
Merge pull request #4361 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-20 10:19:34 +01:00
f5d9af9b0b
Translated using Weblate (Ukrainian)
...
Currently translated at 98.0% (196 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/uk/
2017-06-20 09:00:47 +00:00
3ff0ed52b2
Translated using Weblate (Russian)
...
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-06-20 09:00:47 +00:00
133f3d24f5
Translated using Weblate (Russian)
...
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-06-19 17:18:38 +00:00
241ebe50d2
Translated using Weblate (German)
...
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
2017-06-19 17:18:38 +00:00
7fda26f268
Merge pull request #4360 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-19 15:43:34 +01:00
0729d50e47
Merge remote-tracking branch 'origin/develop' into develop
2017-06-19 13:38:56 +00:00
f6cbb708b0
Merge pull request #4352 from vector-im/rav/test_return_to_app
...
Test 'return-to-app' functionality
2017-06-19 14:38:52 +01:00
8b7692cf3b
Translated using Weblate (Russian)
...
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
2017-06-19 13:24:27 +00:00
7523251098
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pt_BR/
2017-06-19 13:23:34 +00:00
5b5e6d83d9
Merge branch 'master' into develop
2017-06-19 13:24:58 +01:00
448e33bb65
v0.11.2
2017-06-19 13:20:45 +01:00
88950f29c5
Prepare changelog for v0.11.2
2017-06-19 13:20:44 +01:00
3e279746d5
v0.11.2
2017-06-19 13:19:09 +01:00
f420a18696
Released js-sdk & react-sdk
2017-06-19 13:12:40 +01:00
578fa1c160
Merge pull request #4354 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-19 11:40:17 +01:00
c9715e02d9
Merge remote-tracking branch 'weblate/develop' into develop
2017-06-19 11:39:59 +01:00
9f7cf463b9
Merge pull request #4354 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-19 11:38:55 +01:00
9eca0d2fde
Merge remote-tracking branch 'origin/develop' into develop
2017-06-19 10:38:05 +00:00
45bb74d8f6
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (200 of 200 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
2017-06-19 10:38:04 +00:00
07103431a9
Merge remote-tracking branch 'weblate/develop' into develop
2017-06-19 11:37:55 +01:00
6e64dd32c8
add register button
2017-06-19 11:33:44 +01:00
e3a63c3a6d
fix broken vars
2017-06-19 11:33:36 +01:00
79816c5726
fix broken http status i18n
2017-06-19 11:33:12 +01:00
c55d292840
add new languages
2017-06-19 11:32:49 +01:00
0da4834360
Merge pull request #4346 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2017-06-19 11:32:28 +01:00
adbe5c71b7
Merge pull request #4337 from vector-im/t3chguy/fix_forwarding
...
change dispatcher forward_event signature
2017-06-19 11:31:17 +01:00
a9dfd4da2d
Merge pull request #4259 from ollieh/code-block-border
...
Add border on hover for code blocks
2017-06-19 11:30:57 +01:00
557d4ae4c1
Test 'return-to-app' functionality
...
Add a test for the 'log in as user' functionality, as well as the 'return to
app' functionality.
2017-06-19 10:47:36 +01:00
563d1dc3f1
Merge pull request #4335 from vector-im/rav/fix_token_redirect
...
onLoadCompleted is now onTokenLoginCompleted
2017-06-19 09:06:17 +01:00
5a8a41ad50
Merge branch 'develop' into rav/fix_token_redirect
2017-06-19 09:05:19 +01:00
60be24c665
Rename promise
2017-06-19 09:04:24 +01:00
4a968cd34f
Merge remote-tracking branch 'origin/develop' into develop
2017-06-19 08:02:30 +00:00
0608c67767
Merge branch 'rav/refactor_matrixclient_states' into develop
...
(PR https://github.com/vector-im/riot-web/pull/4325 )
2017-06-19 09:02:08 +01:00
bd1b06c9b4
Merge remote-tracking branch 'origin/develop' into develop
2017-06-19 07:57:09 +00:00
98f8be45b7
Merge pull request #4325 from vector-im/rav/refactor_matrixclient_states
...
Tweak tests to match updates to matrixchat
2017-06-19 08:57:06 +01:00
641f20a4f6
Tweak tests to match updates to matrixchat
...
Mostly this is just making it look at the `view` state rather than the
individual boolean flags.
One other tweak merits explanation: we now implement the initial
couldn't-register-as-guest login with an explicit switch to the LOGIN view,
which means that the URL gets updated to #/login.
We also now need to give the login panel a bit longer to appear.
2017-06-19 08:55:54 +01:00
7cbfa228ee
Merge remote-tracking branch 'origin/develop' into develop
2017-06-18 23:54:13 +00:00
Michael Telatynski