Marcel
8935e9706e
Change variable name as mentioned by t3chguy
2017-05-27 21:21:23 +02:00
Marcel
a30110b5d3
Fix vector-im/riot-web#4042
2017-05-27 21:11:00 +02:00
Matthew Hodgson
3703306a9e
oops
2017-05-27 18:35:18 +01:00
Matthew Hodgson
3302fc690f
fix all missing translations picked up by check-i18n.pl
2017-05-27 18:20:44 +01:00
David Baker
62ffe929e4
Translate Add Threepid labels
2017-05-26 18:03:24 +01:00
David Baker
23fbce66a2
Translate 'email' threepid label
2017-05-26 17:56:51 +01:00
David Baker
c22978d033
Merge remote-tracking branch 'origin/develop' into dbkr/translations
2017-05-26 17:30:02 +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
e3e848d09e
Fix missing full stop on translation key
2017-05-26 13:19:46 +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
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
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
5c359e63ab
Bulk change counterpart imports
...
to use languageHandler wrapper func
2017-05-25 11:39:08 +01:00
David Baker
b677a2002f
Minimal UI fixes
...
Add a label. Make css selector match style. Also fix import.
2017-05-24 14:36:14 +01:00
David Baker
aef068b00e
Indenting
2017-05-24 14:28:30 +01:00
David Baker
f412552c2c
Fix imports/exports
2017-05-23 18:32:45 +01:00
David Baker
d419c42a4f
Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801
2017-05-23 15:16:31 +01:00
David Baker
46bb29a3af
Merge pull request #910 from matrix-org/t3chguy/version_anchor_newtab
...
Make the linked versions open a new tab, turt2live complained :P
2017-05-23 13:51:40 +01:00
Michael Telatynski
a10c2faac1
lets not open an attack vector :)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-23 13:12:21 +01:00
Richard van der Hoff
fc08dc33c6
Group e2e keys into blocks of 4 characters
...
Hopefully this will make them a bit easier to compare.
2017-05-22 12:01:09 +01:00
Maxwell Kepler
008cc95e9c
Add 12 hour support
2017-05-19 22:29:49 +01:00
Michael Telatynski
cc3673d2d2
Make the linked versions open a new tab, turt2live complained :P
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 17:39:21 +01:00
Matthew Hodgson
317e24852d
explicitly label email & phone add sections; fixes https://github.com/vector-im/riot-web/issues/3531
2017-05-15 03:03:17 +01:00
Michael Telatynski
6ec799a028
I broke UserSettings for webpack-dev-server
...
where version file doesn't exist, version starts as null
then gets set to undefined by the promise
this wasn't handled and now undefined is understood to be unknown
rather than null
also picked up on a small casing error
threePids vs threepids, most things using the latter apart from the init
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 15:04:20 +01:00
Michael Telatynski
3c6e301f7f
Improve regex to ignore trailing -dirty and for rc tags
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-04 16:22:39 +01:00
Michael Telatynski
2edfc3e598
remove commented out code as per review
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-04 15:51:31 +01:00
Michael Telatynski
cb478f1194
no idea why those got in there...
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-04 15:50:52 +01:00
Michael Telatynski
74b2c86f93
tidy up UserSettings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-02 21:17:12 +01:00
Michael Telatynski
76e98d4267
improve version hyperlinking
...
removed redundant v prefix (key already says version)
links to most applicable version/tag
tag-commit -> commit
commit1-commit2-commit3 -> commit1
(v)x.y.z -> tag<x.y.z>
commit -> commit
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-02 21:12:58 +01:00
Matthew Hodgson
a2be764681
display err.message to user if available in error msgs
2017-04-23 01:48:27 +01:00
Matthew Hodgson
e18e965eb8
missing key attr
2017-04-22 16:26:39 +01:00
Matthew Hodgson
6c177bc617
Merge pull request #806 from t3chguy/t3chguy/show_access_token
...
Show Access Token under Advanced in Settings
2017-04-22 02:51:54 +01:00
Matthew Hodgson
ad76dd0dd1
Merge pull request #810 from t3chguy/t3chguy/settings_versions_improvements
...
Link tags/commit hashes in the UserSettings version section
2017-04-22 02:38:30 +01:00
Matthew Hodgson
872d0e0f50
Merge branch 'develop' into travis/hide-read-receipts
2017-04-22 01:36:38 +01:00
turt2live
64e416e117
Add option to not send typing notifications
...
Addresses vector-im/riot-web#3220
Fix applies to both the RTE and plain editor.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-21 14:50:26 -06:00
turt2live
e4c4adc517
Add option to hide other people's read receipts.
...
Addresses vector-im/riot-web#2526
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-21 14:28:28 -06:00
Michael Telatynski
bbd1f34336
Prepend REACT_SDK_VERSION with a v to match riot-web version output
...
Add simple helper to construct version/commit hash urls
var -> let/const and prepend olmVersionString with v for same reason
for both matrix-react-sdk and riot-web, if unknown/local don't do anything
else try to create a link to the commit hash/tag name
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 03:04:34 +01:00
Michael Telatynski
61071b89df
Show Access Token under Advanced in Settings
...
behind a Spoiler, onClick = spoil+select
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-18 19:55:08 +01:00
David Baker
d4dc16545a
Fix people section vanishing on 'clear cache'
...
Stop the client first
Fixes https://github.com/vector-im/riot-web/issues/3610
2017-04-11 18:16:29 +01:00
David Baker
811cd79206
Make the clear cache button work on desktop
...
Fixes https://github.com/vector-im/riot-web/issues/3597
2017-04-10 17:39:27 +01:00
Matthew Hodgson
6dbb4e9002
fix the warning shown to users about needing to export e2e keys
...
apparently when we added the buttons to export e2e keys to the Logout button, we didn't change the text warning the user that e2e export was coming soon. likewise when changing password and forgetting password (where we didn't even have a button to export keys)
2017-04-07 23:34:11 +01:00
David Baker
5e3b991ec2
PR feedback fixes
2017-03-24 10:45:38 +00:00
David Baker
4cd24d15d4
Factor out AddPhoneNumber to a separate component
2017-03-22 15:18:27 +00:00
David Baker
6a37fc4325
Comment typos
2017-03-22 12:00:16 +00:00
David Baker
d5f7b3983b
Merge remote-tracking branch 'origin/develop' into dbkr/add_msisdn
2017-03-21 13:44:55 +00:00
David Baker
92d5f55a46
Merge remote-tracking branch 'origin/develop' into dbkr/threepid_display
2017-03-17 13:55:07 +00:00
David Baker
b06111202d
Display threepids slightly prettier
...
ie. Put a + on the front of msisdns.
2017-03-16 15:16:24 +00:00
David Baker
af8c3edba6
Support adding phone numbers in UserSettings
2017-03-16 14:56:26 +00:00