yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-30 11:45:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,960 Commits 113 Branches 491 Tags
Commit Graph

12960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Alexandre Bodin
528071173d Add logger defaults options 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 09:57:23 +02:00
Ky
56fc6a3264 ctb component booleanbox alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 23:49:27 +02:00
Ky
5574345a2d Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-29 16:22:57 +02:00
Alexandre Bodin
0fa1d561cc Readd default host in getstarted 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 16:22:22 +02:00
cyril lopez
e79daadb5a
Merge pull request #5990 from strapi/fix/remove-password-from-data 
Remove password field from the retrieved data
 2020-04-29 16:19:24 +02:00
Ky
62f434b31a update snapshots 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 16:00:13 +02:00
Ky
ec71ed2c92 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 15:45:30 +02:00
Ky
8a75ba4c34 CTM editview alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 15:28:16 +02:00
soupette
0758260d2b Change file ext 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-29 13:52:53 +02:00
soupette
1aff8b361b Change file ext 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-29 13:52:45 +02:00
Alexandre BODIN
a7436e2248
Merge pull request #5747 from strapi/chore/new-config 
Chore/new config
 2020-04-29 12:12:43 +02:00
Alexandre BODIN
6cc5fc55dc
Merge pull request #5988 from strapi/chore/remove-idAttribute-broken-option 
Remove idAttribute and idAttributeType options because breaks strapi
 2020-04-29 12:12:29 +02:00
Ky
c11cc6ab97 apply design review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 11:47:38 +02:00
soupette
b9bd8085d6 Fixes #5992 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-29 11:34:12 +02:00
Alexandre Bodin
55b977dc52 Review updates 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:24:05 +02:00
Alexandre Bodin
2d80ced7f5 Revert chagnes made on alpha doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:45 +02:00
Alexandre Bodin
dbda1cc254 Fix wrong behavior of env helper with defautl values 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:44 +02:00
Alexandre Bodin
da910b0b39 Fix create new project cli option for mongo not handled correctly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Fix typos

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

Add tests for env helpers

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

Typo

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:44 +02:00
Alexandre Bodin
789e29e2c5 Updated deployment doc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:43 +02:00
Alexandre Bodin
2e31afe6dd Upgrade doc to use env var and js config files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:43 +02:00
Alexandre Bodin
3d071f5869 Use static paths 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:43 +02:00
Alexandre Bodin
0ed90fd2f1 Use default host and port 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:42 +02:00