30539 Commits

Author SHA1 Message Date
Mark Kaylor
9229d53ad1 Merge branch 'chore/improve-maketplace-tests' of github.com:strapi/strapi into chore/improve-maketplace-tests 2022-11-09 17:55:16 +01:00
Mark Kaylor
e06ee53c43 Add back timeout for waitFor 2022-11-09 17:54:52 +01:00
Simone Taeggi
4f3d3ad77d add todo comments for the axios instance url in the content-type-builder 2022-11-09 17:17:51 +01:00
Jamie Howard
dd26848f13 Merge remote-tracking branch 'origin/main' into fix/relations/rel-error-handling 2022-11-09 16:15:02 +00:00
Jamie Howard
6add2542e9 Merge branch 'main' into fix/relations/rel-error-handling 2022-11-09 16:11:07 +00:00
markkaylor
2d357b540c
Merge branch 'main' into chore/improve-maketplace-tests 2022-11-09 17:07:11 +01:00
Mark Kaylor
b9850900d5 Increase timeout for gh actions 2022-11-09 17:06:38 +01:00
markkaylor
6a9007fb02
Merge branch 'main' into feature/custom-field-default-options 2022-11-09 16:58:22 +01:00
Simone
49d8787e22
Merge branch 'main' into enhancement/axios-refactoring 2022-11-09 16:49:43 +01:00
Mark Kaylor
b16d10249b Reduce use of getByRole to improve performance 2022-11-09 16:22:43 +01:00
Convly
c79bce4f2d Merge branch 'features/deits' of github.com:strapi/strapi into features/deits 2022-11-09 16:09:26 +01:00
Convly
59ce604ca7 Merge branch 'main' of github.com:strapi/strapi into features/deits 2022-11-09 16:09:13 +01:00
Jamie Howard
f8f330d2e6 chore: test organisation
fix: relations existence checks
2022-11-09 15:08:06 +00:00
Jean-Sébastien Herbaux
9d6dd5ffca
Merge pull request #14819 from strapi/deits/cleanup-and-fixes
[DEITS] Misc - Cleanup / Fixes
2022-11-09 16:07:41 +01:00
dependabot[bot]
be372dfcdf
chore(deps): bump ci-info from 3.3.2 to 3.5.0
Bumps [ci-info](https://github.com/watson/ci-info) from 3.3.2 to 3.5.0.
- [Release notes](https://github.com/watson/ci-info/releases)
- [Changelog](https://github.com/watson/ci-info/blob/master/CHANGELOG.md)
- [Commits](https://github.com/watson/ci-info/compare/v3.3.2...v3.5.0)

---
updated-dependencies:
- dependency-name: ci-info
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-09 14:52:51 +00:00
Convly
33debd5701 v4.5.0 v4.5.0 2022-11-09 15:47:52 +01:00
Convly
d1c58b3a67 Update encryption unit test 2022-11-09 15:39:19 +01:00
Ben Irvin
66b944a8c5 update yarn.lock 2022-11-09 15:27:33 +01:00
Ben Irvin
914459326d fix fs errors 2022-11-09 15:27:17 +01:00
Convly
4eca5097b2 Merge branch 'features/deits' into deits/cleanup-and-fixes 2022-11-09 15:17:10 +01:00
Convly
bb7d566d42 Merge branch 'main' of github.com:strapi/strapi into features/deits 2022-11-09 15:15:28 +01:00
Ben Irvin
ff8290f4bf fix import 2022-11-09 14:29:18 +01:00
Simone
eb18d6e3a7
Merge branch 'main' into enhancement/axios-refactoring 2022-11-09 14:21:55 +01:00
Gustav Hansen
210cdb4c0c
Merge pull request #14817 from strapi/chore/home-page-corner-ornament
HomePage: Replace corner ornament with a small SVG
2022-11-09 14:10:59 +01:00
Ben Irvin
9d76323212 add HHMMSS to default filename 2022-11-09 12:39:01 +01:00
Gustav Hansen
b5e42b9970 HomePage: Replace corner ornament with a small SVG 2022-11-09 12:25:47 +01:00
Ben Irvin
5128e333c8 fix 2022-11-09 12:25:02 +01:00
Simone
c5e74fe6d5
Merge branch 'main' into enhancement/axios-refactoring 2022-11-09 11:38:35 +01:00
Ben Irvin
824d0339a2
Merge branch 'features/deits' into deits/ts-linting 2022-11-09 11:07:25 +01:00
Ben Irvin
cdb0e0f456 update 2022-11-09 11:02:35 +01:00
Gustav Hansen
70281fae37
Merge pull request #14816 from strapi/chore/brand-assets-2
Chore: Cleanup brand assets
2022-11-09 10:52:06 +01:00
Simone Taeggi
b79a83b9f1 add console logs 2022-11-09 10:35:38 +01:00
Simone Taeggi
afee29811c remove warnings 2022-11-09 10:24:11 +01:00
Simone
62c81f14ac
Merge branch 'main' into enhancement/axios-refactoring 2022-11-09 10:03:07 +01:00
Ben Irvin
e0c969a0dd use @typescript-eslint/parser for typescript 2022-11-09 09:56:05 +01:00
Alexandre Bodin
3b75fbe9d6 Fix contrib doc 2022-11-09 09:51:23 +01:00
Gustav Hansen
a3b0e905a8 Chore: Update snapshot tests 2022-11-09 09:36:21 +01:00
Gustav Hansen
b323d03b3c Chore: Cleanup brand assets 2022-11-09 09:08:25 +01:00
Simone
d5ae05ff3e
Merge branch 'main' into enhancement/axios-refactoring 2022-11-09 00:26:51 +01:00
Madhuri Sandbhor
08a93d5d4d reverting snapshots 2022-11-08 17:59:15 +01:00
Cooper Floyd
8b17039e04
Merge branch 'main' into fix/upload-alt-caption-filename 2022-11-08 10:26:20 -06:00
Madhuri Sandbhor
02939807c6 snapshots updated 2022-11-08 17:19:06 +01:00
Madhuri Sandbhor
0d47e454e4 added github stars and npm downloads sort options 2022-11-08 17:19:06 +01:00
Alexandre Bodin
511a024b1e Update contributor github workflow 2022-11-08 17:17:55 +01:00
Alexandre BODIN
fe489be1ed
Merge pull request #14808 from strapi/chore/contributing 2022-11-08 16:51:35 +01:00
Ben Irvin
3b345aa4f8
Merge pull request #14803 from strapi/deits/fix-option-encryption-key
[DEITS] Make encryption key type optional
2022-11-08 16:51:26 +01:00
Ben Irvin
528f559b19 fix filename 2022-11-08 16:23:41 +01:00
Ben Irvin
91d0961ac2 add counter to file destination provider 2022-11-08 16:04:43 +01:00
Ben Irvin
01621ab320 add counts to local strapi source provider 2022-11-08 15:47:51 +01:00
Ben Irvin
dfbf05248b throw errors instead of suppressing 2022-11-08 15:23:14 +01:00