Commit graph

7706 commits

Author SHA1 Message Date
Weblate
4bb1c39a2e Merge branch 'origin/develop' into Weblate. 2019-09-11 16:42:29 +00:00
Travis Ralston
0b6c29d274
Merge pull request #10480 from vector-im/t3chguy/react16
Switch to React 16
2019-09-11 10:42:24 -06:00
Weblate
3627a78aed Merge branch 'origin/develop' into Weblate. 2019-09-10 17:36:39 +00:00
David Baker
89e9ac8039
Merge pull request #10810 from vector-im/nadonomy/install-guide
Update install guide
2019-09-10 18:36:35 +01:00
David Baker
58171e4479 lint 2019-09-10 18:30:02 +01:00
David Baker
b8b10e79fe Update button href dynamically
also make button a link 'cos buttons can't have hrefs
2019-09-10 18:27:57 +01:00
Nad Chishtie
845fbacd11 Update copy 2019-09-09 16:51:46 -07:00
Nad Chishtie
d1fb9c604a Add id to button 2019-09-09 16:46:53 -07:00
Nad Chishtie
27afa3af74 Update styling & remove extraneous elements and copy in mobile install guide 2019-09-09 16:40:06 -07:00
Weblate
97fa01f327 Merge branch 'origin/develop' into Weblate. 2019-09-01 15:31:38 +00:00
Travis Ralston
f97b632c65
Merge pull request #6146 from rugk/patch-1
Clarify that HTTPS is not just needed for VoIP
2019-09-01 09:31:34 -06:00
rugk
658c5b42be
Update README.md
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-09-01 13:41:21 +02:00
송태섭
141651d825 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-09-01 09:56:33 +00:00
송태섭
915a585dfa 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-31 03:56:30 +00:00
Weblate
c1352dd6bb Merge branch 'origin/develop' into Weblate. 2019-08-29 14:56:47 +00:00
Travis Ralston
435c14d822
Merge pull request #10692 from vector-im/dependabot/npm_and_yarn/eslint-utils-1.4.2
Bump eslint-utils from 1.4.0 to 1.4.2
2019-08-29 08:56:44 -06:00
dependabot[bot]
f0884b8e47
Bump eslint-utils from 1.4.0 to 1.4.2
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.4.0...v1.4.2)

Signed-off-by: dependabot[bot] <support@github.com>
2019-08-29 14:47:34 +00:00
Michael Telatynski
33c17a6f2e Switch to React 16.9
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-28 11:07:46 +01:00
Michael Telatynski
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
rugk
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
Weblate
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
Travis Ralston
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
Weblate
fdd90d1797 Merge branch 'origin/develop' into Weblate. 2019-08-26 15:16:38 +00:00
Jason Robinson
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
Peter Vágner
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
Jason Robinson
2b5fcbdcbd Provide our common integrations_widget_urls defaults for sample config
Closes #10454
2019-08-26 10:03:50 +03:00
Jason Robinson
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
Mine_My
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
Michael Telatynski
7eefc9d856 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/react16 2019-08-24 11:42:03 +01:00
Travis Ralston
3e3cd068dc Enable labs flag for develop 2019-08-23 09:19:16 -06:00
Travis Ralston
7bf1680ff8 Add docs for tabbed integration managers labs flag 2019-08-23 08:47:21 -06:00
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