PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
6322 commits 1 branch 0 tags 338 MiB
Commit graph

179 commits

Author SHA1 Message Date
David Baker
a2ff289ed8 Add 'groups' page 2017-06-28 13:56:18 +01:00
Richard Lewis
3a10cda2ca Add translations. 2017-06-28 13:55:18 +01:00
Richard Lewis
2b1d15717a Add translation for Matrix Apps labs setting. 2017-06-28 12:00:22 +01:00
Richard Lewis
ddc0da396d Merge in changes from develop 2017-06-27 11:44:36 +01:00
David Baker
09b1012388 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-26 17:49:06 +01:00
David Baker
812b3643de Add message for HSes that don't support groups 
Also add an unrelated missed translation
 2017-06-26 17:47:17 +01:00
Johannes Löthberg
48c32172fd TextualBody: only highlight code block if language was specified 
The highlight.js autodetection is finicky and often wrong, so disable
highlighting unless the language was explicitly specified, or if the
user has explicitly enabled it in the settings.

Fixes vector-im/riot-web#508.

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2017-06-26 17:45:40 +02:00
David Baker
f0f4a16e97 Translate autocomplete delay 2017-06-23 18:28:02 +01:00
Luke Barnard
738f261d5d Add missing translations for RTE ops 2017-06-23 16:14:22 +01:00
David Baker
ac3e039e2a Merge pull request #1019 from matrix-org/t3chguy/updating_stuff 
manual check for updates
 2017-06-22 17:36:55 +01:00
Richard van der Hoff
efc5cf2889 Remove dead special-casing for OLM.BAD_LEGACY_ACCOUNT_PICKLE 
We used to show a special error message when we got this error; however
https://github.com/matrix-org/matrix-react-sdk/pull/783 made that not work.

You'll only hit it if you're upgrading from some ancient version of Olm, and
I'm quite happy for us to fall back to the generic 'couldn't restore: vape your
storage?' flow in that case. (In any case that's preferable to dumping you at
the login prompt with no warning that we've just vaped your storage).
 2017-06-21 21:49:41 +01:00
David Baker
a2dc17256a Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff 2017-06-20 13:44:27 +01:00
Luke Barnard
4f9c1fe199 Merge branch 'develop' into luke/feature-user-settings-password-warning 2017-06-20 13:40:34 +01:00
Luke Barnard
5b6daba182 Add en_EN translations 2017-06-20 13:33:18 +01:00
Luke Barnard
f15292becf Merge branch 'develop' into luke/fix-email-cancel-button-text 2017-06-20 13:30:34 +01:00
Richard van der Hoff
0c431887b0 Merge pull request #996 from matrix-org/rav/handle_received_room_key_requests 
Pop up a dialog when we get a room key request
 2017-06-20 13:20:58 +01:00
Richard van der Hoff
a0534e7477 Merge branch 'develop' into rav/handle_received_room_key_requests 2017-06-20 00:25:14 +01:00
daniel tygel
c418076c32 add two strings to translation 2017-06-19 13:20:16 -03:00
Richard Lewis
59f6448b3e Merge branch 'kegan/postmessage-widgets' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps 2017-06-19 16:00:12 +01:00
Luke Barnard
83d5822c85 Show a "Skip" button instead of "Cancel" in SetEmailDialog 
Fixes https://github.com/vector-im/riot-web/issues/4309
 2017-06-19 13:17:12 +01:00
Luke Barnard
31b3b4687a Trailing comma 2017-06-13 18:34:33 +01:00
Luke Barnard
aa0ef51932 i18n for setting password flow 2017-06-13 18:28:43 +01:00
Matthew Hodgson
bc55d44bcf Merge pull request #1079 from matrix-org/t3chguy/voip/force_turn 
allow forcing of TURN
 2017-06-12 21:44:00 +01:00
Michael Telatynski
c1d1a1377c allow forcing of TURN, pass account val per-call until UX is designed. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-12 20:20:27 +01:00
David Baker
7b0565e9d1 Merge branch 'master' into develop 2017-06-12 15:53:04 +01:00
Richard van der Hoff
cb38ebed39 Merge pull request #1077 from matrix-org/rav/remove_dead_code 
Remove a bunch of dead code from react-sdk
 2017-06-12 10:10:12 +01:00
