yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-05 15:29:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,583 Commits 112 Branches 487 Tags
Commit Graph

8993 Commits

Author SHA1 Message Date
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
Convly
e80cfe2363 Update the init check 2023-02-14 11:13:46 +01: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
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
8fae1a80ec
Merge branch 'main' into feature/async-reduce-utils 2023-02-13 16:54:25 +01:00
Jamie Howard
86c08794c5 chore(core): update all translations 2023-02-13 15:25:35 +00:00
Rémi de Juvigny
430461f493
Merge branch 'main' into enhancement/audit-logs-tracking 2023-02-13 14:53:18 +01: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
Convly
67216696a5 Update delta to indexesDifference 2023-02-13 14:40:35 +01:00
nathan-pichon
83c297e298
test(async-utils): update test titles 2023-02-13 14:11:56 +01:00
Nathan Pichon
4fdff2f350
chore(async-utils): update typo 
Co-authored-by: Pierre Noël <petersg83@users.noreply.github.com>
 2023-02-13 14:02:56 +01:00
Pierre Noël
78630d6da3
Merge pull request #12666 from alexkainzinger/master 
Upload middleware route & typo fix
 2023-02-13 12:55:14 +01:00
Pierre Noël
6a0e1ba447
Merge pull request #15752 from strapi/fix/postgres-json-string 
Fix JSON field for postgres when the value is a simple string
 2023-02-13 12:44:05 +01:00
Josh
c4e29656a5
Merge pull request #15797 from strapi/chore/remove-dead-script 2023-02-13 10:57:27 +00:00
Marc
9168768993
Merge pull request #15715 from strapi/fix/pagination-in-relations-graphql 2023-02-13 11:46:44 +01:00
Nathan Pichon
182ff6b6a6
Merge branch 'main' into feature/async-reduce-utils 2023-02-13 11:43:29 +01:00
nathan-pichon
4c5e98b338
chore(async-utils): indent 2023-02-13 11:40:51 +01:00
nathan-pichon
477750650e
fix(async): arity for reduce func and awaited value 2023-02-13 11:38:54 +01:00
nathan-pichon
5b0e7f6903
feat(utils): add reduceAsync 2023-02-13 11:38:37 +01:00
Simone
54bf43a5f2
Merge branch 'main' into enhancement/axios-migration-content-type-builder 2023-02-13 11:38:11 +01:00
Simone
5f9ea6e685
Merge pull request #15730 from strapi/enhancement/axios-migration-email 
replace axiosInstance with getFetchClient inside the email
 2023-02-13 11:37:32 +01:00
alexkainzinger
96d5279c72 fix(core): correctly handle uploads route 2023-02-13 11:25:34 +01:00
Convly
a19d73f2ac Implement a transfer flow to restrict ops 2023-02-13 11:14:30 +01:00
Simone
24328a2447
Merge branch 'main' into enhancement/axios-migration-content-type-builder 2023-02-13 11:07:19 +01:00
Josh
8709c53d33 Delete createBuildIndex.js 2023-02-13 09:33:25 +00:00
Marc
9248812218
Merge branch 'main' into fix/pagination-in-relations-graphql 2023-02-13 10:32:37 +01:00
Marc
9818b82377
Merge pull request #15693 from strapi/fix/publication-state-in-relations-graphql 
[Fix]: Graphql accept publication state argument in relations
 2023-02-13 10:26:39 +01:00
Rémi de Juvigny
2aa13b416d Fix test 2023-02-13 09:55:46 +01:00
Simone
a9d7c956eb
Merge branch 'main' into enhancement/axios-migration-content-type-builder 2023-02-13 09:38:14 +01:00
ivanThePleasant
e500f0b4d0 WIP requested changes 2023-02-12 19:16:26 +02:00