yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-14 19:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,264 Commits 116 Branches 489 Tags
Commit Graph

12264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
70a05b036b Init request edit file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 10:48:21 +01:00
Virginie Ky
df56b1769d Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-24 10:39:33 +01:00
Virginie Ky
8e273efa8d Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 2020-03-24 10:38:43 +01:00
HichamELBSI
3cb1284876 Fix select all 2020-03-24 10:31:40 +01:00
Virginie Ky
28cc83d17b get list data with formatted params 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-24 10:18:09 +01:00
HichamELBSI
998bfa9360 Merge branch 'features/media-lib-frontend' into media-lib/cm-modal 2020-03-24 09:56:55 +01:00
Josh Johnston
b7fd5f28fd Fix the order of settings in ses provider 
Why:

- because there is a default hardcoded value in options.from, the
custom value would never be used.

Signed-off-by: Josh Johnston <josh@x-team.com>
 2020-03-24 19:43:13 +11:00
Alexandre Bodin
e49caedd8e Merge branch 'master' into develop 2020-03-24 09:40:08 +01:00
soupette
b2ee121c20 Add file infos 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 09:25:19 +01:00
soupette
10c5c2d84f Add download option 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 08:48:14 +01:00
soupette
6ae7395bf0 Init edit existing file and add copy button 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 07:35:16 +01:00
soupette
664db67436 Add delete logic to modal list upload 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-24 05:54:13 +01:00
soupette
dfb9530128 Merge branch 'features/media-lib-frontend' of github.com:strapi/strapi into front/media-lib-listview 2020-03-24 05:41:02 +01:00
soupette
6d8d4482d8 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-24 05:15:56 +01:00
HichamELBSI
0044f5e7a7 Fix second review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-24 00:11:16 +01:00
HichamELBSI
f19fb580ec Update after review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-03-23 23:28:30 +01:00
Virginie Ky
21f4e9fa2d Merge branch 'features/media-lib' of github.com:strapi/strapi into front/media-lib-listview 2020-03-23 22:32:07 +01:00
Virginie Ky
efd5d95c6f Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib-frontend 2020-03-23 22:31:21 +01:00
Virginie Ky
b0612257c1 apply code review 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-23 22:30:23 +01:00
Alexandre BODIN
c55c94c7dd
Merge pull request #5547 from strapi/fix/#3889/wrongPathGenerateModelInPlugin 
fix generate:model --plugin path + little refacto of code
 2020-03-23 19:02:28 +01:00
Alexandre BODIN
57fe38c2bb
Merge pull request #5575 from strapi/media-lib/filters 
Treat mime ncontains as AND params in files list
 2020-03-23 18:05:50 +01:00
Alexandre BODIN
ea77e6c8f9
Merge branch 'master' into fix/#3889/wrongPathGenerateModelInPlugin 2020-03-23 18:05:28 +01:00
Roel Beerens
2570e27238 feat: Added missing forgotPassword, changePassword and emailConfirmation mutations/resolvers. Made a slight adjustment to the emailConfirmation controller function in Auth.js to return a UsersPermissionsLoginPayload when using GraphQL 
Signed-off-by: Roel Beerens <roel@gravity.nl>
 2020-03-23 18:02:26 +01:00
Alexandre Bodin
fa276b2447 Do not set where clause if none present. Avoids using distinct 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-23 17:47:27 +01:00
Alexandre BODIN
ce7db06ac9
Merge pull request #5578 from diogotcorreia/fix/#5577 
Make UID searchable in Mongoose and avoid errors if content type can't be searched
 2020-03-23 17:40:50 +01:00
Alexandre Bodin
d19189b626 Treat mime ncontains as AND params in files list 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-23 17:30:19 +01:00
Alexandre Bodin
72440af84b Merge branch 'develop' into features/media-lib 2020-03-23 17:28:21 +01:00
Alexandre Bodin
ab9f7d0207 Merge branch 'master' into develop 2020-03-23 17:28:09 +01:00
Diogo Correia
400893fd6a Prevent error when content type doesn't have searchable fields 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-03-23 14:36:58 +00:00
Diogo Correia
684c65ab2e Add 'UID' field search to Mongoose 
Signed-off-by: Diogo Correia <me@diogotc.com>
 2020-03-23 14:36:58 +00:00
soupette
818927f7b5 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-23 14:33:17 +01:00
Alexandre BODIN
826bb8a9f4
Merge pull request #5576 from strapi/fix/removeConsole4xx 
Remove extra logs in users-permissions
 2020-03-23 14:29:52 +01:00
soupette
18772c98b8 Merge branch 'master' of github.com:strapi/strapi into develop 2020-03-23 14:19:34 +01:00
Alexandre BODIN
3e4c9d95d0
Merge pull request #5536 from strapi/fix/#4487/filteringDataManyWayError500 
Fix deep filtering for manyWay
 2020-03-23 14:03:12 +01:00
Virginie Ky
3a539f200d confirm popup on delete 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-23 12:06:01 +01:00
Pierre Noël
39648047a7 Merge branch 'master' into fix/#4487/filteringDataManyWayError500 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 12:01:20 +01:00
Pierre Noël
0c7029c2b1 lint 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 12:00:13 +01:00
Derrick Mehaffy
8f7af83049
Remove extra console.log in users-permissions 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-23 03:50:35 -07:00
Pierre Noël
74625b0ec7 remove strapi-utils from front + remove use of idPluralized 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 11:28:07 +01:00
Alexandre BODIN
dbaa1848dd
Merge pull request #5553 from strapi/media-lib/ordering 
Keep media order set on creation
 2020-03-23 11:21:57 +01:00
Pierre Noël
be6517c02d refacto strapi-generate-* + move nameToSlug to strapi-utils 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-23 10:42:34 +01:00
Virginie Ky
847f3f1005 enable selectAll with pagination 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-23 10:40:20 +01:00
Loren
88de1fa692
Fixed sentence structure and grammatical errors. (#5507) 
* Fixed sentence structure and grammatical errors.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Fixed additional grammatical mistakes.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Fixed additional grammatical mistakes

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>

* Updated plugin link to point to beta 3.0.0 docs.

Signed-off-by: C-Climb <deathmarchtepes@gmail.com>
 2020-03-22 18:30:31 +01:00
Michael-Scott-PC
e56fa01c1c
Documentation improvements 2020-03-22 18:28:03 +01:00
Virginie Ky
94265961b4 update unit test 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-22 00:35:22 +01:00
Virginie Ky
655447e24f update generateNewFilters unit test with buffet datepicker format 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-21 22:08:05 +01:00
Virginie Ky
cac1d60139 update generateNewFilters unit test 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-21 21:55:34 +01:00
Virginie Ky
6091652b51 Unit tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-21 21:25:45 +01:00
Virginie Ky
0587843466 unit tests 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 23:19:18 +01:00
Virginie Ky
ba57f2c801 pdf icons & color 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-20 22:08:56 +01:00