Travis Ralston
264bce7ca9
Merge branch 'tmp1' into develop
2020-07-23 16:14:53 -06:00
Travis Ralston
0ada7b5d26
Update i18n
2020-07-23 16:14:37 -06:00
Travis Ralston
ae8ba13ab1
Merge pull request #14673 from vector-im/joriks/eslint-config
...
Configure eslint package and fix lint issues
2020-07-21 14:47:01 -06:00
Jorik Schellekens
9bb1f99bd9
Confiure eslint package and fix lint issues
2020-07-21 11:30:28 +01:00
J. Ryan Stinnett
6c50aa14ad
Merge pull request #14581 from resynth1943/resynth1943-patch-riot-to-element
...
Riot → Element
2020-07-21 10:46:31 +01:00
J. Ryan Stinnett
37b75eaf31
Merge branch 'develop' into resynth1943-patch-riot-to-element
2020-07-21 10:20:02 +01:00
TheEvilSkeleton
3e37f21edf
Revert "[matrix]" to "Matrix"
2020-07-20 12:42:35 -04:00
Travis Ralston
223e55de44
Merge pull request #14603 from vector-im/travis/room-list/rm-old
...
Remove labs info for the new room list
2020-07-20 06:46:19 -06:00
Resynth
622ea3ead6
Update labs.md
2020-07-18 11:07:59 +00:00
Resynth
7598942800
Update labs.md
2020-07-18 11:07:33 +00:00
Travis Ralston
ef16ef4272
Remove labs info for the new room list
2020-07-17 16:27:03 -06:00
J. Ryan Stinnett
f254a806d5
Merge pull request #14593 from vector-im/jryans/dev-mode-react
...
Convince Webpack to use development on CI
2020-07-17 16:45:07 +01:00
J. Ryan Stinnett
3f0de699f0
Clean up comments around Webpack modes
2020-07-17 14:57:48 +01:00
J. Ryan Stinnett
869c379264
Remove webpack -p option
...
This option is redundant, as it means the same as `--mode production`, and it
prevents us from tweaking the mode via `CI_PACKAGE`.
2020-07-17 14:55:01 +01:00
J. Ryan Stinnett
8ae4298637
Webpack modes also manage NODE_ENV
...
We don't need to manually define `NODE_ENV` in the Webpack config, nor do we
need to set it outside Webpack with `cross-env` either, as Webpack's modes will
take care of this for us.
2020-07-17 14:18:08 +01:00
Resynth
eac628ddcf
Update README.md
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-07-17 13:04:55 +01:00
Resynth
050b7fe4df
Update scripts/docker-link-repos.sh
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-07-17 13:04:55 +01:00
Resynth
79f70e00d0
Update scripts/ci_package.sh
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-07-17 13:04:55 +01:00
Resynth
8947f160b8
Update release.sh
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-07-17 13:04:55 +01:00
Resynth
b1cf1a2d1a
Update docs/translating.md
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-07-17 13:04:55 +01:00
Resynth
a8a6c538fa
Update docs/skinning thoughts.md
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-07-17 13:04:55 +01:00
Resynth
9be8c1c8b0
Update docs/skinning thoughts.md
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-07-17 13:04:55 +01:00
Resynth
6b317798dc
Update docs/review.md
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-07-17 13:04:55 +01:00
resynth1943
9fa8b7a9b3
Update docs/labs.md
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-07-17 13:04:44 +01:00
Resynth
d9c2b34249
Update README.md
...
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-07-17 13:04:03 +01:00
Resynth
e367690e4b
Update release.sh
2020-07-17 13:04:03 +01:00
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
TheEvilSkeleton
96f0d3a04e
Capitalize and fix [matrix]
2020-07-16 23:54:10 -04: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