8b1fdc6b73
Merge branches 'develop' and 't3chguy/react16' of github.com:vector-im/riot-web into t3chguy/react16
2019-08-28 11:02:53 +01:00
f7bab88079
Improve exceptions mention
...
In addition to fixes from review, also add link to official source with more information.
2019-08-27 22:28:15 +02:00
b852b54352
Merge branch 'origin/develop' into Weblate.
2019-08-27 15:07:37 +00:00
3b324000f4
Translated using Weblate (Korean)
...
Currently translated at 100.0% (24 of 24 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
2019-08-27 15:07:37 +00:00
bd20796509
Merge pull request #10641 from vector-im/travis/tabbed-managers
...
Add docs for tabbed integration managers labs flag
2019-08-27 09:07:32 -06:00
fdd90d1797
Merge branch 'origin/develop' into Weblate.
2019-08-26 15:16:38 +00:00
9b7f44c8a0
Merge pull request #10656 from vector-im/jaywink/integrations-widget-urls
...
Change integrations_widgets_urls default configuration
2019-08-26 18:16:33 +03:00
dac9a318bb
Translated using Weblate (Slovak)
...
Currently translated at 75.0% (18 of 24 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
2019-08-26 09:56:13 +00:00
0b591efe81
Translated using Weblate (Korean)
...
Currently translated at 100.0% (24 of 24 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
2019-08-26 09:56:13 +00:00
2b5fcbdcbd
Provide our common integrations_widget_urls defaults for sample config
...
Closes #10454
2019-08-26 10:03:50 +03:00
334001c829
Add and prioritize the new "_matrix/integrations/v1" widget urls
...
As per MSC1961, add to the whitelisted integrations_widget_urls
the new paths. This allows us to switch Scalar over to use the
new path as default.
Note, the legacy "scalar-staging.riot.im" is these days just a redirect
to scalar-staging.vector.im, so there is no addition for that. It still
needs Riot side whitelisting though for existing widgets.
2019-08-26 10:01:37 +03:00
97a0161e64
Translated using Weblate (Korean)
...
Currently translated at 70.8% (17 of 24 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
2019-08-25 09:39:59 +00:00
357ab6156e
Translated using Weblate (Korean)
...
Currently translated at 70.8% (17 of 24 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/
2019-08-25 09:39:59 +00:00
7eefc9d856
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/react16
2019-08-24 11:42:03 +01:00
3e3cd068dc
Enable labs flag for develop
2019-08-23 09:19:16 -06:00
7bf1680ff8
Add docs for tabbed integration managers labs flag
2019-08-23 08:47:21 -06:00
c635fe7f36
Merge pull request #10638 from vector-im/travis/doc-composer-labs
...
Add docs for the CIDER composer flag
2019-08-23 08:42:15 -06:00
3f70c0d66d
Add docs for the CIDER composer flag
2019-08-23 08:28:47 -06:00
53f7444a8e
Merge pull request #10626 from vector-im/bwindels/cider_labs
...
add cider composer labs flag
2019-08-23 10:26:49 +01:00
b3a660959e
add cider composer labs flag
2019-08-23 10:23:09 +01:00
d2bbc57378
Merge pull request #10601 from liberodark/patch-1
...
Upgrade to Electron 6.0.3
2019-08-21 17:43:57 -06:00
961369f48d
Upgrade to Electron 6.0.3
...
Upgrade to last Electron 6.0.3
2019-08-21 13:32:42 +02:00
dad62137c6
Merge pull request #10596 from vector-im/jryans/electron-6
...
Upgrade to Electron 6
2019-08-20 17:41:16 +01:00
0800faf057
Upgrade to Electron 6.0.2
2019-08-20 10:36:06 +01:00
d12f94888a
Use modern command name for electron-builder
...
`electron-builder` now recommends you invoke it via that name instead of `build`
as was previously supported.
2019-08-20 10:33:47 +01:00
a438efa4be
Upgrade to Electron 6
2019-08-20 10:29:58 +01:00
f69f852c53
Merge pull request #10591 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate
2019-08-19 10:13:25 +01:00
72c6707bdb
Translated using Weblate (Polish)
...
Currently translated at 100.0% (24 of 24 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
2019-08-18 13:08:15 +00:00
01c28019ba
Merge branch 'origin/develop' into Weblate.
2019-08-16 14:28:52 +00:00
c65ebd5e83
Merge branch 'master' into develop
2019-08-16 15:28:33 +01:00
d43ae7ac8e
Merge branch 'origin/develop' into Weblate.
2019-08-16 14:27:57 +00:00
ce89428bb9
Merge pull request #10579 from vector-im/jryans/electron-builder-21.2.0
...
Upgrade electron-builder to 21.2.0
2019-08-16 15:27:53 +01:00
4299cdfeac
v1.3.3
2019-08-16 15:26:03 +01:00
7a998e7ed7
Prepare changelog for v1.3.3
2019-08-16 15:26:02 +01:00
8a58ba2374
v1.3.3
2019-08-16 15:23:11 +01:00
aa67a3ba2a
Tweak comment about upstream
2019-08-16 15:21:59 +01:00
26d70b1bd4
Set SUID bit on chrome-sandbox for Debian
...
This tweaks Linux packages for Riot to SUID `chrome-sandbox` after install. This
is required as of Electron 5 for certain distros, such as Debian.
This change has also been provided to `electron-builder` upstream, so ideally
they'll include it in the future and this becomes redundant.
Fixes https://github.com/vector-im/riot-web/issues/10509
2019-08-16 15:21:59 +01:00
4d9e626292
Merge branch 'origin/develop' into Weblate.
2019-08-16 13:31:15 +00:00
8824f7edee
Merge pull request #10580 from vector-im/jryans/linux-electron-5-sandbox
...
Set SUID bit on chrome-sandbox for Debian
2019-08-16 14:31:11 +01:00
0617c1cd13
Tweak comment about upstream
2019-08-16 14:30:47 +01:00
56674ea708
Set SUID bit on chrome-sandbox for Debian
...
This tweaks Linux packages for Riot to SUID `chrome-sandbox` after install. This
is required as of Electron 5 for certain distros, such as Debian.
This change has also been provided to `electron-builder` upstream, so ideally
they'll include it in the future and this becomes redundant.
Fixes https://github.com/vector-im/riot-web/issues/10509
2019-08-16 13:34:12 +01:00
24e59ccedd
Upgrade electron-builder to 21.2.0
...
This is meant to help with:
* macOS packaging for Electron 6 (https://github.com/vector-im/riot-web/issues/10473 )
* Linux desktop file should not have quotes (https://github.com/vector-im/riot-web/issues/6421 )
It did not help with:
* Linux sandbox for Electron 5 (https://github.com/vector-im/riot-web/issues/10509 )
Fixes https://github.com/vector-im/riot-web/issues/6421
Part of https://github.com/vector-im/riot-web/issues/10473
2019-08-16 12:57:03 +01:00
0b5e79ed23
Translated using Weblate (West Flemish)
...
Currently translated at 100.0% (24 of 24 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/vls/
2019-08-16 10:08:06 +00:00
f9199f259d
Merge branch 'origin/develop' into Weblate.
2019-08-14 15:28:43 +00:00
9ed647d280
Remove t3chguy's debug lines
2019-08-14 09:28:35 -06:00
cb5bc580b0
Merge branch 'origin/develop' into Weblate.
2019-08-14 14:51:59 +00:00
3b908f4a33
Merge pull request #10551 from vector-im/t3chguy/i18n_config_default
...
Load config.json before loading language so default can apply
2019-08-14 15:51:54 +01:00
46dac869d5
Load config.json before loading language so default can apply
2019-08-14 12:29:25 +01:00
bafb0dbbfc
Merge branch 'origin/develop' into Weblate.
2019-08-12 17:19:17 +00:00
6ccecaf408
Merge pull request #10543 from vector-im/t3chguy/react16_2
...
Bump matrix-react-test-utils for React 16 compatibility
2019-08-12 18:19:13 +01:00
Michael Telatynski