yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-23 16:19:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,134 Commits 121 Branches 490 Tags
Commit Graph

24134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Convly
e1a02f9bc6 Merge branch 'typescript/types/schema' into typescript/schema-types-generation 2022-06-03 14:47:10 +02:00
Convly
4329381635 Add missing Strapi scalar types to attributes definitions 2022-06-03 14:47:00 +02:00
Convly
887a703b74 Merge branch 'typescript/types/schema' into typescript/schema-types-generation 2022-06-03 14:31:27 +02:00
Convly
c2aba34289 Merge branch 'features/typescript' into typescript/types/schema 2022-06-03 14:31:11 +02:00
Convly
a4c9488dce Update snapshots 2022-06-03 14:29:57 +02:00
Convly
c01d96252b Merge branch 'master' of github.com:strapi/strapi into features/typescript 2022-06-03 14:26:56 +02:00
Convly
5f54aaafa3 Add email 2022-06-03 14:25:52 +02:00
Convly
00798bf89f Fix whitespaces 2022-06-03 13:56:24 +02:00
Convly
9ba2456127 Fix issues on relation and uid types 2022-06-03 13:56:16 +02:00
Convly
f44171bac4 Expose global Strapi namespace to @strapi/strapi 2022-06-03 13:55:56 +02:00
Convly
3995c8cd27 Add dedicated command to generate schemas types 2022-06-03 13:54:35 +02:00
Alexandre Bodin
086aecb9e7 Update snapshot 2022-06-03 12:58:53 +02:00
Alexandre Bodin
720f05ad48 Merge branch 'master' into fix/up-fixes 2022-06-03 10:07:51 +02:00
Alexandre BODIN
43ac9e1430
Merge pull request #13450 from strapi/fix/CVE-2021-46708 
Fix CVE-2021-46708
 2022-06-03 10:03:02 +02:00
Alexandre BODIN
0d8254e460
Merge pull request #13449 from strapi/fix/cve-2022-29256 
Fix CVE-2022-29256
 2022-06-03 10:02:03 +02:00
Gustav Hansen
ec42375ee4 BulkMoveDialog: Simplify form submission 2022-06-03 09:33:04 +02:00
Gustav Hansen
b47e510918 BulkMoveButton: Remove legacy effect 2022-06-03 09:29:46 +02:00
Gustav Hansen
6fe8603e04 BulkMoveButton: Remove stray eslint ignore rule 2022-06-03 09:28:21 +02:00
DMehaffy
0309b36671
Fix CVE-2021-46708 2022-06-02 11:54:01 -07:00
DMehaffy
2ea34d2790
Fix CVE-2022-29256 
CVE Details: https://github.com/advisories/GHSA-gp95-ppv5-3jc5

Low sev as it requires your build env to be vuln but it's a quick fix.
 2022-06-02 11:29:21 -07:00
ronronscelestes
b3e3f4c999 variables for assetCount and folderCount in BrowseStep 2022-06-02 19:44:26 +02:00
Alexandre Bodin
aa01d844e0 Continue documenting 2022-06-02 19:41:49 +02:00
ronronscelestes
76dcdb3239 added divider between FolderList/AssetList, fixed list UI for BrowseStep 2022-06-02 19:38:26 +02:00
Gustav Hansen
f97f7d7e8d
Merge pull request #13426 from strapi/ML-folder/folder-search 
[ML Folder] ML search folders
 2022-06-02 16:54:50 +02:00
Alexandre Bodin
573d56bc30 Improve doc merge and start documentation of U&P 2022-06-02 15:52:47 +02:00
Gustav Hansen
5bd5245e4e BulkMoveButton: Improve test description 2022-06-02 15:50:04 +02:00
ronronscelestes
f1ac87cb4a fix and improved MediaLibrary tests 2022-06-02 14:43:51 +02:00
Gustav Hansen
efae412816 BulkMoveButton: Improve tests 2022-06-02 14:36:45 +02:00
Gustav Hansen
822d8fbd78
Merge branch 'features/ML-folder' into features/ML-folder-bulk-move-ui 2022-06-02 14:20:05 +02:00
Gustav Hansen
e49ff9f4ef
Merge pull request #13431 from strapi/ML-folder/edit-asset-folder-structure 
[Ml folder] Fix edit asset
 2022-06-02 13:20:08 +02:00
ronronscelestes
75e2d7b3c7 Merge branch 'features/ML-folder' of https://github.com/strapi/strapi into ML-folder/folder-search 2022-06-02 12:50:37 +02:00
ronronscelestes
81bf27b0b4 fix feedback loading translation 2022-06-02 12:42:13 +02:00
ronronscelestes
ce926543bf fixed test does not display folders if the current page !== 1 2022-06-02 12:33:49 +02:00
Gustav Hansen
9af873aa9d
Merge pull request #13379 from strapi/ML-folder/folder-card-refactor 
[ML Folder] FolderCard refactor
 2022-06-02 11:07:19 +02:00
Pierre Noël
14edc5216a
Merge pull request #13446 from strapi/ML-folder/merge-master 
Ml folder/merge master
 2022-06-02 09:52:24 +02:00
ronronscelestes
3bb1230321 Merge branch 'features/ML-folder' of https://github.com/strapi/strapi into ML-folder/folder-search 2022-06-02 08:59:25 +02:00
Alexandre Bodin
bdf2e13290 Init docs fix 2022-06-01 23:12:16 +02:00
Alexandre Bodin
f7f9ecc898 Fix check login before checking status 2022-06-01 20:35:43 +02:00
Alexandre Bodin
bb5500fe0b Remove console.log 2022-06-01 20:13:57 +02:00
Alexandre Bodin
70b05b5e9b Fix twitter provider 
Co-authored-by: kwang1198
Please enter the commit message for your changes. Lines starting
 2022-06-01 20:05:01 +02:00
ronronscelestes
15f202c6bb fixed count translation and updated MediaLibrary/BrowseStep tests 2022-06-01 19:20:12 +02:00
Alexandre Bodin
64852e9cda Allow query params for /me 2022-06-01 19:11:18 +02:00
Pierre Noël
0f7c73243f Merge branch 'master' into features/ML-folder 2022-06-01 18:00:51 +02:00
Alexandre Bodin
291e2b6835 Cleanup email confirmation api 2022-06-01 17:59:30 +02:00
Pierre Noël
98c8b53604
Merge pull request #13444 from strapi/fix/yup-strapiID 
Fix yup strapiID not working
 2022-06-01 17:14:48 +02:00
Alexandre Bodin
e42e6444d7 Refactor providers and cleanup auth code 2022-06-01 16:22:19 +02:00
Gustav Hansen
513bb21076 BulkMoveButton: Add tests 2022-06-01 15:01:46 +02:00
Gustav Hansen
e3f05dac7d BulkDeleteButton: Add tests 2022-06-01 14:44:42 +02:00
Pierre Noël
2a72a2fdd0 fix yup strapiID not working 2022-06-01 14:30:30 +02:00
Gustav Hansen
bde377e700 BulkActions: add tests 2022-06-01 14:24:38 +02:00