yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-23 07:22:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,298 Commits 125 Branches 496 Tags
Commit Graph

23298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julie Plantey
c824230092 added test for getBreadcrumbDataCM 2022-08-01 12:05:18 +02:00
Jean-Sébastien Herbaux
ce6c3f911e
Merge pull request #13855 from strapi/fix/dz-populate-same-field-name 
Better handle populating of dynamic-zones
 2022-08-01 11:31:04 +02:00
Bassel Kanso
b218ec3997 count columns based on distinct ID 2022-08-01 12:15:05 +03:00
Jean-Sébastien Herbaux
9866d64954
Merge pull request #13747 from strapi/dependabot/npm_and_yarn/apollo-server-koa-3.10.0 
Bump apollo-server-koa from 3.1.2 to 3.10.0
 2022-08-01 10:58:08 +02:00
Julie Plantey
bdc0454cd7 breadcrumbs in ML modal - CM 2022-07-31 17:43:42 +02:00
Julie Plantey
110317b6b1 updated snapshots 2022-07-31 16:51:09 +02:00
Julie Plantey
2774384c89 breadcrumbs in upload page 2022-07-31 16:39:47 +02:00
Julie Plantey
e1dc2b8634 list.asset.load translation refacto 2022-07-31 14:56:09 +02:00
Julie Plantey
e0792e28f5 ds beta update 2022-07-31 14:50:35 +02:00
Marc
47a4486943 do not override width and height 2022-07-30 10:14:37 +02:00
ihmpavel
c8b2ee26e4
Merge branch 'strapi:master' into unify-template-variables-spacing 2022-07-30 09:33:14 +02:00
ihmpavel
fc6b01d9cd
chore: Add forgotten spaces 2022-07-30 09:16:19 +02:00
Simone Taeggi
26100eea01 evaluate the webpack.config.ts file and compile the file when we build the typescript project example 2022-07-29 16:58:21 +02:00
Gustav Hansen
b511597ea2
Merge pull request #13902 from strapi/fix/ml-assetdialog-canread 
AssetDialog: Properly take canRead permissions into account
 2022-07-29 16:40:49 +02:00
Gustav Hansen
21b95f9954
Merge pull request #13886 from strapi/feature/replace-virtualized-window 
ComponentIconPicker: Replace react-virtualized with react-window
 2022-07-29 14:34:48 +02:00
Gustav Hansen
ab3972bbc7
Merge pull request #13899 from strapi/fix/ml-bulk-action 
ML: Hide bulk actions if not assets or folders exist
 2022-07-29 14:34:22 +02:00
Gustav Hansen
7a8a3fd257 AssetDialog: Properly take canRead permissions into account 2022-07-29 14:28:59 +02:00
ihmpavel
6ae4e4a968
Merge branch 'strapi:master' into graphql-bounded 2022-07-29 13:59:20 +02:00
ihmpavel
14d215c602
chore: Unify template spacing 2022-07-29 13:45:20 +02:00
Gustav Hansen
d67128ed9f ML: Hide bulk actions if not assets or folders exist 2022-07-29 12:34:25 +02:00
Gustav Hansen
4631f9f87b
Merge branch 'master' into feature/replace-virtualized-window 2022-07-29 12:11:04 +02:00
Gustav Hansen
05c400c391 ComponentIconPicker: Replace react-virtualized with react-window 2022-07-29 12:06:28 +02:00
Gustav Hansen
6c6332a6e7
Merge pull request #13878 from strapi/fix/13868-relation-1-1-styles 
SelectOne: Fix component styles
 2022-07-28 15:44:54 +02:00
Gustav Hansen
e17d75315b
Merge pull request #13884 from strapi/fix/13868-relation-bullet-skew 
Relation: Fix skewed draft/ publish bullet indicator
 2022-07-28 15:44:35 +02:00
Bassel Kanso
cf6c08de92
Merge pull request #13838 from strapi/fix/graphql-playground 
Fix/graphql playground
 2022-07-28 15:53:04 +03:00
