f52035f3cd
Set state from dispatch payload unconditionally
...
As apparently doing it confitionally is bad
2017-06-02 13:41:41 +01:00
03f4f269ce
Propagate room join errors to the UI
...
Dispatch so we can set the state in RoomViewStore. Show the error
when the room join fails (unsure if it's better to do this from
the component or the store). Remove unused joinError from roomview.
2017-06-02 11:53:10 +01:00
d81160d52f
Merge pull request #995 from matrix-org/luke/new-guest-access-fix-wrong-room-shown
...
Fix to show the correct room
2017-06-02 09:50:50 +01:00
7808994b71
Modify RVS test to wait until room loaded
...
This allows for the alias resolution to occur before a join is attempted. In theory, join_room could in future do an optional view_room-esque thing before attemping a join which would be less fragile than dispatching things in the right order.
Also, make sure the store indicates that it is not loading when a room ID has been used - no alias resolution need take place.
2017-06-02 09:22:48 +01:00
16c4c14a16
Fix to show the correct room
2017-06-01 18:01:30 +01:00
8192374481
Add missing _t import
2017-05-31 16:02:42 +01:00
7abaadddde
Merge pull request #977 from matrix-org/luke/session-store-null-on-logout
...
Remove cachedPassword from localStorage on_logged_out
2017-05-31 16:00:24 +01:00
b3a862c2c2
Remove redundant `reset`
2017-05-31 15:32:55 +01:00
d0e270bd1c
Only re-render LoggedInView if MatrixClientPeg.get() is truthy
2017-05-31 15:15:27 +01:00
d83f18ab46
Remove cachedPassword from localStorage on_logged_out
...
Fixes https://github.com/vector-im/riot-web/issues/4101
2017-05-31 10:03:16 +01:00
c15568e003
remove spurious string
2017-05-30 21:05:26 +01:00
e30e45a82c
Merge branch 'develop' into new-guest-access
2017-05-30 21:05:07 +01:00
48a2ad93da
fix {integrationsUrl} thinko
2017-05-30 20:32:12 +01:00
d74de136d6
Merge pull request #970 from RiotTranslate/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-05-30 20:18:55 +01:00
a9d2a950a8
Merge pull request #971 from turt2live/travis/12hr-hotfixes
...
Support 12hr time in full date
2017-05-30 20:15:39 +01:00
583fdfbb9f
Support 12hr time in full date
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-30 13:12:27 -06:00
4228b23913
Translated using Weblate (German)
...
Currently translated at 100.0% (765 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 18:58:37 +00:00
e97a48d224
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 90.8% (695 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-05-30 18:42:53 +00:00
0b23858ae7
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 89.6% (686 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/pt_BR/
2017-05-30 18:27:14 +00:00
e0ba5f0e1a
Translated using Weblate (German)
...
Currently translated at 99.8% (764 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 18:27:13 +00:00
9f5f351d22
Translated using Weblate (French)
...
Currently translated at 91.6% (701 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 18:27:13 +00:00
5b31390435
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 17:16:36 +00:00
1f8dea6346
Translated using Weblate (German)
...
Currently translated at 99.8% (764 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 17:16:36 +00:00
63e9a22168
Translated using Weblate (French)
...
Currently translated at 88.7% (679 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-30 17:16:36 +00:00
5781275392
Merge pull request #968 from matrix-org/kegan/translation-mcguffin
...
Add _tJsx()
2017-05-30 18:13:27 +01:00
bf406bfcf6
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 17:10:00 +00:00
3261f5777a
Update from Weblate. ( #966 )
...
* Translated using Weblate (German)
Currently translated at 95.4% (727 of 762 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 96.5% (736 of 762 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 96.3% (737 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 97.9% (749 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 98.0% (750 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 98.1% (751 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.2% (759 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.3% (760 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.4% (761 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
* Translated using Weblate (German)
Currently translated at 99.6% (762 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 18:09:17 +01:00
b6f831559e
Translated using Weblate (German)
...
Currently translated at 99.6% (762 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 17:04:27 +00:00
c72ec5d3c7
Translated using Weblate (German)
...
Currently translated at 99.4% (761 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 17:01:37 +00:00
14bf45ffb6
Translated using Weblate (German)
...
Currently translated at 99.3% (760 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 17:00:11 +00:00
6c0a142e60
Translated using Weblate (German)
...
Currently translated at 99.2% (759 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 16:58:56 +00:00
63a998ceb7
Allow span...
2017-05-30 17:37:13 +01:00
b958ed51c2
Translated using Weblate (German)
...
Currently translated at 98.1% (751 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 16:36:52 +00:00
3c98b57a18
Translated using Weblate (German)
...
Currently translated at 98.0% (750 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 16:35:12 +00:00
0e262e70f3
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 16:28:57 +00:00
9975514850
Merge pull request #969 from turt2live/travis/12h-ts-collision
...
Remove space between time and AM/PM
2017-05-30 17:23:04 +01:00
b09c673c6b
Translated using Weblate (German)
...
Currently translated at 97.9% (749 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 15:50:50 +00:00
d446410bdf
Remove space between time and AM/PM
...
Part of addressing vector-im/riot-web#4046
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-30 09:31:16 -06:00
1d67358525
Make it work with multiple regexps
2017-05-30 16:17:42 +01:00
32ec5ec905
Translated using Weblate (German)
...
Currently translated at 96.3% (737 of 765 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 15:14:29 +00:00
b51f5ac6d1
Merge branch 'new-guest-access' of github.com:matrix-org/matrix-react-sdk into new-guest-access
2017-05-30 16:11:11 +01:00
6f8d5b1db3
Remove spurious reference to `otherTagNames`
2017-05-30 16:10:19 +01:00
8a1f9ca38f
Merge remote-tracking branch 'origin/develop' into develop
2017-05-30 15:04:28 +00:00
8ee377b119
Translated using Weblate (German)
...
Currently translated at 96.5% (736 of 762 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 15:04:25 +00:00
0b7f947d8e
Merge pull request #948 from matrix-org/t3chguy/piwik
...
Piwik Analytics
2017-05-30 15:59:03 +01:00
93a35dc07a
Merge branch 'develop' into t3chguy/piwik
2017-05-30 15:58:55 +01:00
5a51da4196
Translated using Weblate (German)
...
Currently translated at 95.4% (727 of 762 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-30 14:55:36 +00:00
bb030dabc4
Add _tJsx()
2017-05-30 15:55:21 +01:00
90c2fc01d2
Merge pull request #964 from matrix-org/luke/start-url
...
Add /start to show the setMxId above HomePage
2017-05-30 15:45:43 +01:00
70e7d81093
More i18n strings ( #963 )
...
* Add i18n for E2E import and Export Dialogs
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add various previous missing i18n strings
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Translate CreateRoomButton
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ChatInviteDialog and fix missing to.
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ConfitmRedactDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeactivateAccountDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeviceVerifyDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add SessionRestoreErrorDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add SetDisplayNameDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UnknownDeviceDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add AddressTile translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeviceVerifyButtons translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add Dropdown translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UserSelector translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CaptchaForm translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CasLogin translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CustomServerDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add InteractiveAuthEntryComponents translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add LoginFooter translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add RegistrationForm translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ServerConfig translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MAudioBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MImageBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MVideoBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add TextualBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UnknownBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UrlPreviewSettings translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add AuxPanel translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add PresenceLabel translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* fix syntax error
* weird space :P
* missing ','
* fix missing value
* fix json fail
* remove acidential added file
* fix another json fail
2017-05-30 15:09:57 +01:00
David Baker