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
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
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
Kegan Dougal
d2e766e4f0
First round
2017-06-02 10:18:31 +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
turt2live
d9d25e26d2
Say "X removed the room name" instead of showing nothing
...
Addresses vector-im/riot-web#4072
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-05-29 23:21:14 -06:00
Michael Telatynski
7e02977c27
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 22:32:45 +01: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
f5d336103e
add opt out / un opt out toggle
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-29 14:36:50 +01:00
Matthew Hodgson
229eef4624
fix missing translation
2017-05-29 13:29:27 +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