yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 15:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,744 Commits 138 Branches 514 Tags
Commit Graph

4696 Commits

Author SHA1 Message Date
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
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
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
Rémi de Juvigny
122fd4a6af Move audit logs permissions to EE 2023-02-10 16:29:10 +01:00
Gustav Hansen
2682132728 Docs: Add useApiErrorHandler hook documentation 2023-02-10 13:22:05 +01:00
Gustav Hansen
8ef88457b3
Merge branch 'main' into fix/api-errors-fe 2023-02-10 12:59:37 +01:00
Gustav Hansen
a6db2ba38c
Merge pull request #15757 from GitStartHQ/fix/display-order-menuItems-multiple-relations 
fix: Sometimes the children display order is incorrect in list view
 2023-02-10 10:40:02 +01:00
Gustav Hansen
512c8582f1
Merge pull request #15769 from strapi/chore/remove-webpack-node-polyfill 
Chore: Remove node-polyfill-webpack-plugin
 2023-02-10 09:06:08 +01:00
Josh
b69e10f968
Merge pull request #15441 from strapi/chore/helper-plugin-webpack 2023-02-10 08:04:50 +00:00
gitstart
53cecc3c3c chore: adds supporting unit test for change 
Co-authored-by: raph941 <raph941@gmail.com>
Co-authored-by: oxenprogrammer <emmy1000okello@gmail.com>
Co-authored-by: gitstart_bot <gitstart_bot@users.noreply.github.com>
 2023-02-10 05:58:49 +00:00
gitstart
7ceacec66e Merge commit 'bd3f5b1ae32faa9b2896476b79f98f3152cb11f5' of https://github.com/GitStartHQ/strapi into fix/display-order-menuItems-multiple-relations 2023-02-10 05:58:45 +00:00
Gustav Hansen
f5ec2a2325 Chore: Remove node-polyfill-webpack-plugin 2023-02-09 20:01:26 +01:00
Convly
880ba7af86 Merge branch 'main' into features/data-transfer 2023-02-09 19:48:13 +01:00
Gustav Hansen
0ec4cb929d
Merge pull request #15723 from strapi/enh/helper-box 
[enh] Add Onboarding videos
 2023-02-09 18:13:17 +01:00
Gustav Hansen
d1abc78224
Merge pull request #15760 from strapi/chore/update-msw 
Chore: Update msw to 1.0.0
 2023-02-09 17:49:01 +01:00
Josh
bddd9e604c chore: update snapshots 2023-02-09 16:48:09 +00:00
Simone Taeggi
595ce31ce7 update fe snapshots 2023-02-09 14:56:28 +01:00
Gustav Hansen
0aaaa28d13 Chore: Update redux and react-redux 2023-02-09 14:51:02 +01:00
Gustav Hansen
83a16e64cc Chore: Update msw to 1.0.0 2023-02-09 14:14:19 +01:00
Gustav Hansen
3fce6f9d90 Chore: Simplify onboarding tests 2023-02-09 13:55:52 +01:00
Gustav Hansen
0eca13d479 Chore: Cleanup onboarding 2023-02-09 13:55:29 +01:00
Gustav Hansen
c6a8885fc7 Chore: Optimize onboarding preview image 2023-02-09 13:55:07 +01:00
gitstart
79bc0fadb1 fix: resolves wrong related item list order 2023-02-09 11:49:30 +00:00