Gustav Hansen
954a05105f Select: Fix skewed draft/ publish bullets 2022-07-28 12:20:51 +02:00
Gustav Hansen
ad4c285d37 SelectOne: Update draft/ publish colors, fix skewed bullet 2022-07-28 12:20:24 +02:00
Gustav Hansen
9cc37f9511 chore: Remove react-select as dependency from admin 2022-07-28 11:07:29 +02:00
Gustav Hansen
6d49c90e86 SelectOne: Replace Select with ReactSelect from the helper-plugin 2022-07-28 11:07:00 +02:00
Pierre Noël
06694ec71d
Merge pull request #13871 from strapi/fix/ML-bulk-delete-without-a-folder-selected 
Fix the bulk delete of files in the Media Library
 2022-07-28 10:37:00 +02:00
Pierre Noël
1f7e485278 add e2e to bulk-delete only files and only folders 2022-07-27 18:02:47 +02:00
Pierre Noël
faa4fbaaff Fix the bulk delete in the ML when no folders are selected 2022-07-27 17:52:33 +02:00
Bassel Kanso
66502b797e
Update packages/plugins/graphql/server/bootstrap.js with a comment 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2022-07-27 17:20:02 +03:00
Bassel Kanso
5620190597 remove unneeded async from handler 2022-07-27 16:42:10 +03:00
Bassel Kanso
db1f5710e2 Merge branch 'master' into fix/graphql-playground 2022-07-27 16:34:19 +03:00
Bassel Kanso
4436f597d0 authorize /graphql route on GET by default 2022-07-27 16:33:29 +03:00
dependabot[bot]
b5802ad882
Bump knex from 1.0.4 to 1.0.7 
Bumps [knex](https://github.com/knex/knex) from 1.0.4 to 1.0.7.
- [Release notes](https://github.com/knex/knex/releases)
- [Changelog](https://github.com/knex/knex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knex/knex/compare/1.0.4...1.0.7)

---
updated-dependencies:
- dependency-name: knex
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-27 12:52:02 +00:00
dependabot[bot]
4760765da9
Bump ora from 5.4.0 to 5.4.1 
Bumps [ora](https://github.com/sindresorhus/ora) from 5.4.0 to 5.4.1.
- [Release notes](https://github.com/sindresorhus/ora/releases)
- [Commits](https://github.com/sindresorhus/ora/compare/v5.4.0...v5.4.1)

---
updated-dependencies:
- dependency-name: ora
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-27 12:51:52 +00:00
dependabot[bot]
a7271ddca1
Bump @babel/plugin-transform-modules-commonjs from 7.16.7 to 7.18.6 
Bumps [@babel/plugin-transform-modules-commonjs](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-modules-commonjs) from 7.16.7 to 7.18.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.6/packages/babel-plugin-transform-modules-commonjs)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-modules-commonjs"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-07-27 12:51:48 +00:00
Convly
74a2b908df v4.3.0 v4.3.0 2022-07-27 14:44:39 +02:00
Gustav Hansen
46fdad0de1
Merge pull request #13499 from strapi/features/ML-folder 
Media Library: Enable asset organization through folders
 2022-07-27 14:32:44 +02:00
Gustav Hansen
608c4e642f
Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 14:32:34 +02:00
Convly
b18253f8ce Merge branch 'master' into releases/4.3.0 2022-07-27 14:27:13 +02:00
Gustav Hansen
887e7b8f7c ML: Add useTracking mocks in tests 2022-07-27 14:11:22 +02:00
Jean-Sébastien Herbaux
6b447a7b67
Merge pull request #13197 from finnsnape/fix/deprecated-uuid 
Fix deprecated UUID
 2022-07-27 14:10:35 +02:00
Bassel Kanso
2eb9b6f001 avoiding auth error in graphql route 2022-07-27 14:59:55 +03:00
Gustav Hansen
39eb8abeea chore: Downgrade react-intl back to 5.20.2 2022-07-27 13:58:15 +02:00
Gustav Hansen
8f32d44b3a
Merge pull request #13862 from strapi/fix/tests-jest-26-compatible 
Upload: Make metrics tests compatible with jest@26
 2022-07-27 13:32:41 +02:00
Gustav Hansen
d886f503ca Jest: add closeTo() utility temporarily 2022-07-27 13:14:49 +02:00
Gustav Hansen
8907153d5c Merge branch 'features/ML-folder' into fix/tests-jest-26-compatible 2022-07-27 12:58:08 +02:00