Luke Barnard
ac44151e2a
Put the reset method in the right scope...
2017-05-26 17:27:31 +01:00
Luke Barnard
9311b9012a
Use the same .reset as RoomViewStore
2017-05-26 17:23:02 +01:00
Matthew Hodgson
3d688a6ada
Merge pull request #933 from matrix-org/luke/new-guest-access-set-display-name-to-useridlocalpart
...
Set the displayname to the mxid once PWLU
2017-05-26 17:17:23 +01:00
David Baker
84cef00f1f
Mismatched oneUser / severalUsers
2017-05-26 17:16:23 +01:00
Matthew Hodgson
1c7785535f
Merge pull request #929 from matrix-org/luke/new-guest-access-fix-view-next-room
...
Fix view_next_room, view_previous_room and view_indexed_room
2017-05-26 17:09:35 +01:00
Matthew Hodgson
fbc3f83625
Merge pull request #928 from matrix-org/luke/new-guest-access-inidicate-joining-early
...
Use RVS to indicate "joining" when setting a mxid
2017-05-26 17:08:34 +01:00
Matthew Hodgson
fde553a809
Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp
...
Kierangould/12hourtimestamp
2017-05-26 16:52:09 +01:00
Luke Barnard
9f902c1190
Merge pull request #932 from matrix-org/luke/new-guest-access-no-notif-bar-if-is-guest
...
Don't show notif nag bar if guest
2017-05-26 16:42:12 +01:00
David Baker
0f8e560247
Add function to display i18n keys in UI
...
Avoids having to load translations in riot-web tests
2017-05-26 15:29:11 +01:00
David Baker
e3e848d09e
Fix missing full stop on translation key
2017-05-26 13:19:46 +01:00
Luke Barnard
5e136863b0
Block user settings with view_set_mxid
2017-05-26 13:18:44 +01:00
Luke Barnard
28094a9a66
Show "Something went wrong!" when errcode undefined
2017-05-26 13:13:57 +01:00
David Baker
bb344740dd
Add test languages file
2017-05-26 13:09:29 +01:00
David Baker
0de0b8954d
Trailing whitespace
2017-05-26 12:03:36 +01:00
David Baker
e44f3cc709
Fix tests
...
* Serve translation files from the karma server
* Port UserSettingsStore to ES6 exports because the test runner
gets confused by ES6 importing a commonjs module
* Remove extra spaces in translations strings for MELS
* Fix 'his/her' back to be 'their'
* Change test to expect singular 'invitation' for a single person
(there may be multiple invitations, but IMO this should be
'rejected n invitations' and we can play with the wording later,
I don't think the singular is any worse than the plural).
* set language in the MELS tests (and wait for it to complete)
* Don't bother setting lang in other tests for now
2017-05-26 11:58:45 +01:00
Luke Barnard
ad3373789f
Warn about LifecycleStore not explicitly being used
2017-05-26 11:50:32 +01:00
Luke Barnard
2400efa92b
Correct LifecycleStore docs
2017-05-26 11:48:38 +01:00
Luke Barnard
c0f43a14fd
Improve comment
2017-05-26 11:47:55 +01:00
Luke Barnard
2dcc03960a
Set the displayname to the mxid once PWLU
2017-05-26 11:46:33 +01:00
Luke Barnard
b5b157a0fb
Don't show notif nag bar if guest
2017-05-26 10:34:36 +01:00
Richard van der Hoff
72b1f03238
Merge pull request #931 from matrix-org/dbkr/dont_put_src_in_resolve_root
...
Don't include src in the test resolve root
2017-05-25 23:29:47 +01:00
David Baker
dfc8cf3f54
Merge branch 'dbkr/dont_put_src_in_resolve_root' into dbkr/translations
2017-05-25 23:16:39 +01:00
David Baker
ba8e37a84e
Don't include src in the test resolve root
...
Don't include src in resolve root for the karma test, as otherwise
modules from react sdk get pulled in instead of npm libraries like
'extend' which breaks everything in really subtle ways.
2017-05-25 23:13:49 +01:00
David Baker
2d6bf5fa91
Remove messages with HTML formatting
...
The translations strings are not HTML and it gets escaped.
2017-05-25 20:04:28 +01:00
David Baker
ab92cc2254
Question marks do not internationalise
2017-05-25 19:55:54 +01:00
David Baker
e7fbf889fa
Make current language more accurate
...
Make it reflect reality if it's been taken from the browser langs
by just getting what was saet in counterpart rather than the saved
setting.
Also fix style.
2017-05-25 19:53:27 +01:00
David Baker
be4944a4b6
Hopefully get translations with '.'s sorted
...
attempt 2
2017-05-25 19:43:34 +01:00
David Baker
dac6a3360b
Oops, don't change these reason strings.
2017-05-25 19:25:06 +01:00
David Baker
43d8ccf128
Hopefully sort out strings with appended '.'s
2017-05-25 19:21:18 +01:00
David Baker
c3c2916449
Use array literals
2017-05-25 18:26:42 +01:00
David Baker
6c41be3c14
Missed OKs
2017-05-25 18:23:15 +01:00
David Baker
443ab1add7
Put back default strings on dialogs
...
But make them work by calling _t in render rather than
getDefaultProps().
Also sort out some 'Warning!' strings
2017-05-25 18:20:48 +01:00
David Baker
9112fc231a
More translation string fixups
2017-05-25 17:35:18 +01:00
David Baker
6d67655f66
Add german for Change password
2017-05-25 17:22:04 +01:00
David Baker
85756c78b4
Change to object literal
2017-05-25 17:17:37 +01:00
Luke Barnard
263a51938d
Reset store state when logging out
...
This prevents leaking of state that we do not want to share with the next user
2017-05-25 17:16:16 +01:00
Luke Barnard
0849b0e205
Fix view_next_room, view_previous_room and view_indexed_room
...
These must now make a dispatch to RoomViewStore instead of calling `viewRoom` directly on MatrixChat. This will call both `viewRoom` of MatrixChat _and_ the logic in RVS so there is some redundancy here. It'd be best to move as much as possible of viewRoom out to the RVS itself.
But for now, this fixes a bug that occures when leaving (the viewed room would not change).
2017-05-25 17:10:49 +01:00
Luke Barnard
91edc06441
Use RVS to indicate "joining" when setting a mxid
...
This prevents RoomView from doing any peeking whilst the join/registration is in progress, causing weirdness with TimelinePanel getPendingEventList (which throws an error if called when peeking).
2017-05-25 17:04:42 +01:00
David Baker
feef7d49e9
More tabs
2017-05-25 16:55:24 +01:00
David Baker
3a379d09de
Update translations
...
Actually translate the language dropdown label & add the string.
Remove some unused ones.
2017-05-25 16:52:15 +01:00
David Baker
39dbc4c6e1
Lots of changes to languageHandler
...
* Replace callbacks with promises
* Move plain functions to top level
* De-duplicate bits that fetched languages.json
* Take full language preference list from the browser if we
can get it, rather than just the first.
2017-05-25 16:45:32 +01:00
Luke Barnard
6218a8615a
Merge pull request #927 from matrix-org/luke/new-guest-access-not-new-password
...
Show "Password" instead of "New Password"
2017-05-25 15:35:56 +01:00
Luke Barnard
11799b4c71
Show "Password" instead of "New Password" when the existing password has been cached
2017-05-25 15:27:54 +01:00
Luke Barnard
0707b7440a
Merge branch 'new-guest-access' of github.com:matrix-org/matrix-react-sdk into new-guest-access
2017-05-25 15:20:22 +01:00
Luke Barnard
ce17df0883
Unbreak the roomlist
2017-05-25 15:20:02 +01:00
Luke Barnard
1214b01330
Merge pull request #926 from matrix-org/luke/new-guest-access-set-mxid-warm-fuzzy-revert
...
Remove warm-fuzzy after setting mxid
2017-05-25 15:16:52 +01:00
Luke Barnard
09c5b2f3d5
Merge pull request #925 from matrix-org/luke/new-guest-access-fix-team-server-no-config
...
Allow teamServerConfig to be missing
2017-05-25 15:07:54 +01:00
Luke Barnard
2265b59287
Remove warm-fuzzy after setting mxid
2017-05-25 14:54:28 +01:00
Luke Barnard
51c8ee6db2
Allow teamServerConfig to be missing
2017-05-25 14:38:12 +01:00
David Baker
c54a24c49a
Merge pull request #923 from matrix-org/luke/remove-guest-warning-bar
...
Remove GuestWarningBar
2017-05-25 14:30:10 +01:00
