Matthew Hodgson
445a55c7ca
Merge pull request #3992 from vector-im/t3chguy/electron_call_sleep
...
Prevent Power Save when in call (Electron)
2017-05-26 18:44:53 +01:00
David Baker
d313f4c7b6
Merge https://github.com/MTRNord/riot-web/pull/70/
2017-05-26 18:44:08 +01:00
Luke Barnard
aa604612a7
Add "Login" button to RHS when user is a guest
2017-05-26 18:42:07 +01:00
David Baker
5e0457c32d
Merge pull request #4035 from vector-im/dbkr/translations
...
Translations!
2017-05-26 18:39:07 +01:00
David Baker
f4184bc695
Merge pull request #934 from matrix-org/dbkr/translations
...
Translations!
2017-05-26 18:38:04 +01:00
Thomas Lant
8f083a5fdd
Welcome page + too much bootstrap stuff for now
2017-05-26 17:23:34 +00:00
Matthew Hodgson
9156a871f5
Merge pull request #3961 from Kieran-Gould/kieran-gould/12hourtimestamp
...
Kieran gould/12hourtimestamp
2017-05-26 18:23:11 +01:00
Matthew Hodgson
e26422ef10
fix a typo
2017-05-26 18:22:53 +01:00
David Baker
647c1b6169
Once more, with braces
2017-05-26 18:19:32 +01:00
David Baker
97aeb57a8b
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 18:15:32 +01:00
Luke Barnard
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
David Baker
62ffe929e4
Translate Add Threepid labels
2017-05-26 18:03:24 +01:00
David Baker
cf0073a631
Missing translations in User Interface section
2017-05-26 17:59:19 +01:00
David Baker
23fbce66a2
Translate 'email' threepid label
2017-05-26 17:56:51 +01:00
David Baker
40680d55e0
Fix merge fail
2017-05-26 17:55:48 +01:00
Matthew Hodgson
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
Matthew Hodgson
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
David Baker
c22978d033
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 17:30:02 +01:00
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
David Baker
d3875ec794
Oops, include file extension in language list
2017-05-26 17:11:11 +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
David Baker
4fcaccbc7f
Merge https://github.com/MTRNord/riot-web/pull/69
2017-05-26 16:56:49 +01:00
Matthew Hodgson
fde553a809
Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp
...
Kierangould/12hourtimestamp
2017-05-26 16:52:09 +01:00
David Baker
6c3c4fc547
Language generation and file structure
...
* Move language files to strings/ subdir to be consistent with
react-sdk
* Only copy static list of languages (to avoid including
languages that are only a few percent translated)
* Make copy-res script work with watch mode
* Other general cleanups like only write each language file once,
rather than n times.
2017-05-26 16:48:21 +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
e07f9a8bc9
Pass through i18n keys in karma tests
2017-05-26 15:29:58 +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
Richard van der Hoff
0db118f766
Merge pull request #4033 from vector-im/dbkr/dont_put_src_in_resolve_root
...
Don't include src in the test resolve root
2017-05-26 14:09:17 +01:00
David Baker
0ab9486829
Merge branch 'dbkr/dont_put_src_in_resolve_root' into dbkr/translations
2017-05-26 14:02:44 +01:00
David Baker
9c7731e141
Don't include src in the test resolve root
...
As https://github.com/matrix-org/matrix-react-sdk/pull/931
2017-05-26 14:02:03 +01:00
David Baker
ee2a49ad41
Punctuation in translation strings
2017-05-26 13:46:01 +01:00
David Baker
8ad189c79d
Remove unused _t import
2017-05-26 13:45:46 +01:00
David Baker
92579cf463
Array literal
2017-05-26 13:36:58 +01:00
David Baker
d688eade43
Remove commented use strict
...
It's even less use in a comment
2017-05-26 13:34:18 +01:00
David Baker
82b2741ed9
Move english custom server text to en file
...
As it is in English and not German
2017-05-26 13:33:00 +01:00
David Baker
810fb42458
Fix indenting
2017-05-26 13:25:46 +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
David Baker
5356eab159
Correct docs
...
Change array.push guideline to not using _t at class-load time
which was probably the actual problem. Update guidelines to
include punctuation.
2017-05-26 13:16:36 +01:00
Luke Barnard
28094a9a66
Show "Something went wrong!" when errcode undefined
2017-05-26 13:13:57 +01:00
David Baker
bde501a9ce
Languages on config file is no longer a thing
2017-05-26 13:10: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
