Commit Graph

4981 Commits (03ba3bd43148511f4f3c9c0289c3afe7431f127c)

Author SHA1 Message Date
Robert Swain 03ba3bd431 Merge branch 'rxl881/apps' into rob/apps 2017-06-13 15:41:52 +02:00
Robert Swain 91eabbba60 MessageComposer: Trigger Jitsi app from call buttons 2017-06-13 15:35:13 +02:00
Robert Swain 5d898dd098 AuxPanel: Add type checking for userId and showApps properties 2017-06-13 15:34:05 +02:00
Robert Swain b63edcb390 AppTile: Support deletion of apps from room state 2017-06-13 15:33:17 +02:00
Robert Swain bcb2f8408b AppTile: Fix typo in property name 2017-06-13 15:32:40 +02:00
Robert Swain 2aa0aa61e3 AddAppDialog: Support adding apps to room state 2017-06-13 15:31:37 +02:00
Robert Swain a72cb794f2 AppsDrawer: Populate apps from room state 2017-06-13 15:28:37 +02:00
Robert Swain e2759774fc RoomView: Correctly pass userId from matrix client
It isn't set in the state anywhere.
2017-06-13 15:19:38 +02:00
Robert Swain 99b1de7f0e RoomView: Display AppsDrawer if apps in room state 2017-06-13 15:19:06 +02:00
Richard Lewis 876899948f Merge in upstream changes 2017-06-13 11:44:23 +01:00
Richard Lewis 2da30137ec Fix import path and add LG widget 2017-06-13 10:31:16 +01:00
David Baker aef0a8025c v0.9.3 2017-06-12 15:50:37 +01:00
David Baker a389d5a3c4 Prepare changelog for v0.9.3 2017-06-12 15:50:36 +01:00
Riot Translate Bot f98c491fdd Update from Weblate. (#1073)
* Translated using Weblate (German)

Currently translated at 93.4% (842 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Russian)

Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/

* Added translation using Weblate (Arabic)

* Translated using Weblate (Greek)

Currently translated at 42.2% (381 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/el/

* Translated using Weblate (English (United States))

Currently translated at 91.8% (828 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/

* Translated using Weblate (Russian)

Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/

* Translated using Weblate (German)

Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (Hungarian)

Currently translated at 20.0% (181 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 38.9% (351 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/

* Translated using Weblate (Arabic)

Currently translated at 0.5% (5 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ar/

* remote entirely spurious translation progress stats :/
2017-06-12 15:38:03 +01:00
Matthew Hodgson 6afd895291 broken var 2017-06-12 15:36:41 +01:00
Matthew Hodgson 6133186583 fullstop fails 2017-06-12 15:36:24 +01:00
David Baker 29355a610f js-sdk 0.7.11 2017-06-12 15:19:52 +01:00
Richard Lewis b893887707 Fix merge conflict 2017-06-12 14:52:41 +01:00
Richard Lewis f9f924bbd6 Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps 2017-06-12 14:50:25 +01:00
David Baker 336b10daf1 v0.9.3-rc.2 2017-06-09 22:13:54 +01:00
David Baker 8bb26073be Prepare changelog for v0.9.3-rc.2 2017-06-09 22:13:53 +01:00
David Baker d6b85c9d4d Fix translations on conf call banner
* You can't substitute react elements into a text string
 * Substituting in undefined gives the string 'undefined', so
   initialise it to the empty string.
2017-06-09 22:06:43 +01:00
David Baker c61942ed5d We now require flux 2.1 because we use utils 2017-06-09 21:42:34 +01:00
David Baker 27592728f5 v0.9.3-rc.1 2017-06-09 20:28:09 +01:00
David Baker 345661ee2d Prepare changelog for v0.9.3-rc.1 2017-06-09 20:28:08 +01:00
David Baker 0879d796eb released js-sdk 2017-06-09 20:26:41 +01:00
David Baker 2df32dfabd Merge pull request #1069 from matrix-org/luke/fix-get-started-with-rb
When ChatCreateOrReuseDialog is cancelled by a guest, go home
2017-06-09 16:05:40 +01:00
David Baker 2b38f2a829 Merge pull request #1065 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-06-09 15:27:58 +01:00
Vladi 0b76b94063 Translated using Weblate (Russian)
Currently translated at 99.4% (896 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-09 14:14:39 +00:00
Szimszon 6126cce967 Translated using Weblate (Hungarian)
Currently translated at 19.4% (175 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/hu/
2017-06-09 14:14:39 +00:00
dtygel d6da5c6494 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-06-09 13:33:11 +00:00
Luke Barnard ecc8abbfc9 When ChatCreateOrReuseDialog is cancelled by a guest, go home 2017-06-09 13:46:45 +01:00
Krombel 0dc8e3adbd Translated using Weblate (German)
Currently translated at 100.0% (901 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-09 11:43:52 +00:00
Bamstam 0df1e9b9d8 Translated using Weblate (German)
Currently translated at 93.8% (846 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-09 11:16:40 +00:00
Bamstam 7f4368e2d1 Translated using Weblate (German)
Currently translated at 93.7% (845 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-09 11:16:30 +00:00
Bamstam b88c46a509 Translated using Weblate (German)
Currently translated at 93.5% (843 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-09 11:16:20 +00:00
Bamstam 65e4b70efe Translated using Weblate (German)
Currently translated at 93.5% (843 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-06-09 11:16:10 +00:00
RiotTranslate ce2d595195 Merge remote-tracking branch 'origin/develop' into develop 2017-06-09 10:07:21 +00:00
Jean GB 81a8c56636 Translated using Weblate (French)
Currently translated at 93.0% (838 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-09 10:07:20 +00:00
Robert Swain 9e0b476b72 Merge branch 'develop' into rob/apps 2017-06-09 12:06:44 +02:00
David Baker 924c08b143 Merge pull request #1067 from matrix-org/luke/fix-forgetting-last-room
Goto /home when forgetting the last room
2017-06-09 11:03:14 +01:00
David Baker ce88d5c1cf Merge pull request #1066 from matrix-org/luke/fix-go-home-when-settings-closed
Default to home page when settings is closed
2017-06-09 11:00:50 +01:00
Luke Barnard 19bb879fbf Handle only 1 room in the list 2017-06-09 10:54:42 +01:00
Luke Barnard c7229967a6 Goto /home when forgetting the last room 2017-06-09 10:28:45 +01:00
Luke Barnard a21b6e61a6 Default to home page when settings is closed
If the current room isn't set.
2017-06-09 10:08:26 +01:00
Jean GB 2a293ac571 Translated using Weblate (French)
Currently translated at 93.0% (838 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-06-09 08:14:05 +00:00
RiotTranslate 3f9c6a0f0f Merge remote-tracking branch 'origin/develop' into develop 2017-06-09 07:51:53 +00:00
Pitchaya Boonsarngsuk 5c21216e95 Translated using Weblate (Thai)
Currently translated at 66.0% (595 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/th/
2017-06-09 07:51:53 +00:00
Vladi c478631db4 Translated using Weblate (Russian)
Currently translated at 97.0% (874 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-06-09 07:51:52 +00:00
Dor Ben Dov 3b0906fc85 Translated using Weblate (Hebrew)
Currently translated at 2.1% (19 of 901 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/he/
2017-06-09 07:51:52 +00:00