yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-04 06:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,587 Commits 109 Branches 487 Tags
Commit Graph

5123 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Convly
b34d634c19 Fix format context creation 2022-07-27 15:41:24 +02: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
Convly
74a2b908df v4.3.0 2022-07-27 14:44:39 +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
Gustav Hansen
39eb8abeea chore: Downgrade react-intl back to 5.20.2 2022-07-27 13:58:15 +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
Gustav Hansen
7e3c08ba3e Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 12:57:38 +02:00
Convly
ba91f47f04 Merge branch 'master' into releases/4.3.0 2022-07-27 12:55:48 +02:00
Gustav Hansen
5ca0538651 Upload: Make metrics tests compatible with jest@26 2022-07-27 12:34:27 +02:00
Convly
2d6afbf044 Merge branch 'releases/4.3.0' into features/ML-folder 2022-07-27 10:32:43 +02:00