Commit Graph

2614 Commits

Author SHA1 Message Date
Michael Telatynski 45cd80dedb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik 2017-05-27 20:59:35 +01:00
Michael Telatynski 98c2f9201b initial piwik stuff
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 20:47:09 +01: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
Matthew Hodgson 1eb7993aa7 Merge pull request #946 from matrix-org/t3chguy/fix_imports
import _t, drop two unused imports
2017-05-27 18:08:00 +01:00
Michael Telatynski 8524f5868c import _t, drop two unused imports
without this FilePanel would ever-load

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 17:59:11 +01:00
Matthew Hodgson 957aa0403d fix https://github.com/vector-im/riot-web/issues/4052 2017-05-27 16:03:07 +01:00
Matthew Hodgson 03194e66b3 actually wire up alwaysShowTimestamps 2017-05-27 00:14:16 +01:00
Matthew Hodgson 81704a5b5e s/username/User name/ 2017-05-27 00:13:16 +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 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 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
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 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 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 9fa6e8b1e2 Add us to copyright
As I've now added code to this file
2017-05-25 12:02:05 +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 c2df23395d Fix up language dropdown
* Read languages from the available ones rather than the config
 * Make the search work (add searchEnabled=true)
 * Move variables to the class since they were populated there
2017-05-24 11:25:06 +01:00
David Baker a95f3252b8 s/tabs/spaces/ 2017-05-24 10:48:10 +01:00
David Baker f412552c2c Fix imports/exports 2017-05-23 18:32:45 +01:00
David Baker cc0924f1c7 Fix imports 2017-05-23 18:16:02 +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
David Baker 6d30bc7182 Merge pull request #911 from matrix-org/t3chguy/autofocus_directorysearchbox
autoFocus input box
2017-05-23 09:57:20 +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
Richard van der Hoff 574b820d11 Factor out DeviceVerifyDialog 2017-05-22 11:12:36 +01:00
Michael Telatynski 02a1c1868c autoFocus input box
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-20 00:08:53 +01:00
Kieran Gould 47e5e8d678 Moved isTwelveHour alllll the way up to TimelinePanel. 2017-05-19 23:04:37 +01:00
Kieran Gould 6b32975e0c Add 12 hour class to mx_EventTile 2017-05-19 22:36:13 +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
Richard van der Hoff e3dbf057fb Fix 'missing page_type' error
LoggedInView will complain if it is instantiated without a page_type, so let's
keep showing the syncing spinner until we have one.
2017-05-19 14:09:20 +01:00
Richard van der Hoff c61294f71c Delintify some of MatrixChat (#907)
... it annoyed me too much.
2017-05-19 13:53:11 +01:00
Luke Barnard 2bec44a517 Remove suffix and prefix from login input username
This is an attempt reduce confusion when entering a custom home server: https://github.com/vector-im/riot-web/issues/3736
2017-05-19 10:03:51 +01:00
David Baker 3e7a31ac75 Revert "fix scroll behaviour on macs with no gemini"
This reverts commit 1347d9fa65.
2017-05-18 19:03:51 +01:00
David Baker 726cd60127 Merge pull request #902 from matrix-org/dbkr/prevent_illegal_finddomnode
Prevent an exception getting scroll node
2017-05-18 17:56:29 +01:00
David Baker 8fe3fa9178 Remove debug logging 2017-05-18 17:35:22 +01:00