ac3e039e2a
Merge pull request #1019 from matrix-org/t3chguy/updating_stuff
...
manual check for updates
2017-06-22 17:36:55 +01:00
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
a2dc17256a
Merge remote-tracking branch 'origin/develop' into t3chguy/updating_stuff
2017-06-20 13:44:27 +01:00
4f9c1fe199
Merge branch 'develop' into luke/feature-user-settings-password-warning
2017-06-20 13:40:34 +01:00
5b6daba182
Add en_EN translations
2017-06-20 13:33:18 +01:00
f15292becf
Merge branch 'develop' into luke/fix-email-cancel-button-text
2017-06-20 13:30:34 +01:00
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
a0534e7477
Merge branch 'develop' into rav/handle_received_room_key_requests
2017-06-20 00:25:14 +01:00
c418076c32
add two strings to translation
2017-06-19 13:20:16 -03:00
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
31b3b4687a
Trailing comma
2017-06-13 18:34:33 +01:00
aa0ef51932
i18n for setting password flow
2017-06-13 18:28:43 +01:00
bc55d44bcf
Merge pull request #1079 from matrix-org/t3chguy/voip/force_turn
...
allow forcing of TURN
2017-06-12 21:44:00 +01:00
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
7b0565e9d1
Merge branch 'master' into develop
2017-06-12 15:53:04 +01:00
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
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
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
e6d7eedbe6
Remove NeedToRegisterDialog
...
- since it's no longer used anywhere
2017-06-12 08:36:41 +01:00
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
cbcca78c40
Add text for invite_timeout and fix message for ice_failed.
2017-06-11 07:19:19 +01:00
2bfad52b40
Make unknown failures more helpful.
2017-06-10 14:35:11 +01:00
18490377f8
Show reason for a call hanging up unexpectedly.
2017-06-10 14:27:18 +01:00
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
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
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
8dc20606c8
Use comma for list of three things
2017-06-08 16:07:29 +01:00
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
614006a256
remove duplicate keys from en_EN
2017-06-08 15:09:23 +01:00
f2efdf8a4f
Review comments
2017-06-08 14:45:59 +01:00
e3ac78bd28
Self-review
2017-06-08 14:36:20 +01:00
c57823a31d
Merge branch 'develop' into kegan/translation-tamarin
2017-06-08 14:19:56 +01:00
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
1c58a9cd5e
Everything but src/components/views/rooms
2017-06-08 12:33:29 +01:00
bc0eb4294c
rename welcome page to home
2017-06-08 10:27:35 +01:00
0f4028da07
Add more translations..
2017-06-08 09:44:58 +01:00
f7ab6a574c
Remove unused string
2017-06-07 18:32:52 +01:00
ef2fedc3a9
fix missing translations and typos in i18n
2017-06-07 18:24:35 +01:00
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
27e5098e00
Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests
2017-06-07 15:44:33 +01:00
c1151fd31c
Merge branch 'develop' into rav/handle_received_room_key_requests
2017-06-07 15:37:38 +01:00
53ea41e8a5
Merge branch 'develop' into new-guest-access
2017-06-07 12:08:37 +01:00
4127e7121c
Translate src/components/structures
...
Includes some pluralisation! Tested them manually to make sure they work.
2017-06-07 11:40:46 +01:00
f8198ba9c9
Merge branch 'develop' into new-guest-access
2017-06-06 10:33:01 +01:00
ed7c138d91
quick and dirty override to disable MD globally
2017-06-05 21:38:25 +01:00
32e3ea0601
Address review comments
2017-06-05 17:58:11 +01:00
c690acc638
Add missing command
2017-06-05 17:40:21 +01:00
9f6ab4a31b
Add en_EN i18n strings for setMxIdDialog
2017-06-05 16:12:00 +01:00
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
98e99d542b
i18n things
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:49:28 +01:00
David Baker