Commit graph

3585 commits

Author SHA1 Message Date
Bart Ribbers
e99e5c5efc Translated using Weblate (Dutch)
Currently translated at 2.6% (18 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/nl/
2017-05-29 15:51:49 +00:00
Radium
fdeb29c8ba Translated using Weblate (Chinese (Simplified))
Currently translated at 11.7% (79 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-05-29 15:51:49 +00:00
saul.kredi@krutt.org
4afba2f796 Add support for RTL languages 2017-05-29 18:44:39 +03:00
Radium
e1e2d83361 Added translation using Weblate (Chinese (Simplified)) 2017-05-29 15:18:55 +00:00
Juorder Gonzalez
949077db00 Translated using Weblate (Spanish)
Currently translated at 3.2% (22 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
2017-05-29 15:08:33 +00:00
Juorder Gonzalez
9ea8e2c459 Translated using Weblate (Spanish)
Currently translated at 2.8% (19 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
2017-05-29 15:08:05 +00:00
Juorder Gonzalez
578e10d972 Translated using Weblate (Spanish)
Currently translated at 2.8% (19 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/es/
2017-05-29 15:07:11 +00:00
RiotTranslate
245a2793ed Merge remote-tracking branch 'origin/develop' into develop 2017-05-29 14:33:58 +00:00
Bamstam
6ccf55b425 Translated using Weblate (German)
Currently translated at 100.0% (675 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-29 14:33:58 +00:00
Juorder Gonzalez
4a712a443c Added translation using Weblate (Spanish) 2017-05-29 14:33:56 +00:00
Michael Telatynski
42e20c38f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik 2017-05-29 15:23:05 +01:00
Michael Telatynski
9b8dcaf274 make analytics setting use new thing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 15:11:37 +01:00
Michael Telatynski
97d0c41d30 fix ugly special casing in generic settings renderer
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 15:08:11 +01:00
Michael Telatynski
75e386e0ee fix async behaviour, tracking should maybe use Async Piwik tracker
events before piwik loads are lost currently
blocking for piwik would be stupid.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:56:41 +01:00
Michael Telatynski
f5d336103e add opt out / un opt out toggle
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:36:50 +01:00
Michael Telatynski
7e8123e5fe move all init/enable/disable logic to Analytics/MatrixChat
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:26:29 +01:00
Matthew Hodgson
229eef4624 fix missing translation 2017-05-29 13:29:27 +01:00
RiotTranslate
93b958419a Merge remote-tracking branch 'origin/develop' into develop 2017-05-28 23:08:11 +00:00
Bamstam
d325582344 Translated using Weblate (German)
Currently translated at 100.0% (675 of 675 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-28 23:08:09 +00:00
Travis Ralston
1b6685c5da Merge branch 'develop' into travis/redact-to-remove 2017-05-28 17:45:32 -04:00
Matthew Hodgson
4fa454ed45 Merge branch 'develop' into weblate-riot-web-matrix-react-sdk 2017-05-28 21:46:17 +01:00
Matthew Hodgson
0acfe7eddd Merge pull request #952 from matrix-org/t3chguy/fix_slashcommands
fix mis-linting - missed it in code review :(
2017-05-28 21:45:25 +01:00
Matthew Hodgson
51c3c121d4 fix dup i18n keys found by check-i18n.pl 2017-05-28 21:32:24 +01:00
Matthew Hodgson
67323e3690 fix vars in RU translation (how did i not commit this yesterday?) 2017-05-28 21:28:03 +01:00
Michael Telatynski
3ecd9964ec fix vector-im/riot-web#4059 - missed it in code review :(
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 20:24:33 +01:00
Radium
4e2e1d3d51 Translated using Weblate (Chinese (Traditional))
Currently translated at 3.2% (22 of 674 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hant/
2017-05-28 16:38:35 +00:00
Radium
dc710f4644 Added translation using Weblate (Chinese (Traditional)) 2017-05-28 16:07:47 +00:00
Rinat
b709c981c0 Translated using Weblate (Russian)
Currently translated at 91.0% (614 of 674 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-28 13:35:29 +00:00
PureTryOut
00a6d218a5 Translated using Weblate (Dutch)
Currently translated at 0.2% (2 of 674 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/nl/
2017-05-28 13:35:29 +00:00
Michael Telatynski
3a8288bf34 remove identical duplicates in fr
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:43:44 +01:00
Michael Telatynski
8d64bf27af fix weird mangled key vals (and dups)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:38:37 +01:00
PureTryOut
38abda3c56 Added translation using Weblate (Dutch) 2017-05-28 12:35:34 +00:00
Michael Telatynski
c8732582d3 remove most duplicate keys in en_EN
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:35:30 +01:00
Michael Telatynski
b55503e67f i18n the forwarding aux panel
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:27:57 +01:00
Michael Telatynski
fb3187b58e change event wording
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:26:33 +01:00
Michael Telatynski
0a1b361141 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/piwik 2017-05-28 13:21:33 +01:00
Michael Telatynski
7cebfc1ff1 change analytics to set custom url rather than custom title
this way exit/entry/page transition will work better

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 13:19:03 +01:00
RiotTranslate
f08d40fb7b Merge remote-tracking branch 'origin/develop' into develop 2017-05-28 11:10:16 +00:00
Bamstam
b1f21f7d4e Translated using Weblate (German)
Currently translated at 99.7% (672 of 674 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-28 11:10:16 +00:00
Michael Telatynski
eb6136b957 remove dispatcher
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-28 11:26:41 +01:00
Matthew Hodgson
accc17a39a Merge pull request #812 from t3chguy/forward_message
Message Forwarding
2017-05-28 02:37:31 +01:00
Matthew Hodgson
10a9313bba Merge pull request #944 from matrix-org/t3chguy/fix-focus-steal
don't focus_composer on window focus
2017-05-27 23:30:00 +01:00
Michael Telatynski
f93fd1c408 remove unrelated comment, my copy pasting is way too obvious xD
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 21:08:00 +01:00
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
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
063230af03 fix typo breaking russian i18n 2017-05-27 19:51:44 +01:00
Matthew Hodgson
71bc15c2fc fix . 2017-05-27 19:03:18 +01:00
Michael Telatynski
4cd7964b58 remove window onFocus handling entirely
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 18:43:59 +01:00
Matthew Hodgson
3703306a9e oops 2017-05-27 18:35:18 +01:00
Matthew Hodgson
8766f8ab7e sync punctuation 2017-05-27 18:22:36 +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
c61ca42261 oops, fix quoting 2017-05-27 17:41:54 +01:00
Matthew Hodgson
f442a665c8 fix more i18n punctuation fails 2017-05-27 17:36:02 +01:00
Matthew Hodgson
730258bd3c fix punctuation on e2e warning 2017-05-27 17:30:32 +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
f0f5bc83f2 fix more weirdly inconsistent fullstops 2017-05-27 15:54:52 +01:00
Matthew Hodgson
6d6b14a26c fix spurious missing translation ('Default') 2017-05-27 15:52:24 +01:00
Matthew Hodgson
398ad4798e fix string typo 2017-05-27 15:02:20 +01:00
Matthew Hodgson
355f4974af standardise i18n TextForEvent to include punctuation.
fixes lots of missing & inconsistent strings, as somehow some of the i18n files had ended up with the raw strings being inconsistent in terms of punctuation, causing problems as per https://github.com/vector-im/riot-web/issues/4045
2017-05-27 15:02:20 +01:00
Michael Telatynski
8e1db84bee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-focus-steal 2017-05-27 14:29:06 +01:00
Michael Telatynski
2bcb381aa7 maybe window focus should be ignored so focus is left as what it was
but with this at least clicking on a text input will not make you
be thrown into composer instead

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-27 14:19:34 +01:00
Matthew Hodgson
b8b6a87423 fixing missing EN translation 2017-05-27 13:58:20 +01:00
Matthew Hodgson
5ed1bc5873 Merge pull request #940 from matrix-org/matthew/always-show-ts
actually wire up alwaysShowTimestamps
2017-05-27 13:03:39 +01:00
nouts
ad2c84375d Translated using Weblate (French)
Currently translated at 57.3% (378 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-27 11:30:00 +00:00
Amandine
9fc20cbd34 Translated using Weblate (French)
Currently translated at 55.8% (368 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-27 07:08:41 +00:00
RiotTranslate
59cb7ad0e6 Merge remote-tracking branch 'origin/develop' into develop 2017-05-26 23:20:37 +00:00
dambador
5d08393eb5 Translated using Weblate (Russian)
Currently translated at 92.8% (612 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 23:20:37 +00:00
Krombel
88f760a53f Translated using Weblate (German)
Currently translated at 100.0% (659 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 23:20:36 +00:00
Amandine
b6cd3fcdd2 Translated using Weblate (French)
Currently translated at 51.5% (340 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-26 23:20:36 +00: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
1c841f27d7 Merge pull request #938 from RiotTranslate/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-05-26 23:01:13 +01:00
David Baker
477396f820 Use first language preference, not last 2017-05-26 22:29:03 +01:00
Stanislav N
594247dfa9 Translated using Weblate (Russian)
Currently translated at 66.3% (437 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 20:33:25 +00:00
Stanislav N
53cb6d1d76 Translated using Weblate (Russian)
Currently translated at 65.8% (434 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 20:11:46 +00:00
RiotTranslate
765034dc19 Merge remote-tracking branch 'origin/develop' into develop 2017-05-26 20:10:47 +00:00
Stanislav N
5f2012102c Translated using Weblate (Russian)
Currently translated at 65.8% (434 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/ru/
2017-05-26 20:10:47 +00:00
Krombel
08529ba5a8 Translated using Weblate (German)
Currently translated at 100.0% (659 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 20:10:47 +00:00
Travis Ralston
65dd2d4db1 Fix PM being AM
Fixes https://github.com/vector-im/riot-web/issues/4043

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-26 13:43:01 -06:00
RiotTranslate
e46b63dc5a [WEBLATE] fix merging issues 2017-05-26 18:51:55 +00:00
Krombel
c138e4d92e Translated using Weblate (German)
Currently translated at 100.0% (659 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 18:40:57 +00:00
Amandine
9fcee811cb Translated using Weblate (French)
Currently translated at 25.7% (170 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-26 18:40:56 +00:00
Amandine
a77663d18b Translated using Weblate (French)
Currently translated at 25.6% (169 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
2017-05-26 18:18:16 +00:00
Krombel
1edad35c98 Translated using Weblate (German)
Currently translated at 100.0% (659 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
2017-05-26 18:18:14 +00:00
Matthew Hodgson
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
David Baker
cddfe7e6ef Fix inconsistent quoting in topic messages 2017-05-26 19:00:44 +01:00
David Baker
563b85ceb8 Merge https://github.com/MTRNord/matrix-react-sdk/pull/115 2017-05-26 18:53:23 +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
David Baker
c22978d033 Merge remote-tracking branch 'origin/develop' into dbkr/translations 2017-05-26 17:30:02 +01:00
David Baker
84cef00f1f Mismatched oneUser / severalUsers 2017-05-26 17:16:23 +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
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
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
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
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
David Baker
db45e99536 Remove defaulting here
We already do it in the place this function gets called
2017-05-25 12:09:48 +01:00
David Baker
913723b76b Remove extCounterpart now we only use one instance 2017-05-25 12:08:14 +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
c7776915f7 Kill off more tabs 2017-05-25 11:45:36 +01:00
David Baker
5c359e63ab Bulk change counterpart imports
to use languageHandler wrapper func
2017-05-25 11:39:08 +01:00
David Baker
ec146c7f45 Switch to stock counterpart
We no longer need the custom counterpart. The things that were
changed in it and reasosn we no lomger need them are:

 1. set separator - this can be done with standard counterpart
 2. ES6 port: this was done to allow importing as _t, but is
    unnecessary with the _t wrapper function in react-sdk
    (although also seems to work fine with
    `import _t from 'counterpart';`)
 3. Fallback to key name: unnecessary with
    `setMissingEntryGenerator` in 0.18, but we've changed to just
    using a fallback locale anyway since No code missing en
    translations should ever make it to the devbelop branch.
 4. Logging on missing translations. Unnecessary with
    `onTranslationNotFound`, but now not used anyway because we
    let missing translations show up in the UI as
    'missing translation'

Bulk changes to imports coming in separate commit for easy reading.
2017-05-25 11:24:17 +01:00
Michael Telatynski
b9ac1222ed remove listener on unmount
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-24 15:55:37 +01:00
Michael Telatynski
1186207658 Initial Electron Settings - for Auto Launch
(opens path for Proxy Settings)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-24 15:51:11 +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
Michael Telatynski
edcfb77a6d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_call_sleep 2017-05-24 10:56:41 +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
MTRNord
9bce417400 fix algorithm ReferenceError 2017-05-23 18:01:30 +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
Michael Telatynski
b65ba6b080 Merge pull request #919 from matrix-org/rav/delint_slashcommands
Fix lint errors in SlashCommands
2017-05-23 12:10:34 +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
5df4b9de16 Fix lint errors in SlashCommands 2017-05-23 09:44:11 +01:00
Richard van der Hoff
26c8540d03 Add in a "verify" slash command to confirm signing keys (#912)
Allows users to send a text string via an alternative channel (like email
or SMS) which Riot can leverage to confirm that the signing keys match.

Effectively removes the tedium of checking keys until a better mechanism
is completed.

Signed-off-by: Kit Sczudlo <kit@kitscz.com>
2017-05-23 09:24:18 +01:00
Michael Telatynski
024964aceb pass call state through, for things that don't have access to full API
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 18:33:14 +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
Kieran Gould
f9152b205c Add parameter showTwelveHours to formatTime 2017-05-19 22:29:49 +01:00
Kieran Gould
5aa1bc4185 Rename twentyFourHour
Pad time
2017-05-19 22:29:49 +01:00