OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,714 Commits
204 Branches
553 Tags
449 MiB
Commit Graph

7714 Commits (e1205246fcf4aa5e4aa10ec5c811d408a868aeaa)

Author SHA1 Message Date
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
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
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
Travis Ralston 0b6c29d274
Merge pull request #10480 from vector-im/t3chguy/react16 
Switch to React 16
 2019-09-11 10:42:24 -06: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
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
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
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
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
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
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