Commit Graph

7664 Commits

Author SHA1 Message Date
Travis Ralston
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
Travis Ralston
3f70c0d66d Add docs for the CIDER composer flag 2019-08-23 08:28:47 -06:00
J. Ryan Stinnett
53f7444a8e
Merge pull request #10626 from vector-im/bwindels/cider_labs
add cider composer labs flag
2019-08-23 10:26:49 +01:00
Bruno Windels
b3a660959e add cider composer labs flag 2019-08-23 10:23:09 +01:00
Travis Ralston
d2bbc57378
Merge pull request #10601 from liberodark/patch-1
Upgrade to Electron 6.0.3
2019-08-21 17:43:57 -06:00
liberodark
961369f48d
Upgrade to Electron 6.0.3
Upgrade to last Electron 6.0.3
2019-08-21 13:32:42 +02:00
J. Ryan Stinnett
dad62137c6
Merge pull request #10596 from vector-im/jryans/electron-6
Upgrade to Electron 6
2019-08-20 17:41:16 +01:00
J. Ryan Stinnett
0800faf057 Upgrade to Electron 6.0.2 2019-08-20 10:36:06 +01:00
J. Ryan Stinnett
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
J. Ryan Stinnett
a438efa4be Upgrade to Electron 6 2019-08-20 10:29:58 +01:00
David Baker
f69f852c53
Merge pull request #10591 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
2019-08-19 10:13:25 +01:00
MorbidMind
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
Weblate
01c28019ba Merge branch 'origin/develop' into Weblate. 2019-08-16 14:28:52 +00:00
RiotRobot
c65ebd5e83 Merge branch 'master' into develop 2019-08-16 15:28:33 +01:00
Weblate
d43ae7ac8e Merge branch 'origin/develop' into Weblate. 2019-08-16 14:27:57 +00:00
J. Ryan Stinnett
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
RiotRobot
4299cdfeac v1.3.3 2019-08-16 15:26:03 +01:00
RiotRobot
7a998e7ed7 Prepare changelog for v1.3.3 2019-08-16 15:26:02 +01:00
RiotRobot
8a58ba2374 v1.3.3 2019-08-16 15:23:11 +01:00
J. Ryan Stinnett
aa67a3ba2a Tweak comment about upstream 2019-08-16 15:21:59 +01:00
J. Ryan Stinnett
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
Weblate
4d9e626292 Merge branch 'origin/develop' into Weblate. 2019-08-16 13:31:15 +00:00
J. Ryan Stinnett
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
J. Ryan Stinnett
0617c1cd13 Tweak comment about upstream 2019-08-16 14:30:47 +01:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Nathan Follens
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
Weblate
f9199f259d Merge branch 'origin/develop' into Weblate. 2019-08-14 15:28:43 +00:00
Travis Ralston
9ed647d280 Remove t3chguy's debug lines 2019-08-14 09:28:35 -06:00
Weblate
cb5bc580b0 Merge branch 'origin/develop' into Weblate. 2019-08-14 14:51:59 +00:00
David Baker
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
Michael Telatynski
46dac869d5 Load config.json before loading language so default can apply 2019-08-14 12:29:25 +01:00
Weblate
bafb0dbbfc Merge branch 'origin/develop' into Weblate. 2019-08-12 17:19:17 +00:00
Michael Telatynski
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
773dd0805b Bump matrix-react-test-utils for React 16 compatibility
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-12 17:41:51 +01:00
Weblate
a5ed7b992f Merge branch 'origin/develop' into Weblate. 2019-08-09 16:02:56 +00:00
Michael Telatynski
906045b215
Merge pull request #10530 from vector-im/t3chguy/electron_help
Add --help to electron app
2019-08-09 17:02:51 +01:00
Michael Telatynski
12f087401b Add --help to electron app
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 12:08:56 +01:00
Weblate
12074a15a8 Merge branch 'origin/develop' into Weblate. 2019-08-08 19:30:42 +00:00
Travis Ralston
feb62793d2 Revert "Upgrade to babel@7 and support TypeScript"
This reverts commit 7b89893645.
2019-08-08 13:30:33 -06:00
Weblate
04419ba24b Merge branch 'origin/develop' into Weblate. 2019-08-08 19:30:22 +00:00
Travis Ralston
7b89893645 Upgrade to babel@7 and support TypeScript
See https://github.com/matrix-org/matrix-react-sdk/pull/3292

Like react-sdk#3292, this fixes the couple source files which mix imports and module exports (they can't be mixed anymore).
2019-08-08 13:30:11 -06:00
Michael Telatynski
76606256a2
Merge pull request #10503 from vector-im/t3chguy/electron_keep_alt_menu
Allow setting electron autoHideMenuBar and persist it
2019-08-06 18:20:24 +01:00
Weblate
aebcc4a631 Merge branch 'origin/develop' into Weblate. 2019-08-05 13:49:57 +00:00
RiotRobot
91fb5ae1bd Merge branch 'master' into develop 2019-08-05 14:49:18 +01:00
RiotRobot
0c438cc7a0 v1.3.2 2019-08-05 14:46:35 +01:00
RiotRobot
f82fce2bb7 Prepare changelog for v1.3.2 2019-08-05 14:46:35 +01:00
RiotRobot
634e556cfa v1.3.2 2019-08-05 14:45:02 +01:00
David Baker
f28e5f2ebb Released react-sdk 2019-08-05 14:42:39 +01:00
Weblate
a16afd7ff9 Merge branch 'origin/develop' into Weblate. 2019-08-05 11:14:17 +00:00