yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-03 18:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,027 Commits 142 Branches 512 Tags
Commit Graph

23027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Irvin
1aec4fa0b7 allow createRegisterFunction to be wrapped 2022-07-31 17:15:36 +02:00
Marc
47a4486943 do not override width and height 2022-07-30 10:14:37 +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
Gustav Hansen
d67128ed9f ML: Hide bulk actions if not assets or folders exist 2022-07-29 12:34:25 +02:00
Ben Irvin
46ea867a27 fix conditions test 2022-07-29 12:22:22 +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
Convly
4ebc128ffb Make users-permissions auth strategy use the content API permission engine 2022-07-29 10:17:06 +02:00
Ben Irvin
526d2e9025 fix tests 2022-07-29 09:42:26 +02:00
Ben Irvin
04c9514ab7 test validate hook timing 2022-07-29 09:27:18 +02:00
Ben Irvin
525e535fdf test format.permission 2022-07-29 09:19:06 +02:00
Ben Irvin
de5c1a7f57 add todo tests 2022-07-28 19:40:43 +02:00
Ben Irvin
17036e964c test hooks 2022-07-28 19:15:40 +02:00
Ben Irvin
a59821a242 Merge branch 'api-token-v2/engine-abstraction' into api-token-v2/engine-abstraction-tests 2022-07-28 18:38:14 +02:00
Ben Irvin
f4a594e9c9 add tests 2022-07-28 18:33:02 +02:00
Ben Irvin
a8cfa42a70 add more examples 2022-07-28 17:51:03 +02:00
Ben Irvin
078fb244a8 add helper functions 2022-07-28 17:50:44 +02:00
Convly
43e360a641 Fix format permission handler argument 2022-07-28 17:05:29 +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
Ben Irvin
8ec0977584 add initial tests 2022-07-28 13:16:14 +02: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
Convly
80713eddff Merge branch 'api-token-v2/engine-abstraction' of github.com:strapi/strapi into api-token-v2/engine-abstraction 2022-07-28 11:57:52 +02:00
Convly
1453bc0d67 Fix light typings issues 2022-07-28 11:57:40 +02:00
Jean-Sébastien Herbaux
18301960d3
Update packages/core/permissions/README.md 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2022-07-28 11:37:03 +02:00
Convly
0eaa5d2915 Merge branch 'features/api-token-v2' into api-token-v2/engine-abstraction 2022-07-28 11:36:23 +02:00
Convly
0a1cc38e06 Merge branch 'master' into api-token-v2/engine-abstraction 2022-07-28 11:36:01 +02:00
Convly
5291691d47 Merge branch 'master' into features/api-token-v2 2022-07-28 11:35:51 +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
9692c6fa8f Merge branch 'master' into features/api-token-v2 2022-07-27 17:01:11 +03:00
Convly
3fa282be30 Merge branch 'master' into api-token-v2/engine-abstraction 2022-07-27 15:46:54 +02:00
Bassel Kanso
5620190597 remove unneeded async from handler 2022-07-27 16:42:10 +03:00
Convly
b34d634c19 Fix format context creation 2022-07-27 15:41:24 +02: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