Richard van der Hoff
57b4c422b1 Merge pull request #1061 from matrix-org/rav/megolm_key_encryption_errors 
Improve error logging/reporting in megolm import/export
 2017-06-12 10:09:52 +01:00
Richard van der Hoff
cc74a09abd Remove start_upgrade_registration dispatch handler 
This dispatch is no longer raised anywhere, so we may as well get rid of the
code that it executes, as well as the state which is only set there.
 2017-06-12 08:38:29 +01:00
Richard van der Hoff
e6d7eedbe6 Remove NeedToRegisterDialog 
- since it's no longer used anywhere
 2017-06-12 08:36:41 +01:00
Michael Telatynski
1069bd33f0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/updating_stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-11 23:21:50 +01:00
Will Hunt
cbcca78c40 Add text for invite_timeout and fix message for ice_failed. 2017-06-11 07:19:19 +01:00
Will Hunt
2bfad52b40 Make unknown failures more helpful. 2017-06-10 14:35:11 +01:00
Will Hunt
18490377f8 Show reason for a call hanging up unexpectedly. 2017-06-10 14:27:18 +01:00
David Baker
d6b85c9d4d Fix translations on conf call banner 
* You can't substitute react elements into a text string
 * Substituting in undefined gives the string 'undefined', so
   initialise it to the empty string.
 2017-06-09 22:06:43 +01:00
Kegan Dougal
6d1d435247 Scalar: add in set_widget and get_widgets 2017-06-09 11:21:37 +01:00
David Baker
3d59fe58dc Merge pull request #1060 from matrix-org/dbkr/fix_login_error_message 
Better error messages for login
 2017-06-08 16:57:40 +01:00
Richard van der Hoff
175599beda Improve error logging/reporting in megolm import/export 
I saw a rageshake where somebody had apparently failed to import a key file.
I have no idea why it happened.

Also try to make the errors the users see useful.
 2017-06-08 16:55:50 +01:00
David Baker
8dc20606c8 Use comma for list of three things 2017-06-08 16:07:29 +01:00
David Baker
d691c891e7 Move all login error string generation into view 
This makes all the various hits done by login report the same
useful error messages and gets rid of the broken ones like printing
the http status code even if it was undefined. Also add text for
the case of overzealous browser extensions because lots of people
get bitten by it.
 2017-06-08 15:49:48 +01:00
