7aff020d4d
Merge branch 'poljar/seshat-ui' into develop
2020-01-24 14:40:54 +01:00
192f2b8892
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:40:37 +00:00
3d804665da
Merge branch 'origin/develop' into Weblate.
2020-01-24 13:39:07 +00:00
c0558f3527
Merge branch 'poljar/seshat-filepanel' into develop
2020-01-24 14:38:20 +01:00
d6a5d701fe
Translated using Weblate (Hungarian)
...
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/hu/
2020-01-24 10:23:08 +00:00
a34507f6e1
Remove DMs flag from the config too
2020-01-23 17:15:53 -07:00
8b08ba05c2
Remove docs for new invite dialog labs feature
...
It's the default now: https://github.com/matrix-org/matrix-react-sdk/pull/3906
2020-01-22 21:16:18 -07:00
9ee7febd9b
Merge pull request #12008 from vector-im/travis/more-legal
...
Fix the remainder of the cookie links
2020-01-22 20:29:41 -07:00
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
902252ad93
v1.5.8-rc.2
2020-01-22 14:24:50 +00:00
43c35a760b
Prepare changelog for v1.5.8-rc.2
2020-01-22 14:24:49 +00:00
cd3fafb2b0
v1.5.8-rc.2
2020-01-22 14:22:40 +00:00
eb5e14661d
Actually pull in react-sdk rc.2
2020-01-22 14:20:46 +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
ebd3f0e4e1
v1.5.8-rc.1
2020-01-22 13:22:19 +00:00
5673d51cec
Prepare changelog for v1.5.8-rc.1
2020-01-22 13:22:18 +00:00
323762ffa7
v1.5.8-rc.1
2020-01-22 13:16:19 +00:00
8913eba60d
react-sdk rc.2
2020-01-22 13:06:37 +00:00
a90e56a22b
Merge pull request #11994 from vector-im/dbkr/steal-daves-webpack_rel
...
Fix webpack config (by stealing Dave's config)
2020-01-22 13:04:38 +00:00
d4e46108c4
path.resolve does joining too so path.join is redundant
2020-01-22 13:02:46 +00:00
8c103b50af
Fix webpack config (by stealing Dave's config)
...
Without doing something like this it's hard to use `yarn link`ed resources.
2020-01-22 13:02:41 +00:00
c197c2f4fd
Third try at fixing build
2020-01-22 13:02:35 +00:00
2e2e09ed2b
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-22 13:02:28 +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
e1e3bba290
ElectronPlatform: Replace the indexSize method with the getStats method.
2020-01-21 13:35:29 +01:00
e556bb242f
ElectronPlatform: Add the indexSize method.
2020-01-21 13:35:29 +01: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
024297c200
Merge pull request #11947 from vector-im/dbkr/fix_build_webpack_rel
...
Fix webpack to babel js-sdk & react-sdk but no other deps
2020-01-20 17:23:23 +00:00
db030d9733
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 17:22:21 +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
c3a5e2e5d3
react-sdk & js-sdk rc.1
2020-01-20 14:36:12 +00:00
ad8bd62ae6
bump electron version
2020-01-20 14:15:40 +00:00
Damir Jelić