yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-27 10:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 116 Branches 490 Tags
Commit Graph

24134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ronronscelestes
e3fd6ec601 Merge branch 'features/menu-logo' of https://github.com/strapi/strapi into menu-logo/form-init 2022-03-31 10:09:48 +02:00
Vincent
223d7c4580
Merge pull request #12971 from strapi/menu-logo/project-settings-permission 
feat(menu-logo): added a permission for project level settings
 2022-03-31 10:07:53 +02:00
Mark Kaylor
9dba223ec6 add custom styles 2022-03-30 18:22:11 +02:00
Rémi de Juvigny
2e90570a4f Remove duplicate banner 2022-03-30 16:52:47 +02:00
Rémi de Juvigny
96c3b2e61f Update tests 2022-03-30 16:49:00 +02:00
Rémi de Juvigny
98a303f1e0 Add missing a plugin banner 2022-03-30 16:48:34 +02:00
Gustav Hansen
c83babe779
Merge pull request #13006 from strapi/fix/components-date-main-field 
Allow date fields to be selected as component main fields
 2022-03-30 16:41:38 +02:00
Gustav Hansen
bd40d30797
Merge pull request #12975 from strapi/fix/nested-components-errors 
RepeatableComponent: Fix error messages when component is nested
 2022-03-30 16:31:12 +02:00
cyril lopez
973cf6796b
Merge pull request #12977 from strapi/typescript/fix-ctb-reload 
Fix CTB reloading state
 2022-03-30 16:29:29 +02:00
ronronscelestes
7ec27ffca2 Merge branch 'features/menu-logo' of https://github.com/strapi/strapi into menu-logo/form-init 2022-03-30 16:26:21 +02:00
Alexandre Bodin
f25774168c v4.1.6 v4.1.6 2022-03-30 15:34:12 +02:00
ronronscelestes
3f908902b7
Merge pull request #12969 from strapi/menu-logo/configurations-provider 
[Menu logo] Configurations Provider
 2022-03-30 15:31:04 +02:00
Alexandre Bodin
249e28793d Update yarn.lock 2022-03-30 15:24:28 +02:00
Gustav Hansen
bb83bee732
Merge pull request #13005 from strapi/fix/list-view-media-relation-id 
DynamicTable: Show id for media and relations in components
 2022-03-30 12:49:48 +02:00
Gustav Hansen
7b4c17dc14 CellContent: improve truthy check and do not rely on isNumber 2022-03-30 12:03:46 +02:00
Alexandre BODIN
82467380b0
Merge pull request #13008 from strapi/dependabot/npm_and_yarn/vscode/sqlite3-5.0.8 
Bump @vscode/sqlite3 from 5.0.7 to 5.0.8
 2022-03-30 11:57:40 +02:00
