yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-29 11:15:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,765 Commits 116 Branches 491 Tags
Commit Graph

29765 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
f85ee2f487 Fix better-sqlite3 version 2022-03-31 17:49:13 +02:00
Kai-Siang Wang
c2940f44df
Merge branch 'master' into feat/purest@4 2022-03-31 23:24:11 +08:00
Gustav Hansen
7d045baf36 Merge bulkRemove hooks into useBulkRemove() 2022-03-31 16:41:10 +02:00
Rémi de Juvigny
d8676887bf
Merge pull request #13012 from strapi/missing-plugin 
Add missing a plugin banner to the marketplace
 2022-03-31 16:31:29 +02:00
ronronscelestes
5ef109956a
Merge pull request #13010 from strapi/menu-logo/form-init 
[Menu logo] Form init
 2022-03-31 16:18:17 +02:00
Mark Kaylor
18ee563584 add Main component and remove as 2022-03-31 16:12:02 +02:00
Gustav Hansen
678f5db8a6 wip 2022-03-31 16:09:03 +02:00
Pierre Noël
f245e9dbe2 fix upload bootstrap unit test 2022-03-31 16:00:05 +02:00
Gustav Hansen
2c8050a2ba ML: Make selection work with assets and folders 2022-03-31 15:57:22 +02:00
Alexandre Bodin
c21b662f44 Merge branch 'releases/4.1.6' 2022-03-31 15:52:49 +02:00
Convly
3235b072cc Keep the package.json into the app dir 2022-03-31 15:17:13 +02:00
Mark Kaylor
119ebb46b8 fix path to hook 2022-03-31 15:01:31 +02:00
Mark Kaylor
4362e3ba18 replace box with img 2022-03-31 15:01:13 +02:00
Mark Kaylor
a30e8052e7 add tests 2022-03-31 14:54:46 +02:00
Gustav Hansen
bdf47a4314 FolderList: Render FolderCard components 2022-03-31 13:26:05 +02:00
vincentbpro
a298c243db feat(logo-customization): added validation for update project-settings 2022-03-31 13:11:19 +02:00
Pierre Noël
21d22ab3a3 forbid folder name starting or ending with a whitespace 2022-03-31 13:03:54 +02:00
Pierre Noël
8fbef82a8a fix tests 2022-03-31 13:03:53 +02:00
Pierre Noël
9bcf5a268c restructure upload controllers + add create and get folders 2022-03-31 13:03:53 +02:00
Gustav Hansen
283934a429 ML: Include folders in canRead permissions 2022-03-31 12:57:48 +02:00
Gustav Hansen
87b5035606 ML: Split main layout into folders and assets 2022-03-31 12:57:47 +02:00
ivanThePleasant
937fc9874a Finished implementing opt-in-telemetry function 2022-03-31 12:56:47 +03:00
ronronscelestes
7168f929b3 feedback review: spacing and translation 2022-03-31 11:40:53 +02:00
vincentbpro
fe984cddfe feat(logo-customization): created update project-settings route 2022-03-31 11:33:54 +02:00
Gustav Hansen
ae823e1a80
Merge pull request #13009 from strapi/dependabot/npm_and_yarn/eslint-plugin-react-hooks-4.4.0 
Bump eslint-plugin-react-hooks from 4.3.0 to 4.4.0
 2022-03-31 11:29:53 +02:00
Pierre Noël
dd36d43b52 change wording didnt to doesnt 2022-03-31 11:01:40 +02:00
Pierre Noël
7ef77c8481 refactor upload bootstrap 2022-03-31 11:01:39 +02:00
Pierre Noël
8e9c7285dd implement uploadStream wrapping for actionOptions 2022-03-31 11:01:39 +02:00
dependabot[bot]
609bec25dd Bump eslint-plugin-react-hooks from 4.3.0 to 4.4.0 
Bumps [eslint-plugin-react-hooks](https://github.com/facebook/react/tree/HEAD/packages/eslint-plugin-react-hooks) from 4.3.0 to 4.4.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/main/packages/eslint-plugin-react-hooks/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/HEAD/packages/eslint-plugin-react-hooks)

---
updated-dependencies:
- dependency-name: eslint-plugin-react-hooks
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-31 10:42:03 +02:00
ivanThePleasant
03a135678e Initial commit for opt-in-telemetry, added the command to the strapi.js 2022-03-31 11:35:33 +03:00
ronronscelestes
6c516f194f translation added 2022-03-31 10:28:58 +02:00
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