gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,114 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

9114 Commits

Author SHA1 Message Date
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
Michael Telatynski d347ab08e7 Merge branches 'develop' and 't3chguy/react16' of github.com:vector-im/riot-web into t3chguy/react16 2019-08-10 00:20:30 +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 6d7c4c4dd4 fix VectorCustomServerDialog props 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 18:30:08 +01:00
Michael Telatynski da9f1d1fa3 discard create-react-class, no point using it here. use React.FC 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-06 18:22:11 +01: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
RiotRobot c7b691e2d7 Merge branch 'master' into develop 2019-08-05 12:13:51 +01:00
RiotRobot 3b6acfd67d v1.3.1 2019-08-05 12:08:25 +01:00
RiotRobot 822b495f8a Prepare changelog for v1.3.1 2019-08-05 12:08:24 +01:00
RiotRobot bf2a298da7 v1.3.1 2019-08-05 12:06:10 +01:00
RiotRobot 90b26a98d3 Released js-sdk & react-sdk 2019-08-05 12:04:57 +01:00
Michael Telatynski 509839e79e Allow setting electron autoHideMenuBar and persist it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-05 11:58:16 +01:00
Alexey Murz Korepov 9f675dda2a Translated using Weblate (Russian) 
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/ru/
 2019-08-02 06:49:51 +00:00
Michael Telatynski 06e7a48aaf Switch to React 16.8 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-01 15:31:33 +01:00
J. Ryan Stinnett e577f30cb5
Merge pull request #10475 from vector-im/jryans/upgrade-deps-2019-07-31 
Upgrade dependencies
 2019-07-31 18:51:23 +01:00