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

9899 Commits

Author SHA1 Message Date
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
Josh
12c676d2c5 fix: add dropSensitivity prop 2022-12-16 09:13:20 +00: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
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
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
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 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
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
Christian Capeans
d9b7eb1974 Convert the filesystem method calls to async 2022-12-14 13:39:10 +01: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
Ben Irvin
d1b51f0ed6 update confirmation message 2022-12-14 12:41:59 +01:00
Ben Irvin
2cfcd13ed9 fix confirm message 2022-12-14 12:39:26 +01:00
Jamie Howard
f9adde4ef3 chore(upload): CTV icon color 2022-12-14 11:20:21 +00:00
Ben Irvin
2a58152861 set constant defaults for all strategies 2022-12-14 12:18:25 +01:00
Convly
6414f4906c Handle join column on link import 2022-12-14 11:56:21 +01:00
Pierre Noël
1ea8e0ce8b
Merge pull request #15143 from strapi/fix/deadlock-innodb 
Fix all usecases where deadlocks can happen (for MySQL versions above 5 and MariaDB)
 2022-12-14 11:52:51 +01:00
GitStart
8de62f9731
Merge branch 'main' into fix/relation-title-missing-outline 2022-12-14 11:30:00 +01:00
Convly
157a812e1b Merge branch 'deits/import-entities' into deits/import-links 2022-12-14 11:19:54 +01:00
Convly
81859cf600 Fix cli export encrypted unit test 2022-12-14 11:19:38 +01:00
ivanThePleasant
809b380be6
Merge branch 'main' into chore/user-level-data 2022-12-14 11:27:39 +02:00
Simone
21ec4dac3b
Merge branch 'main' into enhancement/date-time-picker-ds-in-strapi 2022-12-14 10:13:20 +01:00
Convly
ee5f588691 Merge branch 'deits/import-entities' into deits/import-links 2022-12-14 10:07:21 +01:00
Convly
c582677d7e Merge branch 'features/deits' into deits/import-entities 2022-12-14 10:06:55 +01:00
Jean-Sébastien Herbaux
aa7de72688
Update the error message for the restore strategy update function 
Co-authored-by: Ben Irvin <ben@innerdvations.com>
 2022-12-14 10:00:48 +01:00
Convly
96a6c666fe Update typing for the engine results 2022-12-14 09:59:38 +01:00
Convly
d39c9f08b7 Instanciate strapi in the export context instead of the local strapi source provider 2022-12-14 09:48:27 +01:00
Ben Irvin
2fcc34a5c5 fix typo 2022-12-14 09:42:23 +01:00