yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,984 Commits 129 Branches 498 Tags
Commit Graph

12984 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ky
def471ef5f apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 14:46:17 +02:00
Ky
c02abe90fc rename const 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 01:07:26 +02:00
Ky
18ac81057b Merge branch 'develop' of github.com:strapi/strapi into front/media-lib-loader 2020-05-05 00:54:56 +02:00
Ky
03d86c53fc split media lib HomePage into compos 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 00:52:47 +02:00
Alexandre BODIN
6419a4e664
Merge pull request #5927 from strapi/chore/strapi-database-lifecycle 
Chore/strapi database lifecycle
 2020-05-04 17:34:58 +02:00
Alexandre Bodin
b928013e43 Cleanup code and doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 17:27:09 +02:00
Alexandre Bodin
9cb850e212 Merge branch 'master' into develop 2020-05-04 12:19:51 +02:00
Alexandre BODIN
225ffecd7c
Merge pull request #6009 from strapi/fix/4919/deletingContentTypeBreaksUploadRefsMongo 
Prune obsolete files relations on startup
 2020-05-04 12:17:26 +02:00
Convly
a615f16bb5 Move orm condition directly into the pruneObsoleteRelations query 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-05-04 11:27:52 +02:00
Convly
8a2050add0 Apply PR feedback and fix tests 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-05-04 11:11:23 +02:00
Convly
4046e4227c Assign type value directly in configurator properties 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-05-04 11:11:23 +02:00
Convly
079ad89781 Prune obsolete files relations on startup 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-05-04 11:11:22 +02:00
Alexandre Bodin
a78c8e4636 Add tests for lifecycles calls 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 10:55:09 +02:00
Alexandre Bodin
c364fcd0e2 Move lifecycles to sub field and added documentation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 10:55:08 +02:00
Alexandre Bodin
1edc581864 Remove lifecycles from connectors 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 10:55:08 +02:00
Alexandre Bodin
ed060e2cea Add arguments to after hook 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 10:55:08 +02:00
Alexandre Bodin
9ddeaffed1 Use a wrapper to cleanup 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 10:55:07 +02:00
Alexandre Bodin
de5d1d6d54 Add other hooks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 10:55:07 +02:00
Alexandre Bodin
ebee707ec4 Add basic proto of lifecycles 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 10:55:06 +02:00
Ky
8c4cb54d23 apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-04 10:50:53 +02:00
Ky
0ab5a8d994 Merge branch 'develop' of github.com:strapi/strapi into front/media-lib-loader 2020-05-04 10:49:54 +02:00
Alexandre Bodin
3b40bcee59 Merge branch 'master' into develop 2020-05-04 10:49:30 +02:00
Alexandre Bodin
3bf7947aa0 Remove dead code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 10:31:09 +02:00
Lucas
ff2dbb3865
Uninstall plugin: function to delete folder with files (#5874) 
Signed-off-by: Łukasz Matuszewski <lucas.matuszewski@gmail.com>
 2020-05-04 10:14:56 +02:00
Alexandre BODIN
839c51011a
Merge pull request #5991 from strapi/fix/4813/searchDoesntAlwaysWork 
Change search logic
 2020-05-04 10:11:13 +02:00
Ky
fec831fe22 update snapshots 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-03 23:53:07 +02:00
Ky
15710264ef Merge branch 'front/media-lib-loader' of github.com:strapi/strapi into front/media-lib-loader 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-03 22:26:55 +02:00
Ky
bf5a1ac90f update buffetjs dependencies 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-03 22:22:49 +02:00
Pierre Noël
8d3303014f remove test password 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-04-30 19:47:04 +02:00
Pierre Noël
e0e561e6d0 add test for escapeQuery() 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-04-30 19:47:04 +02:00
Pierre Noël
7c837cde6c refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-04-30 19:47:03 +02:00
Pierre Noël
115600f1aa search for mongodbId if the query is a mongodbId 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-04-30 19:47:03 +02:00
Pierre Noël
ee73715d8e update yarn.lock 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-04-30 19:47:02 +02:00
Pierre Noël
015480b1b5 Change search logic 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-30 19:47:02 +02:00
Alexandre BODIN
9414eb717b
Merge pull request #6007 from kabaros/pg-pool-settings 
Preserve pool setttings when there is a schema
 2020-04-30 17:45:07 +02:00
cyril lopez
d5b989121e
Merge branch 'develop' into front/media-lib-loader 2020-04-30 17:16:57 +02:00
cyril lopez
600a01694c
Merge pull request #6005 from strapi/fix/reserved-names 
Reserved names api call
 2020-04-30 15:47:10 +02:00
kabaros
149c1f7737 Preserve pool setttings when there is a schema 
In the case where this is a schema defined, `options.pool` is reassigned ignoring the object constructed in a previous step (only preserving min and max, but not the other values such as `createTimeoutMillis` etc...  This change is to keep the other values intact.

Signed-off-by: mozafar <kabaros@gmail.com>
 2020-04-30 14:35:14 +01:00
HichamELBSI
4b286aedf6 Reserved names api call 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-30 15:14:22 +02:00
Alexandre Bodin
0c0b65ecf2 Update with feedbacks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
fe2a683f9f Only check used names on creation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
d67d731ea9 Add alreadyUse and forbidden content type check on name 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
a0c87af098 Fix test, add missing global 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
7e41e28bf8 Add checks for timestamps attributes to avoid conflicts with timestamps option 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
42c149e8bc Add reserved name check 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
431715138a Init restricted-names API 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
cyril lopez
0060b90a01
Merge pull request #5083 from strapi/front/ui-improvements 
Front/ui improvements
 2020-04-30 13:40:56 +02:00
Ky
10018ada82 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-30 12:00:34 +02:00
Ky
db7b8655b5 apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-30 11:56:09 +02:00
Alexandre Bodin
4f1900638d Change autoOpen default value 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 09:58:39 +02:00