e5ef9f3e3a
Merge pull request #918 from matrix-org/t3chguy/electron_call_sleep
...
pass call state through dispatcher, for poor electron
2017-05-26 19:09:10 +01:00
cddfe7e6ef
Fix inconsistent quoting in topic messages
2017-05-26 19:00:44 +01:00
563b85ceb8
Merge https://github.com/MTRNord/matrix-react-sdk/pull/115
2017-05-26 18:53:23 +01:00
fd27d6dab1
Merge pull request #936 from matrix-org/luke/new-guest-access-need-to-set-mx-id-beore-user-settings
...
Block user settings with view_set_mxid
2017-05-26 18:48:55 +01:00
f4184bc695
Merge pull request #934 from matrix-org/dbkr/translations
...
Translations!
2017-05-26 18:38:04 +01:00
647c1b6169
Once more, with braces
2017-05-26 18:19:32 +01:00
97aeb57a8b
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 18:15:32 +01:00
276d3cad9c
Merge pull request #906 from matrix-org/luke/revert-login-username-prefix-suffix
...
Remove suffix and prefix from login input username
2017-05-26 18:07:10 +01:00
62ffe929e4
Translate Add Threepid labels
2017-05-26 18:03:24 +01:00
cf0073a631
Missing translations in User Interface section
2017-05-26 17:59:19 +01:00
23fbce66a2
Translate 'email' threepid label
2017-05-26 17:56:51 +01:00
40680d55e0
Fix merge fail
2017-05-26 17:55:48 +01:00
ed79a3adef
Merge pull request #935 from matrix-org/luke/new-guest-access-no-barf-on-username-check-err
...
Show "Something went wrong!" when errcode undefined
2017-05-26 17:47:52 +01:00
44f479c38b
Merge pull request #930 from matrix-org/luke/new-guest-access-reset-stores-on-logged-out
...
Reset store state when logging out
2017-05-26 17:45:32 +01:00
c22978d033
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 17:30:02 +01:00
ac44151e2a
Put the reset method in the right scope...
2017-05-26 17:27:31 +01:00
9311b9012a
Use the same `.reset` as RoomViewStore
2017-05-26 17:23:02 +01:00
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
84cef00f1f
Mismatched oneUser / severalUsers
2017-05-26 17:16:23 +01:00
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
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
fde553a809
Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp
...
Kierangould/12hourtimestamp
2017-05-26 16:52:09 +01:00
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
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
e3e848d09e
Fix missing full stop on translation key
2017-05-26 13:19:46 +01:00
5e136863b0
Block user settings with view_set_mxid
2017-05-26 13:18:44 +01:00
28094a9a66
Show "Something went wrong!" when errcode undefined
2017-05-26 13:13:57 +01:00
bb344740dd
Add test languages file
2017-05-26 13:09:29 +01:00
0de0b8954d
Trailing whitespace
2017-05-26 12:03:36 +01:00
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
ad3373789f
Warn about LifecycleStore not explicitly being used
2017-05-26 11:50:32 +01:00
2400efa92b
Correct LifecycleStore docs
2017-05-26 11:48:38 +01:00
c0f43a14fd
Improve comment
2017-05-26 11:47:55 +01:00
2dcc03960a
Set the displayname to the mxid once PWLU
2017-05-26 11:46:33 +01:00
b5b157a0fb
Don't show notif nag bar if guest
2017-05-26 10:34:36 +01:00
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
dfc8cf3f54
Merge branch 'dbkr/dont_put_src_in_resolve_root' into dbkr/translations
2017-05-25 23:16:39 +01:00
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
2d6bf5fa91
Remove messages with HTML formatting
...
The translations strings are not HTML and it gets escaped.
2017-05-25 20:04:28 +01:00
ab92cc2254
Question marks do not internationalise
2017-05-25 19:55:54 +01:00
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
be4944a4b6
Hopefully get translations with '.'s sorted
...
attempt 2
2017-05-25 19:43:34 +01:00
dac6a3360b
Oops, don't change these reason strings.
2017-05-25 19:25:06 +01:00
43d8ccf128
Hopefully sort out strings with appended '.'s
2017-05-25 19:21:18 +01:00
c3c2916449
Use array literals
2017-05-25 18:26:42 +01:00
6c41be3c14
Missed OKs
2017-05-25 18:23:15 +01:00
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
9112fc231a
More translation string fixups
2017-05-25 17:35:18 +01:00
6d67655f66
Add german for Change password
2017-05-25 17:22:04 +01:00
85756c78b4
Change to object literal
2017-05-25 17:17:37 +01:00
Matthew Hodgson