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
Mark Kaylor
2480d07a72 fix multiple content types 2022-04-01 17:42:15 +02:00
Gustav Hansen
3933455e6c FolderCard: remove legacy useId prefix param 2022-04-01 17:11:55 +02:00
Gustav Hansen
83cf5bee65 FolderCard: Restructure component files 2022-04-01 17:11:55 +02:00
Gustav Hansen
23ca6c41ba FolderCard: Update tests 2022-04-01 17:11:54 +02:00
Gustav Hansen
906f157115 ML: Add FolderCard component 2022-04-01 17:11:54 +02:00
Gustav Hansen
1846fd8203 ML: Simplify useAssets() and useFolders() hooks 2022-04-01 17:11:53 +02:00
Gustav Hansen
d39325f6d6 ML: Resolve ignored eslint rules 2022-04-01 17:11:53 +02:00
Gustav Hansen
eb98979ffd ML: Add useFolders() hook and tests 2022-04-01 17:11:53 +02:00
Gustav Hansen
fd4db907a1 ML: Add tests for useAssets() 2022-04-01 17:11:52 +02:00
Gustav Hansen
dfef339a79 ML: Use formatjs inline plural API, display folder count 2022-04-01 17:11:52 +02:00
Mark Kaylor
bf2851fe9f hide submit button when offline 2022-04-01 16:10:31 +02:00
solnur
9de5cb4d60 feat: add snapshot kyrgyz and tajik languages 2022-04-01 17:17:02 +06:00
solnur
0c1123b971 feat: add kyrgyz and tajik languages 2022-04-01 17:14:27 +06:00
Alexandre Bodin
b1df5a6067 Merge branch 'releases/4.1.7' 2022-04-01 09:55:43 +02:00
Mark Kaylor
5838c0619e Merge branch 'master' of github.com:strapi/strapi into features/marketplace-offline-layout 2022-04-01 09:45:35 +02:00
Gustav Hansen
260a68d8e6
Merge pull request #13018 from strapi/fix/upload-action-options 
Fix actionOptions not taking into account by the upload provider
 2022-03-31 18:02:22 +02:00
ronronscelestes
1ae79aba0f stepper and from computer init 2022-03-31 17:54:44 +02:00
Alexandre Bodin
1699aac151 v4.1.7 v4.1.7 2022-03-31 17:53:39 +02:00
Alexandre BODIN
3b1c21500b
Merge pull request #13029 from strapi/fix/better-sqlite3 
Fix better-sqlite3 version
 2022-03-31 17:51:26 +02:00
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