yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 17:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,206 Commits 115 Branches 488 Tags
Commit Graph

13206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
01a5bd4fb4
Merge pull request #5676 from strapi/fix/upload-url-error 
Add url validation
 2020-04-01 14:04:45 +02:00
soupette
5c2221a9ed Change limit 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 13:29:03 +02:00
soupette
41b45e1fef Add url validation 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 13:25:34 +02:00
Jim LAURIE
390f72d512 docs: review concepts 2020-04-01 11:48:38 +02:00
Alexandre Bodin
ff15757685 Merge tag 'v3.0.0-beta.19.5' 
v3.0.0-beta.19.5
 2020-04-01 11:31:04 +02:00
Alexandre Bodin
8d56e0c12f v3.0.0-beta.19.5 v3.0.0-beta.19.5 2020-04-01 11:27:56 +02:00
Alexandre Bodin
f306feedd2 in dev mode use localhost has default hostname 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-01 11:14:39 +02:00
Alexandre Bodin
59332ae672 Fix host using lcoalhost not working on a lot of envs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-01 11:14:39 +02:00
cyril lopez
2830cc817e
Merge pull request #5664 from strapi/features/media-lib-upload-url 
ML/ add url upload
 2020-04-01 11:13:33 +02:00
soupette
a941a8ac51 Improve Card 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 11:02:03 +02:00
soupette
d0ae68d742 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 10:42:08 +02:00
soupette
83bea4034b Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 10:35:17 +02:00
cyril lopez
cef549cf71
Merge pull request #5642 from strapi/media-lib/front-fixes 
Media lib front fixes
 2020-04-01 10:32:55 +02:00
Ky
4590447af5 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fixes 2020-04-01 10:17:59 +02:00
soupette
b352e80236 Add tests to inputmodalstepper reducer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 10:05:00 +02:00
soupette
913e97221b Add tests to modalstepper reducer 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 09:40:05 +02:00
soupette
f933924345 Add translations 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 08:50:08 +02:00
soupette
75a04ffcc1 Add createNewFilesToDownload tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-01 08:42:50 +02:00
Chinh Do
da793ff552
Merge branch 'master' into fix/5555-quickStartGuide 2020-03-31 22:52:53 -04:00
soupette
f0cfa1da73 Add tooltip to error 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 21:46:51 +02:00
soupette
0838376071 Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 21:29:03 +02:00
soupette
edbe7a70de Add upload from url in input media 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 21:27:06 +02:00
Scott Agirs
c9d1839028
Merge branch 'master' into patch---adjust-naming-to-password-mutations 2020-03-31 14:37:27 -04:00
Ky
02af091676 clean 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-31 20:01:54 +02:00
Ky
103827fb59 PR review apply 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-31 19:56:16 +02:00
soupette
099f8e63b2 Fix tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 18:57:33 +02:00
soupette
43ab0edeb8 Add cancel fetch file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 18:54:56 +02:00
soupette
2f6cec21e3 Fix bugs 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 18:22:27 +02:00
soupette
4c0fe163b7 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 18:20:23 +02:00
soupette
243394b484 Fix existing tests 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 18:16:52 +02:00
soupette
96e0f1fd20 Add upload from url option in plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 17:54:12 +02:00
cyril lopez
40eea551f1
Merge pull request #5663 from strapi/media-lib/fix-sizes 
Fix sizes for non uploaded files (Edit file and Upload list)
 2020-03-31 17:50:34 +02:00
HichamELBSI
b6c1d79ac7 Fix sizes for non uploaded files 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-31 17:35:58 +02:00
Alexandre Bodin
6f1f774146 Refactor combineFilters 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-31 16:56:49 +02:00
cyril lopez
dc28c0e921
Merge pull request #5661 from strapi/media-lib/action-tooltip 
Add tooltip to card control actions
 2020-03-31 16:41:23 +02:00
HichamELBSI
4a475106ac Add tooltip to card control actions 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-31 16:30:55 +02:00
soupette
bf8710b12b Created input upload 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 16:28:12 +02:00
Long Nguyen
77e243f841 Refactor code convert GraphQL params to ORM conditions 
Signed-off-by: Long Nguyen <olragon@gmail.com>
 2020-03-31 16:01:39 +02:00
Long Nguyen
634592fb5b fix: GraphQL Aggregation Bookshelf where condition aren't applied to groupBy 
Signed-off-by: Long Nguyen <olragon@gmail.com>
 2020-03-31 16:01:39 +02:00
cyril lopez
72730fe9d1
Merge pull request #5660 from strapi/ml/quick-fix 
Fix fetch error
 2020-03-31 14:56:22 +02:00
soupette
de61549087 Fix fetch error 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 14:46:54 +02:00
Alexandre Bodin
168ceefa87 Add same filter logic to file count 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-31 14:32:00 +02:00
Ky
74c9caca66 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fixes 2020-03-31 12:21:42 +02:00
Alexandre Bodin
ae143ef627 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib 2020-03-31 11:58:40 +02:00
Alexandre Bodin
087920fb47 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-31 11:58:31 +02:00
Ky
b5f930d3fa Unit tests and remove useDeepCompare hook 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-31 11:57:03 +02:00
ELABBASSI Hicham
b2edf281e2
Merge pull request #5658 from strapi/media-lib/add-empty-view-results 
Add empty view with filters
 2020-03-31 11:55:16 +02:00
soupette
f62785e4cd Add empty view with filters 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-31 11:25:26 +02:00
HichamELBSI
f66804e780 Merge branch 'master' into develop 2020-03-31 10:27:55 +02:00
ELABBASSI Hicham
437d35aff8
Merge pull request #5649 from strapi/media-lib/content-manager 
Drop files in input file
 2020-03-31 10:25:02 +02:00