47d88d6b79
Fix the remainder of the cookie links
...
Fixes https://github.com/vector-im/riot-web/issues/10362
Per https://github.com/vector-im/riot-web/pull/11998#issuecomment-577329852
2020-01-22 11:55:09 -07:00
d7e47841e5
Merge pull request #12001 from vector-im/jryans/bash-docker
...
Use bash in Docker scripts
2020-01-22 17:48:57 +00:00
b6963d0e5c
Use bash in Docker scripts
...
Our Docker scripts use Bash-style conditionals that aren't supported by the
default Debian shell.
2020-01-22 17:45:22 +00:00
1b8ea4b6d7
Merge pull request #11999 from vector-im/travis/develop-docker
...
Use debian to build the Docker image
2020-01-22 10:04:01 -07:00
51a97571a0
Use debian to build the Docker image
...
Fixes not having certain OS capabilities to build some packages.
2020-01-22 09:08:05 -07:00
1d53fc41ea
Merge pull request #11998 from vector-im/t3chguy/update_config
...
Update cookie policy urls on /app and /develop config.json
2020-01-22 15:58:13 +00:00
0798945109
Update cookie policy urls on /app and /develop config.json
2020-01-22 15:49:00 +00:00
8d769dafca
Merge pull request #11996 from vector-im/t3chguy/buildkite
...
BuildKite: Only deploy to /develop if everything else passed
2020-01-22 15:25:15 +00:00
5d95a3ef7e
Only deploy to /develop if everything else passed
2020-01-22 15:04:31 +00:00
0f24950466
Merge pull request #11995 from vector-im/jryans/extra-report-content
...
Add docs for admin report content message
2020-01-22 14:25:52 +00:00
fe15d3b7c1
Add docs for admin report content message
...
Part of https://github.com/vector-im/riot-web/issues/11992
2020-01-22 14:18:29 +00:00
3036bab1c6
Merge pull request #11959 from vector-im/travis/fix-skinning
...
Load as little as possible in index.js for the skinner
2020-01-21 09:33:15 -07:00
18bdbe13b4
Merge pull request #11956 from vector-im/travis/steal-daves-webpack
...
Fix webpack config (by stealing Dave's config)
2020-01-21 10:23:15 +00:00
6835f6054b
path.resolve does joining too so path.join is redundant
2020-01-21 10:16:32 +00:00
99e1ff9477
Load as little as possible in index.js for the skinner
...
Imports are optimized to be concurrent/async by webpack, which means that when the old index.js referenced the Lifecycle from the react-sdk it caused the app to explode. This is because in another branch the Lifecycle references a class member of a skinnable component, leading to the skinner complaining that the skin hasn't been loaded.
To work around this, we've shoved all the app stuff to a new app.js file, leaving just the skinning and some early bootstrap work in the index.js
2020-01-20 19:52:11 -07:00
932c221548
Fix webpack config (by stealing Dave's config)
...
Without doing something like this it's hard to use `yarn link`ed resources.
2020-01-20 18:10:06 -07:00
3e324f6544
Merge pull request #11954 from vector-im/travis/fix/tests/jest-resolve
...
Force Jest to resolve the js-sdk and react-sdk to src directories
2020-01-20 14:38:16 -07:00
5b575d5627
Force Jest to resolve the js-sdk and react-sdk to src directories
2020-01-20 14:28:29 -07:00
be64e86cc3
Merge pull request #11949 from vector-im/dbkr/fix_webpack_build_fix
...
Fix build to not babel modules inside js/react sdk
2020-01-20 18:31:06 +00:00
42743c3ead
Third try at fixing build
2020-01-20 18:20:41 +00:00
5d8d5d70d0
Fix build to not babel modules inside js/react sdk
...
Adds 'src' to react-sdk & js-sdk babel test path so we don't run node
modules inside js & react sdk through babel
2020-01-20 18:00:38 +00:00
4c699d8001
Merge pull request #11944 from vector-im/dbkr/fix_build_webpack
...
Fix webpack to babel js-sdk & react-sdk but no other deps
2020-01-20 17:19:59 +00:00
922ed597d6
Fix webpack to babel js-sdk & react-sdk but no other deps
...
This was happening implicitly in our dev setups and the CI build
because of the comment on the last line.
2020-01-20 16:55:07 +00:00
119802d00f
Merge pull request #11934 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate
2020-01-20 10:08:45 +00:00
674adfb81e
Merge branch 'origin/develop' into Weblate.
2020-01-18 01:36:54 +00:00
342d717ff6
Merge pull request #11926 from vector-im/travis/fix-rageshake
...
Fix rageshake post-sourcemaps
2020-01-17 18:36:48 -07:00
cdd25ea45f
Fix rageshake post-sourcemaps
2020-01-17 18:27:37 -07:00
4191c51b42
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (23 of 23 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/tr/
2020-01-17 20:22:42 +00:00
e3b4f189b4
Merge pull request #11895 from vector-im/jryans/comma-yarn-start
...
Fix yarn start concurrent commands
2020-01-16 23:36:16 +00:00
8c6d6b1d09
Fix yarn start concurrent commands
2020-01-16 23:26:13 +00:00
63f8a22b34
Merge pull request #11894 from vector-im/travis/fix-reskindex
...
Run the react-sdk reskindexer for developers
2020-01-16 15:49:10 -07:00
b965188a5f
Run the react-sdk reskindexer for developers
...
See https://github.com/matrix-org/matrix-react-sdk/pull/3856 for why chokidar was updated.
2020-01-16 15:40:34 -07:00
4ca41f4971
Merge pull request #11893 from vector-im/travis/ftue/user-lists/6.1-multidialog
...
Update labs documentation for feature_ftue_dms given new scope
2020-01-16 15:07:09 -07:00
276d14dd5d
Update labs documentation for feature_ftue_dms given new scope
...
See https://github.com/matrix-org/matrix-react-sdk/pull/3854
2020-01-16 14:46:19 -07:00
9a084a6801
Merge pull request #11892 from vector-im/travis/fix-sourcemaps
...
Fix indentation on webpack config and make sourcemapped files legible
2020-01-16 12:01:32 -07:00
fb9503199d
Don't calculate sourcemaps in production
2020-01-16 11:55:54 -07:00
bb931e25d8
Make sourcemaps legible by humans
2020-01-16 11:47:16 -07:00
69d49f9881
Fix indentation of webpack config
2020-01-16 11:33:55 -07:00
6ce50435e3
Merge pull request #11891 from vector-im/jryans/cross-signing-setup
...
Remove spinner check
2020-01-16 16:42:30 +00:00
0efd7edf0c
Merge pull request #11867 from vector-im/travis/fix-ci
...
Don't minifiy builds of develop through CI packaging
2020-01-16 09:31:29 -07:00
4e37f8aa88
Merge branch 'develop' into travis/fix-ci
2020-01-16 09:25:10 -07:00
fb77bcf762
Remove spinner check
...
We may no longer see a spinner for some login paths with the changes to add a
complete security step.
Part of https://github.com/vector-im/riot-web/issues/11214
2020-01-16 16:07:49 +00:00
2652060e38
Merge pull request #11869 from vector-im/travis/jest
...
Use Jest for tests
2020-01-15 17:18:51 -07:00
3fb6b1ed63
Remove excessive sleep now that we're not using chrome
2020-01-15 15:31:08 -07:00
5cd54e9f6d
Use jsdom 14 instead of 13
2020-01-15 15:30:40 -07:00
9ab40af430
Ensure autogenned files are present for tests
2020-01-15 14:52:26 -07:00
bcda501864
Replace usages of expect.toStartWith with boolean checks
2020-01-15 14:44:46 -07:00
c70d21a92e
Force Jest to use exactly one copy of React and ReactDOM
2020-01-15 14:42:16 -07:00
5c915f3d02
Add canvas package so COLR check passes in tests
...
This is required for jsdom to do the right thing.
We also have to bump the jsdom version, but to do that we need an alternative test environment because Jest has it pinned lower.
2020-01-15 14:42:00 -07:00
f0dbc85ca5
Mock out browser-request to fix i18n
2020-01-15 14:06:55 -07:00
Travis Ralston