dc92b126c7
Merge remote-tracking branch 'origin/develop' into develop
2018-11-22 18:18:06 +00:00
c6f70cb72c
Merge pull request #7737 from vector-im/revert-7490-lint
...
Revert "Run lint on travis builds and use modern node versions"
2018-11-22 18:18:01 +00:00
f701e2601a
Revert "Run lint on travis builds and use modern node versions"
2018-11-22 18:17:09 +00:00
8cb8890ab3
Merge remote-tracking branch 'origin/develop' into develop
2018-11-22 18:01:09 +00:00
a7a5679bfa
Merge pull request #7490 from aaronraimist/lint
...
Run lint on travis builds and use modern node versions
2018-11-22 18:01:04 +00:00
03587abff1
Update .travis.yml
...
Remove node 6
2018-11-22 17:54:02 +00:00
496a5baffd
Merge remote-tracking branch 'origin/develop' into develop
2018-11-22 17:06:38 +00:00
8996b6b429
Merge branch 'master' into develop
2018-11-22 17:06:25 +00:00
d483fb0605
v0.17.7
2018-11-22 16:58:48 +00:00
c2ec5f39ab
Prepare changelog for v0.17.7
2018-11-22 16:58:48 +00:00
58f927538f
v0.17.7
2018-11-22 16:56:41 +00:00
d9434c7af5
Bump js-sdk & react-sdk
2018-11-22 16:56:13 +00:00
4122f20887
Merge remote-tracking branch 'origin/develop' into develop
2018-11-22 16:55:57 +00:00
c6f317b83b
Translated using Weblate (Polish)
...
Currently translated at 88.5% (1195 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2018-11-22 16:55:57 +00:00
43013c65f6
Merge branch 'master' into develop
2018-11-22 16:55:46 +00:00
60e22b7e0f
v0.14.6
2018-11-22 16:54:53 +00:00
e27a4af817
Prepare changelog for v0.14.6
2018-11-22 16:54:21 +00:00
a25ae924b1
js-sdk v0.14.1
2018-11-22 16:49:20 +00:00
6f54ff9e7f
Fix missing js-sdk logging
...
Some of the js-sdk logging was going missing due to js-sdk's
loglevel library being initialised before the rageshake logging.
Fix by doing the rageshake setup within an import, as commented.
2018-11-22 16:43:15 +00:00
ab40a0b264
Actually add the dialog
2018-11-22 16:39:26 +00:00
a8db02ff02
Handle crypto db version upgrade
...
Display a dialog telling the user what the situation is with
options to sign out or continue withwout e2e.
Requires https://github.com/matrix-org/matrix-js-sdk/pull/785
2018-11-22 16:39:20 +00:00
9eaba3d3f5
Merge remote-tracking branch 'origin/develop' into develop
2018-11-22 16:32:45 +00:00
4805858ecb
Merge pull request #7736 from vector-im/dbkr/fix_missing_logging
...
Fix missing js-sdk logging
2018-11-22 16:32:39 +00:00
092ae7ef2f
Fix missing js-sdk logging
...
Some of the js-sdk logging was going missing due to js-sdk's
loglevel library being initialised before the rageshake logging.
Fix by doing the rageshake setup within an import, as commented.
2018-11-22 16:21:55 +00:00
bbb128b672
Merge branch 'develop' into lint
2018-11-22 11:23:02 +00:00
328ab4d824
Translated using Weblate (French)
...
Currently translated at 100.0% (1350 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-11-22 10:19:39 +00:00
5810f596b8
Translated using Weblate (Albanian)
...
Currently translated at 99.1% (1339 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2018-11-22 08:41:14 +00:00
5600a9d02a
Validate the identity server
2018-11-21 14:14:08 -07:00
4cfefe4c3c
Introduce an onUsernameBlur and fix hostname parsing
2018-11-21 14:13:56 -07:00
d324c31027
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1350 of 1350 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-11-21 21:07:42 +00:00
6f0f930e0a
Merge branch 'develop' into travis/well-known
2018-11-21 13:30:57 -07:00
15b8d410c0
Merge remote-tracking branch 'origin/develop' into develop
2018-11-21 19:25:36 +00:00
8298e73205
Argh, npm, why are you so awful?
2018-11-21 19:25:11 +00:00
819e6d9219
Merge remote-tracking branch 'origin/develop' into develop
2018-11-21 19:14:09 +00:00
d2c87a0331
Fix jenkins build
2018-11-21 19:13:42 +00:00
286c5e8895
Merge remote-tracking branch 'origin/develop' into develop
2018-11-21 19:00:29 +00:00
7df77d7e5d
Recent node please
2018-11-21 19:00:11 +00:00
8b4702a365
Merge remote-tracking branch 'origin/develop' into develop
2018-11-21 18:53:44 +00:00
23d935fd78
Let's use a version of node we can download rather than dig up
2018-11-21 18:53:18 +00:00
0252cf4332
Merge remote-tracking branch 'origin/develop' into develop
2018-11-21 18:37:49 +00:00
d714176fcd
Merge pull request #2169 from matrix-org/dbkr/e2e_backups
...
Online incremental megolm backups (v2)
2018-11-21 18:37:43 +00:00
b529c98095
Merge pull request #2284 from matrix-org/dbkr/e2e_backups_download_recovery_key
...
Add recovery key download button
2018-11-21 18:25:33 +00:00
db26513136
Merge pull request #2283 from matrix-org/dbkr/e2e_backups_passphrase
...
Passphrase Support for e2e backups
2018-11-21 18:25:09 +00:00
3828798099
lint
2018-11-21 18:17:26 +00:00
40ef2e0cf4
another missed translation
2018-11-21 18:08:44 +00:00
1c06d781ae
Missed translation
2018-11-21 18:06:37 +00:00
08e2ba8c6c
Don't allow enter to submit if field invalid
2018-11-21 18:02:58 +00:00
c40f6095a0
Merge remote-tracking branch 'origin/develop' into develop
2018-11-21 17:49:02 +00:00
3529482be5
Merge pull request #2286 from matrix-org/dbkr/async_dialog_promises
...
Update async dialog interface to use promises
2018-11-21 17:48:56 +00:00
2ba4d8a2d9
Remove outdated logging & log on failure
2018-11-21 17:35:28 +00:00
Weblate
David Baker
David Baker
Karol Kosek
Kévin C
Besnik Bleta
Travis Ralston
Szimszon