yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-24 07:50:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,691 Commits 126 Branches 496 Tags
Commit Graph

33691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
HichamELBSI
aeff7869aa Fix PR review 2020-03-31 10:05:13 +02:00
ScottAgirs
22a27b7037 Merge branch 'master' into patch---adjust-naming-to-password-mutations 2020-03-31 00:58:04 -04:00
ScottAgirs
3a1b5dbe7d [add] documentation for password mutations 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-31 00:55:35 -04:00
ScottAgirs
7305a2e20c [add] changePassword 
[refactor] changePassword > resetPassword

Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-31 00:55:35 -04:00
ScottAgirs
10667395e2 [rename] ForgotPassword > UserPersmissionsPasswordPayload 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-31 00:55:35 -04:00
ScottAgirs
8e322285d6 [add] changePassword mutation 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-31 00:55:35 -04:00
ScottAgirs
801224f2d9 [rename] changePassword > resetPassword for accuracy 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-31 00:55:35 -04:00
Alexandre Bodin
1c0e1b99ed Add docker-compose.dev file to easily work with different databases in dev mode 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Remove old files not used anymore

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Added info about conflict with local db instances and how to change port configurations

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Fix typos

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-31 00:55:35 -04:00
Chinh Do
a9ae7e24c2
Merge branch 'master' into fix/5555-quickStartGuide 2020-03-30 19:37:38 -04:00
Ky
41987c5c79 refetch on filter delete 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-31 00:18:27 +02:00
Ky
8b0f4bb994 Merge branch 'features/media-lib' of github.com:strapi/strapi into media-lib/front-fixes 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-30 23:00:49 +02:00
Ky
d9e7fd8087 modal list alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-03-30 22:54:55 +02:00
Virginie Ky
8674ed3576 filters 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-30 22:13:49 +02:00
Alexandre Bodin
f7a8d06f54 Add docker-compose.dev file to easily work with different databases in dev mode 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Remove old files not used anymore

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Added info about conflict with local db instances and how to change port configurations

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Fix typos

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 19:05:31 +02:00
HichamELBSI
210bb4985a Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-30 18:49:49 +02:00
HichamELBSI
592e44bd43 Finalize content manager media lib 2020-03-30 17:18:10 +02:00
Convly
67187c38f2 Rename _type to type and type to nonRequiredType 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-30 16:45:00 +02:00
Convly
1103d96500 Rename noRequired to nonRequired 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-30 16:45:00 +02:00