Matthew Hodgson
614006a256 remove duplicate keys from en_EN 2017-06-08 15:09:23 +01:00
Kegan Dougal
f2efdf8a4f Review comments 2017-06-08 14:45:59 +01:00
Kegan Dougal
e3ac78bd28 Self-review 2017-06-08 14:36:20 +01:00
Kegan Dougal
c57823a31d Merge branch 'develop' into kegan/translation-tamarin 2017-06-08 14:19:56 +01:00
Kegan Dougal
00df956ca2 Add remaining translations! 
Every file has now been manually vetted by me. Due to the extent of
the changes, I've been unable to test all scenarios to make sure this
all works. :(
 2017-06-08 14:08:51 +01:00
Kegan Dougal
1c58a9cd5e Everything but src/components/views/rooms 2017-06-08 12:33:29 +01:00
Matthew Hodgson
bc0eb4294c rename welcome page to home 2017-06-08 10:27:35 +01:00
Kegan Dougal
0f4028da07 Add more translations.. 2017-06-08 09:44:58 +01:00
David Baker
f7ab6a574c Remove unused string 2017-06-07 18:32:52 +01:00
Matthew Hodgson
ef2fedc3a9 fix missing translations and typos in i18n 2017-06-07 18:24:35 +01:00
Luke Barnard
3b6599dcdc Use user_directory endpoint to populate ChatInviteDialog 
Also attempt to slightly improve the feedback given when searching. There is still room for improvement - it's not totally obvious whether to display a spinner because it's quite jarring were it to replace the dd. This does mean that "No results" will flash awkardly between two queries, neither of which return any results.
 2017-06-07 16:05:36 +01:00
Richard van der Hoff
27e5098e00 Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests 2017-06-07 15:44:33 +01:00
Richard van der Hoff
c1151fd31c Merge branch 'develop' into rav/handle_received_room_key_requests 2017-06-07 15:37:38 +01:00
Luke Barnard
53ea41e8a5 Merge branch 'develop' into new-guest-access 2017-06-07 12:08:37 +01:00
Kegan Dougal
4127e7121c Translate src/components/structures 
Includes some pluralisation! Tested them manually to make sure they work.
 2017-06-07 11:40:46 +01:00
David Baker
f8198ba9c9 Merge branch 'develop' into new-guest-access 2017-06-06 10:33:01 +01:00
Matthew Hodgson
ed7c138d91 quick and dirty override to disable MD globally 2017-06-05 21:38:25 +01:00
Richard van der Hoff
32e3ea0601 Address review comments 2017-06-05 17:58:11 +01:00
Luke Barnard
c690acc638 Add missing command 2017-06-05 17:40:21 +01:00
Luke Barnard
9f6ab4a31b Add en_EN i18n strings for setMxIdDialog 2017-06-05 16:12:00 +01:00
Luke Barnard
619830617a Merge branch 'develop' into luke/ilag-i18n 
In order to get ILAG internationalised

Conflicts:
	src/components/structures/LoggedInView.js
	src/components/structures/MatrixChat.js
	src/components/views/dialogs/ChatCreateOrReuseDialog.js
	src/components/views/dialogs/SetDisplayNameDialog.js
	src/createRoom.js
	src/i18n/strings/en_EN.json
 2017-06-05 16:08:03 +01:00
Michael Telatynski
98e99d542b i18n things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:49:28 +01:00
Michael Telatynski
46441d69eb fix casing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 21:09:51 +01:00
Matthew Hodgson
adfeff34ae Merge pull request #1004 from matrix-org/t3chguy/hide_redactions 
allow hiding redactions, restoring old behaviour
 2017-06-02 12:27:52 +01:00
Luke Barnard
defecb1b14 Implement /user/@userid:domain?action=chat 
This is a URL that can be used to start a chat with a user.
 - If the user is a guest, setMxId dialog will appear before anything and a defered action will cause `ChatCreateOrReuseDialog` to appear once they've logged in.
 - If the user is registered, they will not see the setMxId dialog.

fixes https://github.com/vector-im/riot-web/issues/4034
 2017-06-02 11:36:18 +01:00
Kegan Dougal
a8ca7c899f Review comments 2017-06-02 11:16:08 +01:00
Kegan Dougal
f54c182eb1 Add remaining strings for vector-im/riot-web#4151 2017-06-02 10:47:08 +01:00
Richard van der Hoff
a3a262b150 Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests 2017-06-02 10:31:14 +01:00
Kegan Dougal
d2e766e4f0 First round 2017-06-02 10:18:31 +01:00
Richard van der Hoff
21277557f8 Add translations for new dialog 2017-06-02 10:10:40 +01:00
Michael Telatynski
d2d0ba952a allow hiding redactions. no point onAccountData as it'd cause a full 
refresh, this may need to be handled differently in the future.
Currently handling same as the new timestamp stuff

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 04:23:07 +01:00
Matthew Hodgson
ec433907f0 Merge pull request #850 from t3chguy/webrtc_settings 
webrtc config electron
 2017-06-02 00:48:25 +01:00
Michael Telatynski
6b4daf02a9 i18 missed things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:27:20 +01:00
Michael Telatynski
0bafd6458a Revert voodoo 2017-06-02 00:26:31 +01:00
Michael Telatynski
46a9326607 special case default - CallMediaHandler can figure it out 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:20:34 +01:00
Matthew Hodgson
b411c8f97e shorten signin label to aid fr i18n 2017-06-02 00:10:54 +01:00
Michael Telatynski
dd4480f8c3 change device data structure to array of objects 
so that we can set falsey values, for unsetting device
                               most dolphinately needs testing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:26:43 +01:00
Michael Telatynski
0c36778369 fix bad indentation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 22:59:37 +01:00
Michael Telatynski
dbba1dedb6 i18nize all the things and change show logic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 22:58:17 +01:00
Matthew Hodgson
ee965a89a7 Merge pull request #986 from uhoreg/compact 
enable useCompactLayout user setting an add a class when it's enabled
 2017-06-01 21:32:54 +01:00
Matthew Hodgson
6c56fa3381 Merge pull request #990 from matrix-org/kegan/translation-marmoset 
Translation fixes for everything but src/components
 2017-06-01 21:22:00 +01:00
Kegan Dougal
547f10bcbb Add translations for slash command failures 2017-06-01 15:44:56 +01:00
Kegan Dougal
f75e714c3a More translations.. 2017-06-01 15:18:06 +01:00
Matthew Hodgson
00750b4686 quick and dirty RoomAvatarEvent 2017-06-01 13:31:24 +01:00
Kegan Dougal
b26f4ba578 First lot of translations 2017-06-01 12:09:07 +01:00
Hubert Chathi
92d1a9a6ff enable useCompactLayout user setting an add a class when it's enabled 
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
 2017-05-31 22:00:30 -04:00
Matthew Hodgson
3d91b31637 i18n invited, and delete stale warning 2017-06-01 01:29:07 +01:00
Matthew Hodgson
b4284cf000 fix up Can't connect to HS i18n with _tJsx 2017-06-01 01:17:39 +01:00
turt2live
165dfeccb9 Fix rare case where presence duration is undefined & i18n 2017-05-31 11:56:04 -06:00
daniel tygel
d4a89cc2df Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop 2017-05-31 09:09:27 -03:00
Michael Telatynski
dcd99ac3de Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron_settings 
# Conflicts:
#	src/components/structures/UserSettings.js
#	src/i18n/strings/en_EN.json

First time using JetBrains Merge Tool, MAY HAVE GONE HORRIBLY WRONG

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 23:54:57 +01:00
Michael Telatynski
0d930c0553 change wording and i18n it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 23:46:51 +01:00
daniel tygel
f4e5039e70 add string to translate 2017-05-30 19:01:23 -03:00
daniel tygel
12f923bc81 add new string to translate 2017-05-30 18:56:52 -03:00
Matthew Hodgson
c15568e003 remove spurious string 2017-05-30 21:05:26 +01:00
Matthew Hodgson
e30e45a82c Merge branch 'develop' into new-guest-access 2017-05-30 21:05:07 +01:00
Marcel
54b8afec38 Fix use of wrong char 2017-05-30 21:47:38 +02:00
Marcel
4d7ac1b828 Fix missing string in the room settings 2017-05-30 21:46:07 +02:00
Matthew Hodgson
48a2ad93da fix {integrationsUrl} thinko 2017-05-30 20:32:12 +01:00
Matthew Hodgson
93a35dc07a Merge branch 'develop' into t3chguy/piwik 2017-05-30 15:58:55 +01:00
Marcel
70e7d81093 More i18n strings (#963) 
* Add i18n for E2E import and Export Dialogs

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add various previous missing i18n strings

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Translate CreateRoomButton

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ChatInviteDialog and fix missing to.

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ConfitmRedactDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeactivateAccountDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeviceVerifyDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add SessionRestoreErrorDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add SetDisplayNameDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UnknownDeviceDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add AddressTile translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add DeviceVerifyButtons translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add Dropdown translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UserSelector translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CaptchaForm translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CasLogin translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add CustomServerDialog translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add InteractiveAuthEntryComponents translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add LoginFooter translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add RegistrationForm translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add ServerConfig translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MAudioBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MImageBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add MVideoBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add TextualBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UnknownBody translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add UrlPreviewSettings translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add AuxPanel translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* Add PresenceLabel translations

Signed-off-by: MTRNord <mtrnord1@gmail.com>

* fix syntax error

* weird space :P

* missing ','

* fix missing value

* fix json fail

* remove acidential added file

* fix another json fail
 2017-05-30 15:09:57 +01:00