yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-29 11:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 116 Branches 486 Tags
Commit Graph

5169 Commits

Author SHA1 Message Date
Gustav Hansen
4cb664dae1 CreateAction: Add component unit tests 2023-02-15 14:21:41 +01:00
Jamie Howard
04e8ed121c
Merge pull request #15692 from strapi/feature/enhance-min-max-errors 2023-02-15 13:17:07 +00:00
Gustav Hansen
d008235cf0 AdminSeatInfo: Add component unit tests 2023-02-15 14:08:09 +01:00
Julie Plantey
aac9ae316b fixes on Overview page & moved get help link 2023-02-15 12:32:08 +01:00
ivanThePleasant
c4620fd18a Merge branch 'chore/ee-seats' of https://github.com/strapi/strapi into chore/ee-seats 2023-02-15 12:01:06 +01:00
Josh
14d5597a8f
Merge pull request #15818 from strapi/feat/relations-diffing-fe 2023-02-15 10:55:45 +00:00
ivanThePleasant
d2ade473fd WIP requested server changes 2023-02-15 11:17:47 +01:00
ivanThePleasant
a874d4ee2b
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-15 12:15:05 +02:00
ivanThePleasant
87e16d578a
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-15 12:14:41 +02:00
ivanThePleasant
955b594d33
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-15 12:08:36 +02:00
Rémi de Juvigny
179b23ac41
Merge pull request #15816 from strapi/chore/dead-market-code 
Remove dead code for the install and uninstall plugin actions
 2023-02-15 11:02:52 +01:00
Rémi de Juvigny
55b19cafd4 Eliminate rogue log 2023-02-15 10:05:06 +01:00
Gustav Hansen
958268fe6d
Merge pull request #15813 from strapi/dependabot/npm_and_yarn/react-intl-6.2.8 
chore(deps): bump react-intl from 6.2.7 to 6.2.8
 2023-02-15 09:03:09 +01:00
Josh
5688497f19 feat: implement fractional indexing to reduce payload for relations 
feat(wip): add fractional _temp_keys_ on reordering

feat(wip): add temp keys to loaded relations
 2023-02-14 21:57:00 +00:00
Rémi de Juvigny
839d677c8f Remove the associated actions 2023-02-14 18:52:53 +01:00
Rémi de Juvigny
cbfc5876c7 Delete install and uninstall plugin endpoints 2023-02-14 16:04:16 +01:00
Simone Taeggi
39ac1b79b6 add confirmation dialog when deleting an API token or Transfer token 2023-02-14 15:31:32 +01:00
ivanThePleasant
1c9edc61e8
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:37:56 +02:00
ivanThePleasant
c5c3525140
Update packages/core/admin/ee/server/seat-enforcement.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:37:22 +02:00
ivanThePleasant
a05c82175d
Update packages/core/admin/server/policies/hasLicenseLimitAllowance.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:19:56 +02:00
ivanThePleasant
2a81270bf4
Update packages/core/admin/server/policies/hasLicenseLimitAllowance.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:17:51 +02:00
ivanThePleasant
516340b45a
Update packages/core/admin/server/policies/hasLicenseLimitAllowance.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 14:17:13 +02:00
ivanThePleasant
09b8fde8eb
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:55:23 +02:00
ivanThePleasant
d3e7172f6a
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:54:09 +02:00
ivanThePleasant
05e285602a
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:48:06 +02:00
ivanThePleasant
9262f5be0c
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:46:31 +02:00
ivanThePleasant
14b76d5d37
Update packages/core/admin/ee/server/services/user.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:43:32 +02:00
ivanThePleasant
ac2f0bea4d
Update packages/core/admin/ee/server/controllers/admin.js 
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
 2023-02-14 13:42:00 +02:00
ivanThePleasant
df1af817a5 Design changes 2023-02-14 13:40:21 +02:00
dependabot[bot]
fb2094cfb6
chore(deps): bump react-intl from 6.2.7 to 6.2.8 
Bumps [react-intl](https://github.com/formatjs/formatjs) from 6.2.7 to 6.2.8.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/react-intl@6.2.7...react-intl@6.2.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-14 10:24:27 +00:00
Josh
b1839335e3
Merge pull request #15810 from strapi/dependabot/npm_and_yarn/webpack-bundle-analyzer-4.8.0 2023-02-14 10:23:17 +00:00
dependabot[bot]
f9dd84ce69
chore(deps-dev): bump msw from 1.0.0 to 1.0.1 
Bumps [msw](https://github.com/mswjs/msw) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/mswjs/msw/releases)
- [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mswjs/msw/compare/v1.0.0...v1.0.1)

---
updated-dependencies:
- dependency-name: msw
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-14 10:01:28 +00:00
dependabot[bot]
e142c92e8b
chore(deps-dev): bump webpack-bundle-analyzer from 4.7.0 to 4.8.0 
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 4.7.0 to 4.8.0.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v4.7.0...v4.8.0)

---
updated-dependencies:
- dependency-name: webpack-bundle-analyzer
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-14 09:58:24 +00:00
Rémi de Juvigny
10caa4f811
Merge pull request #15788 from strapi/enhancement/audit-logs-tracking 
Track settings pages usage
 2023-02-14 10:53:19 +01:00
Rémi de Juvigny
f63adf6b48
Merge pull request #15785 from strapi/fix/ce-audit-logs 
Move audit logs permissions to EE
 2023-02-14 10:33:43 +01:00
Mark Kaylor
849f16eec6 Remove JSON default values being set by the content manager 2023-02-14 11:55:35 +05:30
ivanThePleasant
254ac92425 Part of main branch merge 2023-02-14 00:02:00 +02:00
ivanThePleasant
437690022e Merge branch 'main' into chore/ee-seats 2023-02-14 00:01:02 +02:00
ivanThePleasant
30ac15e2f0 Tests for new hooks 2023-02-13 23:52:12 +02:00
Josh
4d6c6f7756 chore: just use a span 2023-02-13 16:43:21 +00:00
nathan-pichon
f4ea7d04e3
test(admin-permissions): update snapshot 2023-02-13 16:45:25 +01:00
Jamie Howard
86c08794c5 chore(core): update all translations 2023-02-13 15:25:35 +00:00
Rémi de Juvigny
ed12768191 Copy existing handleClickOnLink 2023-02-13 14:52:40 +01:00
Rémi de Juvigny
dd4ab5bc31 Add willNavigate event to settings page menu 2023-02-13 14:47:27 +01:00
nathan-pichon
d768f26a8a
feat(review-workflow): add assert on workflow deletion 2023-02-13 11:10:40 +01:00
nathan-pichon
fae3368c53
fix(review-workflows): add data layer in update request 2023-02-13 11:06:19 +01:00
nathan-pichon
19ccc7220e
feat(review-workflow): add permissions 2023-02-13 10:49:48 +01:00
Rémi de Juvigny
2aa13b416d Fix test 2023-02-13 09:55:46 +01:00
ivanThePleasant
e500f0b4d0 WIP requested changes 2023-02-12 19:16:26 +02:00
Rémi de Juvigny
319eb47707 Track didGoToAuditLogs event 2023-02-10 17:16:33 +01:00