OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,793 Commits
215 Branches
561 Tags
462 MiB
Commit Graph

7793 Commits (6094b8be9a9d6b042b1c4278b0455358cf158f36)

Author SHA1 Message Date
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
J. Ryan Stinnett 67e31e0e30 Upgrade dependencies 2019-07-31 17:46:02 +01:00
RiotRobot 8c32957957 v1.3.1-rc.1 2019-07-31 16:55:49 +01:00
RiotRobot 2a16cf220e Prepare changelog for v1.3.1-rc.1 2019-07-31 16:55:49 +01:00
RiotRobot 964c1922cd v1.3.1-rc.1 2019-07-31 16:54:03 +01:00
RiotRobot 61228d112e Upgrade to JS SDK 2.3.0-rc.1 and React SDK 1.5.0-rc.1 2019-07-31 16:52:52 +01:00
David Baker 5fe8443ff4
Merge pull request #10436 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-07-29 09:33:58 +01:00
Le Dang Trung 5599b37b59 Translated using Weblate (Vietnamese) 
Currently translated at 95.8% (23 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/vi/
 2019-07-29 08:29:27 +00:00
Valeh Farzaliyev 83e4dadcfe Translated using Weblate (Azerbaijani) 
Currently translated at 62.5% (15 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/az/
 2019-07-29 08:29:27 +00:00
Weblate 8ba05ce126 Merge branch 'origin/develop' into Weblate. 2019-07-26 14:26:41 +00:00
Travis Ralston 11c0e982b2
Merge pull request #10418 from vector-im/travis/features 
Describe our existing features better in documentation
 2019-07-26 08:26:36 -06:00
Brian J cb988c505d Translated using Weblate (Swedish) 
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/sv/
 2019-07-25 22:49:21 +00:00
Valeh Farzaliyev 762f027e2e Translated using Weblate (Azerbaijani) 
Currently translated at 41.7% (10 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/az/
 2019-07-25 22:49:21 +00:00
Travis Ralston 83da5e6004 Update references to features 2019-07-25 14:53:53 -06:00
Travis Ralston ec9309edcd Update feature references 2019-07-25 14:52:20 -06:00
Weblate d1c80de9c8 Merge branch 'origin/develop' into Weblate. 2019-07-23 09:02:11 +00:00
J. Ryan Stinnett 55e2f18d1e
Merge pull request #10392 from vector-im/jryans/electron-5 
Upgrade to Electron 5
 2019-07-23 10:02:05 +01:00
J. Ryan Stinnett 88e8fbb39a Upgrade to Electron 5 
The APIs related to custom protocols went through some changes for Electron 5.x,
so adjusts Riot's usages to match.

I have scanned the Electron 5.x release notes, and I can't see anything else
that requires immediate changes. Things appear to be working well after the
upgrade.

Fixes https://github.com/vector-im/riot-web/issues/10296
Fixes https://github.com/vector-im/riot-web/issues/9562
 2019-07-22 15:38:08 +01:00