yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-16 03:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,133 Commits 118 Branches 494 Tags
Commit Graph

36133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Madhuri Sandbhor
9171c48104
Merge pull request #15170 from strapi/audit-logs/modal-css 
[core: admin] Audit logs modal css change
 2022-12-14 09:50:58 +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
Convly
38f756e1bb Add transfer (import+export) links capabilities 2022-12-14 09:41:49 +01:00
Ben Irvin
74e11e07af
Merge branch 'features/deits' into deits/ts-workflow 2022-12-14 09:39:49 +01:00
Ben Irvin
0b835c602d
Merge branch 'features/deits' into deits/cli-tracking-events 2022-12-14 09:23:34 +01:00
Ben Irvin
dfccae5925
Merge branch 'features/deits' into deits/strategies-cleanup 2022-12-14 09:22:59 +01:00
Ben Irvin
85d0780df6
Merge branch 'main' into features/deits 2022-12-14 09:17:38 +01:00
Ben Irvin
31fada52ab remove strategies from CLI 2022-12-14 08:56:08 +01:00
gitstart
c519240a0e fix: repeatable component focus 2022-12-14 06:55:59 +00:00
Gary Alway
80ea7d835b
adds run migrations setting 2022-12-13 19:30:55 +00:00
Christian
314c1837f5
Merge pull request #15111 from strapi/protect-telemetry-properties 
Protect telemetry properties route
 2022-12-13 18:28:16 +01:00
Christian Capeans
81e1d2f831 Populate error on fail to avoid the removal of the backup directory 2022-12-13 18:19:41 +01:00
Madhuri Sandbhor
1dce8ff799 updated right prop for border radius 2022-12-13 18:04:46 +01:00
GitStart
9b429aa020
Merge branch 'main' into fix/relation-title-missing-outline 2022-12-13 17:46:10 +01:00
DMehaffy
3a579fa5f4
Merge pull request #14565 from strapi/actions/supportAutomation 
Add support team issue workflows to GH Actions
 2022-12-13 08:40:07 -08:00
gitstart
9774afd522 chore: removes redundant styles 2022-12-13 16:24:40 +00:00