Gustav Hansen
5202fb10d1 FieldComponent: Stop forwarding isNested to RepeatableComponents 2022-03-30 11:36:44 +02:00
ronronscelestes
60b6a1c743 updated branch + updated ApplicationInfosPage tests 2022-03-30 11:27:32 +02:00
ronronscelestes
fc0b6fdebb Merge branch 'menu-logo/configurations-provider' of https://github.com/strapi/strapi into menu-logo/form-init 2022-03-30 11:04:46 +02:00
dependabot[bot]
d04911e21f
Bump @vscode/sqlite3 from 5.0.7 to 5.0.8 
Bumps [@vscode/sqlite3](https://github.com/mapbox/node-sqlite3) from 5.0.7 to 5.0.8.
- [Release notes](https://github.com/mapbox/node-sqlite3/releases)
- [Changelog](https://github.com/mapbox/node-sqlite3/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mapbox/node-sqlite3/commits)

---
updated-dependencies:
- dependency-name: "@vscode/sqlite3"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-30 09:04:23 +00:00
ronronscelestes
6f591874dd feedback refacto v2 2022-03-30 10:58:02 +02:00
ivanThePleasant
15e2b96fc6 Improved logic for tests to pass 2022-03-30 11:54:06 +03:00
Mark Kaylor
b5ff583430 move useNavigatorOnLine hook 2022-03-30 10:45:10 +02:00
soupette
8c9be85ffe Fix PR feedback 
Signed-off-by: soupette <cyril@strapi.io>
 2022-03-30 09:33:45 +02:00
ivanThePleasant
675c19219b Reverted admin telemetry changes and rewrote it for an easier approach 2022-03-30 10:25:18 +03:00
ivanThePleasant
6e08bc2045 Revert "Added telemetry disable logic to the admin panel events" 
This reverts commit c6307ece6357737a5c7afdc60169672b6122c617.
 2022-03-30 10:19:28 +03:00
Gustav Hansen
c3383c63b1 RepeatableComponent: Simplify error handling and fix all nesting levels 2022-03-30 08:34:41 +02:00
Gustav Hansen
1f811ed9a7 RepeatableComponent: Fix error messages when component is nested 2022-03-30 08:34:41 +02:00
Gustav Hansen
25db315e28 DynamicTable: Show id for media and relations in components 2022-03-30 08:32:44 +02:00
Kai-Siang Wang
16286c919e update purest to 4.0.2 for security 2022-03-30 13:59:12 +08:00
Kai-Siang Wang
7443c433f2 fix: solve github return undefined 2022-03-30 13:57:50 +08:00
Kai-Siang Wang
95879d9c17 feat: upgrade purest package to v4 2022-03-30 13:57:49 +08:00
Gustav Hansen
6d04c64efb Allow date fields to be selected as component main fields 2022-03-29 19:39:29 +02:00
Alexandre BODIN
b2fa446947
Merge pull request #12918 from strapi/chore/knex-v1 
Make strapi compatible with knex v1
 2022-03-29 19:34:45 +02:00
ivanThePleasant
ab69f2bde1 Adjusted admin tests to reflect changes with telemetry 2022-03-29 20:18:13 +03:00
Mark Kaylor
ef8091821f replace function with variable 2022-03-29 17:21:06 +02:00
Mark Kaylor
fc59c6e2ea rename component 2022-03-29 17:06:54 +02:00
vincentbpro
146d9e4e9c test: update e2e permission snapshots 2022-03-29 16:55:04 +02:00
Gustav Hansen
f05ce9b317
Merge pull request #12972 from strapi/fix/cm-list-number 
CM: Fix displaying number fields in the DynamicTable
 2022-03-29 16:31:20 +02:00
Mark Kaylor
4d90bd850a use dumb header component 2022-03-29 16:25:46 +02:00
Gustav Hansen
97f51652bb
Merge pull request #12632 from strapi/CONTENT-47/uid-error-message 
EditViewDataManagerProvider: Handle API errors independently from yup
 2022-03-29 16:24:50 +02:00
Alexandre BODIN
ea116c2036
Merge pull request #13001 from strapi/dependabot/npm_and_yarn/minimist-1.2.6 
Bump minimist from 1.2.5 to 1.2.6
 2022-03-29 16:11:48 +02:00
vincentbpro
47dc3ce9e3 test: update e2e permission snapshots 2022-03-29 15:56:23 +02:00
Alexandre BODIN
e3b36a075a
Merge pull request #13000 from strapi/dependabot/npm_and_yarn/node-forge-1.3.0 
Bump node-forge from 1.2.1 to 1.3.0
 2022-03-29 15:54:09 +02:00
ivanThePleasant
c6307ece63 Added telemetry disable logic to the admin panel events 2022-03-29 16:49:29 +03:00
Alexandre Bodin
2791a2a5ae Merge branch 'master' into chore/knex-v1 2022-03-29 15:49:00 +02:00
Gustav Hansen
28bb1da2a6
Merge pull request #13002 from strapi/fix/prettier-all 
Chore: Prettify all files
 2022-03-29 15:15:14 +02:00
cyril lopez
7524309d9f
Merge pull request #12846 from strapi/feat/folder-card-component 
ML: Add FolderCard component
 2022-03-29 15:13:10 +02:00
Gustav Hansen
8aaaff77d4 Chore: Prettify all files 2022-03-29 14:20:41 +02:00
dependabot[bot]
d06282164e
Bump minimist from 1.2.5 to 1.2.6 
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-29 12:12:32 +00:00