imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5340 commits 222 branches 563 tags 470 MiB
Commit graph

3029 commits

Author SHA1 Message Date
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
df599890c5 add login link to SetMxIdDialog 2017-05-29 01:32:31 +01:00
Matthew Hodgson
1efc5c2b25 speed up SetMxIdDialog user check to 250ms as it was driving me MAD 
i18nize new bottomleftmenu buttons
 2017-05-28 23:28:40 +01:00
Matthew Hodgson
5c885922d9 Merge branch 'develop' into new-guest-access 2017-05-28 22:58:18 +01:00
Travis Ralston
1b6685c5da Merge branch 'develop' into travis/redact-to-remove 2017-05-28 17:45:32 -04: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
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
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
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
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
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
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
Luke Barnard
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
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
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
David Baker
c22978d033 Merge remote-tracking branch 'origin/develop' into dbkr/translations 2017-05-26 17:30: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
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
Matthew Hodgson
fde553a809 Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp 
Kierangould/12hourtimestamp
 2017-05-26 16:52:09 +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
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
Luke Barnard
28094a9a66 Show "Something went wrong!" when errcode undefined 2017-05-26 13:13:57 +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
c0f43a14fd Improve comment 2017-05-26 11:47:55 +01:00
Luke Barnard
2dcc03960a Set the displayname to the mxid once PWLU 2017-05-26 11:46:33 +01:00
Luke Barnard
b5b157a0fb Don't show notif nag bar if guest 2017-05-26 10:34:36 +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