PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
4256 commits 1 branch 0 tags 338 MiB
Commit graph

4256 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
0729d50e47 Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 13:38:56 +00:00
Richard van der Hoff
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
russian
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
daniel tygel
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
David Baker
5b5e6d83d9 Merge branch 'master' into develop 2017-06-19 13:24:58 +01:00
David Baker
448e33bb65 v0.11.2 2017-06-19 13:20:45 +01:00
David Baker
88950f29c5 Prepare changelog for v0.11.2 2017-06-19 13:20:44 +01:00
David Baker
3e279746d5 v0.11.2 2017-06-19 13:19:09 +01:00
David Baker
f420a18696 Released js-sdk & react-sdk 2017-06-19 13:12:40 +01:00
Richard Lewis
db70272902 Fix custom widget form styling 2017-06-19 12:05:57 +01:00
Michael Telatynski
78068bfaa0 explicit convert to nativeImage to stabilise on Windows 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-19 11:58:44 +01:00
David Baker
578fa1c160 Merge pull request #4354 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-19 11:40:17 +01:00
David Baker
c9715e02d9 Merge remote-tracking branch 'weblate/develop' into develop 2017-06-19 11:39:59 +01:00
David Baker
9f7cf463b9 Merge pull request #4354 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-19 11:38:55 +01:00
Weblate
9eca0d2fde Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 10:38:05 +00:00
Nathan van Beelen
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
David Baker
07103431a9 Merge remote-tracking branch 'weblate/develop' into develop 2017-06-19 11:37:55 +01:00
Richard Lewis
3588ce7bc5 Fix app tile styling 2017-06-19 11:35:20 +01:00
Matthew Hodgson
6e64dd32c8 add register button 2017-06-19 11:33:44 +01:00
Matthew Hodgson
e3a63c3a6d fix broken vars 2017-06-19 11:33:36 +01:00
Matthew Hodgson
79816c5726 fix broken http status i18n 2017-06-19 11:33:12 +01:00
Matthew Hodgson
c55d292840 add new languages 2017-06-19 11:32:49 +01:00
Matthew Hodgson
0da4834360 Merge pull request #4346 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-19 11:32:28 +01:00
Matthew Hodgson
adbe5c71b7 Merge pull request #4337 from vector-im/t3chguy/fix_forwarding 
change dispatcher forward_event signature
 2017-06-19 11:31:17 +01:00
Matthew Hodgson
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
Richard van der Hoff
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
Richard van der Hoff
563d1dc3f1 Merge pull request #4335 from vector-im/rav/fix_token_redirect 
onLoadCompleted is now onTokenLoginCompleted
 2017-06-19 09:06:17 +01:00
Richard van der Hoff
5a8a41ad50 Merge branch 'develop' into rav/fix_token_redirect 2017-06-19 09:05:19 +01:00
Richard van der Hoff
60be24c665 Rename promise 2017-06-19 09:04:24 +01:00
Weblate
4a968cd34f Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 08:02:30 +00:00
Richard van der Hoff
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
Weblate
bd1b06c9b4 Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 07:57:09 +00:00
Richard van der Hoff
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
Richard van der Hoff
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
Weblate
7cbfa228ee Merge remote-tracking branch 'origin/develop' into develop 2017-06-18 23:54:13 +00:00
Matthew Hodgson
1c82b7b0c3 add register button 2017-06-19 00:54:07 +01:00
Raul
b7368fa933 Translated using Weblate (Esperanto) 
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/eo/
 2017-06-18 23:30:50 +00:00
Weblate
ecf163d4e7 Merge remote-tracking branch 'origin/develop' into develop 2017-06-18 23:01:19 +00:00
Raul
1a72d3134c Translated using Weblate (Esperanto) 
Currently translated at 90.0% (180 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
 2017-06-18 23:01:18 +00:00
Matthew Hodgson
612cad5d9e fix broken vars 2017-06-19 00:01:11 +01:00
Weblate
9b1b5b3a4b Merge remote-tracking branch 'origin/develop' into develop 2017-06-18 22:54:37 +00:00
Matthew Hodgson
6b1ffaff7a fix broken http status i18n 2017-06-18 23:54:29 +01:00
Weblate
ffa24eac84 Merge remote-tracking branch 'origin/develop' into develop 2017-06-18 22:50:33 +00:00
Raul
82eb69324d Translated using Weblate (Esperanto) 
Currently translated at 88.0% (176 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
 2017-06-18 22:50:33 +00:00
Matthew Hodgson
eaf61526fb add new languages 2017-06-18 23:50:27 +01:00
Weblate
47906d23f0 Merge remote-tracking branch 'origin/develop' into develop 2017-06-18 22:49:23 +00:00
Raul
2fa05f8d61 Translated using Weblate (Esperanto) 
Currently translated at 87.0% (174 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
 2017-06-18 22:49:23 +00:00
Matthew Hodgson
6bee3f22da Merge pull request #4346 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-18 23:49:20 +01:00
Weblate
396ecf6570 Merge remote-tracking branch 'origin/develop' into develop 2017-06-18 22:45:15 +00:00
Raul
f9ef5e8498 Translated using Weblate (Esperanto) 
Currently translated at 84.0% (168 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
 2017-06-18 22:45:15 +00:00