yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-09 01:07:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 115 Branches 488 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc
e1ef09142a
Merge branch 'main' into dependabot/npm_and_yarn/pg-8.8.0 2022-12-16 14:57:31 +01:00
Ben Irvin
c6c1350997 comment out tests 2022-12-16 14:57:15 +01:00
Julie Plantey
80626a65c8 fixed table displayed without assets or folders in BrowseStep + added a test case 2022-12-16 14:54:13 +01:00
Pierre Noël
2f8565ea81
Merge branch 'main' into dependabot/npm_and_yarn/nodemailer-6.8.0 2022-12-16 14:47:53 +01:00
Julie Plantey
775777fae2 Merge branch 'main' of https://github.com/strapi/strapi into features/MediaLibrary-listview 2022-12-16 14:35:24 +01:00
Christian Capeans
7118bd30cb Fix failing tests 2022-12-16 14:11:34 +01:00
Rémi de Juvigny
6c061e152b Sanitize emitted auth events 2022-12-16 12:18:07 +01:00
Josh
3799a38a6a fix: change confirmation to confirm 
confirmation password is not correct english
 2022-12-16 11:10:14 +00:00
Jamie Howard
ab66578671
Merge pull request #15176 from strapi/fix/ui-nested-repeatable-components 2022-12-16 10:47:44 +00:00
Ben Irvin
32a96eee23 remove deepPopulateQuery 2022-12-16 11:47:29 +01:00
Shaun Brown
aaeff44a7d add -k to strapi export 2022-12-16 09:39:39 +00:00
Marc
d7a243de23
Merge branch 'main' into dependabot/npm_and_yarn/pg-8.8.0 2022-12-16 10:16:49 +01:00
Josh
12c676d2c5 fix: add dropSensitivity prop 2022-12-16 09:13:20 +00:00
Marc-Roig
ca52f1ea78 update yarn lock 2022-12-16 10:09:16 +01:00
Julie Plantey
3e01e639d3
Merge pull request #15069 from radoslavzeman/radoslavzeman/improve-sk-translations 
improve SK translations
 2022-12-16 08:25:05 +01:00
Hasta
b0966d23d8
Merge branch 'main' into main 2022-12-15 21:05:34 +01:00
DMehaffy
6f9b106ec7
Merge pull request #15189 from strapi/security/qsupgrade 
Update qs to fix CVE-2022-24999
 2022-12-15 12:19:56 -07:00
Josh
2d6650ca55 fix: pass an id to manually manage "isDragging" 2022-12-15 17:06:22 +00:00
derrickmehaffy
e09614c9a4 Update qs to fix CVE-2022-24999 2022-12-15 09:49:40 -07:00
gitstart
5800c1ed0d fix: update to loading attribute on save button 2022-12-15 15:41:38 +00:00
derrickmehaffy
392995837c Update for v3 EOL 2022-12-14 14:47:38 -07:00
Christian Capeans
ea127978b6 Merge branch 'features/deits' into deits/import-assets 2022-12-14 19:19:37 +01:00
Convly
62626cd878 Merge branch 'main' into features/deits 2022-12-14 17:53:31 +01:00
Rémi de Juvigny
46ac677b5b Return inline object 2022-12-14 17:47:54 +01:00
Jean-Sébastien Herbaux
5ce8fee113
Merge pull request #15178 from strapi/deits/run-yarn-before-clean 2022-12-14 17:46:20 +01:00
Jean-Sébastien Herbaux
9ef712e7be
Merge pull request #15153 from strapi/deits/import-entities 2022-12-14 17:45:00 +01:00
Rémi de Juvigny
fb73cb6df5 Process audit log events 
Co-authored-by: markkaylor <mark.kaylor@strapi.io>
Co-authored-by: Fernando Chávez <fc9chavez@gmail.com>
 2022-12-14 17:42:24 +01:00
Jean-Sébastien Herbaux
0ae21c4bce
Update comment for the links export in the strapi source provider 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2022-12-14 17:32:21 +01:00
gitstart
b68008afc1 chore: focus on new added item only 2022-12-14 16:02:08 +00:00
gitstart
d0edb8978d Merge commit '8716ecc920130db5341b0904cf868c6e6b581a5d' of https://github.com/GitStartHQ/strapi into fix/add-button-repeatable-components 2022-12-14 16:02:04 +00:00
GitStart
2297b70a5b
Merge branch 'main' into fix/application-crash-on-filter-delete 2022-12-14 16:22:45 +01:00
Julie Plantey
f3f6163c23 Merge branch 'main' of https://github.com/strapi/strapi into features/authLogo 2022-12-14 16:15:45 +01:00
Jamie Howard
85ecd814c2 test(content-manager): api test for single types with locale=all 2022-12-14 15:14:53 +00:00
Convly
c0c3365ad8 Update yarn.lock 2022-12-14 15:55:15 +01:00
dependabot[bot]
4a5aaa2986
chore(deps): bump nodemailer from 6.7.7 to 6.8.0 
Bumps [nodemailer](https://github.com/nodemailer/nodemailer) from 6.7.7 to 6.8.0.
- [Release notes](https://github.com/nodemailer/nodemailer/releases)
- [Changelog](https://github.com/nodemailer/nodemailer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodemailer/nodemailer/compare/v6.7.7...v6.8.0)

---
updated-dependencies:
- dependency-name: nodemailer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-14 14:45:42 +00:00
Simone
42e54e07a6
Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-12-14 15:44:07 +01:00
Marc-Roig
1dc0f93876 add content manager relations reordering tests 2022-12-14 15:40:27 +01:00
Convly
8716ecc920 v4.5.4 v4.5.4 2022-12-14 15:39:30 +01:00
gitstart
b005514928 chore: adds inline comments 2022-12-14 13:48:16 +00:00
gitstart
f3664d53b4 Merge commit 'af0cd00b2862212486d3e6c6fd3ab16e1e6f63ea' of https://github.com/GitStartHQ/strapi into fix/add-button-repeatable-components 2022-12-14 13:48:13 +00:00
Convly
4547b2ae6f Run yarn install before yarn clean 2022-12-14 14:29:21 +01:00
Simone Taeggi
036ba34579 Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-12-14 14:27:53 +01:00
Simone Taeggi
6c8b34f2fd add the SelectButtonTitle prop to the DateTimePicker 2022-12-14 14:26:23 +01:00
Julie Plantey
af0cd00b28
Merge pull request #15164 from GitStartHQ/fix/relation-title-missing-outline 
fix: Relations are missing a focus outline on a single item title
 2022-12-14 14:18:37 +01:00
Jamie Howard
f1de66d9d3 test(i18n): entity-service-decorator.findMany 2022-12-14 13:10:12 +00:00
Christian Capeans
d9b7eb1974 Convert the filesystem method calls to async 2022-12-14 13:39:10 +01:00
Jamie Howard
d758bca243 chore(strapi): revert entity service changes 2022-12-14 12:38:57 +00:00
Jamie Howard
26c083a220 fix(content-manager): handle complex component nesting in the UI 2022-12-14 12:26:28 +00:00
ivanThePleasant
fc781681a3
Merge pull request #14083 from strapi/chore/user-level-data 
Chore/user level data
 2022-12-14 13:56:22 +02:00
Simone Taeggi
412533434c Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-12-14 12:55:56 +01:00