Commit Graph

9412 Commits (2f7b43dcfaf22caa012c86228d838c1f85c67cd4)

Author SHA1 Message Date
Resynth 2f7b43dcfa Update docker-link-repos.sh 2020-07-17 13:04:03 +01:00
Resynth 2c83458f35 Update ci_package.sh 2020-07-17 13:04:03 +01:00
Resynth dde3f93822 Update translating.md 2020-07-17 13:04:03 +01:00
Resynth ffd802f726 Update translating-dev.md 2020-07-17 13:04:03 +01:00
Resynth 55ea61b36c Update theming.md 2020-07-17 13:04:03 +01:00
Resynth 44c15df58e Update skinning thoughts.md 2020-07-17 13:04:03 +01:00
Resynth 17649dc2b1 Update review.md 2020-07-17 13:04:03 +01:00
Resynth 5d8b246ef1 Update native-node-modules.md 2020-07-17 13:04:03 +01:00
Resynth 0f159c5d77 Update memory-profiles-and-leaks.md 2020-07-17 13:04:03 +01:00
Resynth f2b9bd4c49 Update labs.md 2020-07-17 13:04:03 +01:00
Resynth bbd1974eb4 Update jitsi-dev.md 2020-07-17 13:04:03 +01:00
Resynth 6f04841e4b Update e2ee.md 2020-07-17 13:04:03 +01:00
Resynth 7c4cef614e Update config.md 2020-07-17 13:04:03 +01:00
Resynth f8ed536bb8 Update jitsi.md 2020-07-17 13:04:03 +01:00
Resynth 2657df8f3f Change Riot to Element 2020-07-17 13:04:03 +01:00
Resynth 9687575c86 Change Riot → Element in docs/feature-flags.md 2020-07-17 13:04:03 +01:00
Michael Telatynski 398033e7ce
Merge pull request #14572 from vector-im/t3chguy/devdep
Move dev dep to the right place
2020-07-17 12:11:32 +01:00
Michael Telatynski d328cab538 Move dev dep to the right place
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-17 10:36:38 +01:00
Travis Ralston da7550e0a4
Merge pull request #14552 from vector-im/dependabot/npm_and_yarn/lodash-4.17.19
Bump lodash from 4.17.15 to 4.17.19
2020-07-16 15:10:26 -06:00
dependabot[bot] eaebafc29a
Bump lodash from 4.17.15 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-16 19:40:00 +00:00
J. Ryan Stinnett c412406956
Merge pull request #14541 from vector-im/jryans/update-mobile-apps
Update all mobile links to match marketing site
2020-07-16 16:21:17 +01:00
RiotRobot dbd82c7425 Reset matrix-react-sdk back to develop branch 2020-07-16 16:20:02 +01:00
RiotRobot da5008bab1 Reset matrix-js-sdk back to develop branch 2020-07-16 16:19:49 +01:00
RiotRobot 9c9da4345b v1.7.1 2020-07-16 16:15:39 +01:00
RiotRobot eed6a01efa Prepare changelog for v1.7.1 2020-07-16 16:15:38 +01:00
RiotRobot 0159699d1b Upgrade matrix-react-sdk to 2.10.1 2020-07-16 16:13:15 +01:00
RiotRobot 1262a1ef08 Upgrade matrix-js-sdk to 7.1.0 2020-07-16 16:12:35 +01:00
Travis Ralston 8e67450477
Merge pull request #14544 from vector-im/travis/fix-sso2
Fix SSO session ID paramater
2020-07-16 08:13:58 -06:00
Travis Ralston b2d4432ba9 Fix SSO session ID paramater 2020-07-16 08:11:04 -06:00
J. Ryan Stinnett 503ea3d973 Update all mobile links to match marketing site 2020-07-16 14:42:20 +01:00
J. Ryan Stinnett efa603939b
Merge pull request #14488 from jaller94/j94/pngcrush
Run pngcrush on vector-icons
2020-07-16 14:06:25 +01:00
David Baker a1c06c5a0e
Merge pull request #14502 from vector-im/dbkr/hostinglink
Fix hosting signup link
2020-07-16 09:30:19 +01:00
Travis Ralston 8eac445ddc
Merge pull request #14513 from vector-im/travis/fix-sso
Use the right protocol for SSO URLs
2020-07-15 19:48:17 -06:00
Travis Ralston 1b60743910 Use the right protocol for SSO URLs 2020-07-15 17:05:17 -06:00
David Baker 1a49459b81 Apparently we have changed this 2020-07-15 20:04:17 +01:00
David Baker 62d1e4937c Fix hosting signup link
Fixes https://github.com/vector-im/riot-web/issues/14500
2020-07-15 19:58:34 +01:00
J. Ryan Stinnett 636529bb36
Merge pull request #14485 from jaller94/j94/fix-mstile-310-150
Fix mstile-310x150 by renaming it
2020-07-15 16:54:32 +01:00
Christian Paul 37126b3f76 Run pngcrush on vector-icons 2020-07-15 16:58:17 +02:00
Christian Paul 16726c7e16 Add pixels left and right for mstile-310x150.png to be 310x150 2020-07-15 16:54:01 +02:00
David Baker bfc62e04f0
Merge pull request #14478 from vector-im/hs/blog-and-twitter-links
Update blog and twitter links to point to Element
2020-07-15 15:01:53 +01:00
Christian Paul 2bcadfab83 Fix mstile-310x150 by renaming it 2020-07-15 15:52:29 +02:00
Will Hunt d04e0f441d
Update blog and twitter links 2020-07-15 13:23:51 +01:00
RiotRobot 7c17272c83 Reset matrix-react-sdk back to develop branch 2020-07-15 12:14:38 +01:00
RiotRobot 6886dbcbd4 Reset matrix-js-sdk back to develop branch 2020-07-15 12:14:27 +01:00
RiotRobot 15203bb32b v1.7.0 2020-07-15 12:10:02 +01:00
RiotRobot c8b8efd47a Prepare changelog for v1.7.0 2020-07-15 12:10:02 +01:00
RiotRobot e5398f4345 Upgrade matrix-react-sdk to 2.10.0 2020-07-15 12:05:47 +01:00
RiotRobot e077bea046 Upgrade matrix-js-sdk to 7.1.0 2020-07-15 12:05:31 +01:00
Travis Ralston cd18764287 Fix sample config brand 2020-07-15 04:26:26 -06:00
J. Ryan Stinnett b720c8a138 Merge remote-tracking branch 'origin/develop' into element 2020-07-15 10:35:45 +01:00