Commit Graph

8185 Commits

Author SHA1 Message Date
Weblate 1ce1c16a05 Merge branch 'origin/develop' into Weblate. 2019-09-12 15:05:05 +00:00
Bruno Windels e1205246fc
Merge pull request #10844 from vector-im/bwindels/document-disable_custom_urls
document disable_custom_urls
2019-09-12 15:05:01 +00:00
Bruno Windels b809343cb6 line wrap 2019-09-12 17:04:24 +02:00
Bruno Windels d6e0f33fdb
document disable_custom_urls 2019-09-12 12:34:48 +00:00
RiotRobot eaf3bdbf34 Merge branch 'master' into develop 2019-09-12 13:26:17 +01:00
Weblate 488e9d5396 Merge branch 'origin/develop' into Weblate. 2019-09-12 12:24:25 +00:00
RiotRobot ceb1fcb6c1 v1.3.4 2019-09-12 13:21:14 +01:00
RiotRobot 2a28fa9774 Prepare changelog for v1.3.4 2019-09-12 13:21:14 +01:00
RiotRobot 6588d0e4bb v1.3.4 2019-09-12 13:17:55 +01:00
RiotRobot 5a6e889bd4 Released js-sdk & react-sdk 2019-09-12 13:16:26 +01:00
Nad Chishtie d69642922e Remove extraneous content & styles. Style improvements. 2019-09-12 12:14:39 +01:00
Weblate 8ef132bece Merge branch 'origin/develop' into Weblate. 2019-09-12 09:23:35 +00:00
Szimszon eafd1e52c4 Translated using Weblate (Hungarian)
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/hu/
2019-09-12 09:23:35 +00:00
David Baker 11d7e1e185
Merge pull request #10838 from vector-im/nadonomy/install-guide-part-deux
Install guide tweaks
2019-09-12 10:23:30 +01:00
Nad Chishtie 634141637b Remove extraneous content & styles. Style improvements. 2019-09-11 16:08:24 -07:00
RiotRobot 32e2d97941 v1.3.4-rc.1 2019-09-11 18:57:45 +01:00
RiotRobot a40d13af76 Prepare changelog for v1.3.4-rc.1 2019-09-11 18:57:45 +01:00
RiotRobot 75aa1e02e5 v1.3.4-rc.1 2019-09-11 18:56:33 +01:00
RiotRobot 03b5b622d0 js-sdk & react-sdk rc.1 2019-09-11 18:48:59 +01:00
David Baker a75c0eca36
Merge pull request #10831 from vector-im/dbkr/install_guide_2
Update install guide
2019-09-11 18:33:39 +01:00
David Baker cebec03ed6 lint 2019-09-11 18:31:19 +01:00
David Baker 3c62829525 Update button href dynamically
also make button a link 'cos buttons can't have hrefs
2019-09-11 18:31:19 +01:00
Nad Chishtie ae18186290 Update copy 2019-09-11 18:31:19 +01:00
Nad Chishtie a3a042aff8 Add id to button 2019-09-11 18:31:19 +01:00
Nad Chishtie cc4e595b9d Update styling & remove extraneous elements and copy in mobile install guide 2019-09-11 18:31:19 +01:00
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