yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 00:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,246 Commits 112 Branches 488 Tags
Commit Graph

174 Commits

Author SHA1 Message Date
Alexandre Bodin
5f7fcafc5f Fix publciationState for nested populations 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-06 10:08:30 +02:00
Alexandre Bodin
0df69c30ce Allow setting the published_at field in the API 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 14:07:17 +02:00
Alexandre Bodin
c98089ff65 Merge branch 'master' into releases/3.2 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 12:00:03 +02:00
Jean-Sébastien Herbaux
e55ea1d6b5
Hide creator fields from public api by default (#8052) 
* Add model option to hide/show creators fields in public API response

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add content-types util, rework sanitize-entity's private handling

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Update search e2e tests, fix an issue on empty search for the core-api controller (find)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix GraphQL plugin (handle privates attributes on typeDefs + resolver builds)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix sanitizeEntity import

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Move doc update from beta to stable

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix e2e test

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix pr comments

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove creator's field from upload controller routes

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix typedef build for graphql association

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix pr (comments + several issues)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add tests for search behavior in content-manager

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Rename files variables to meaningful names (upload controllers)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix test with search id matching serialNumber

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

* Add toHasBeenCalledWith check for config.get (utils/content-types.test.js)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-01 17:47:08 +02:00
Alexandre Bodin
9f00438471 Fix count queries 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-01 17:18:58 +02:00
Pierre Noël
a138695d95
fix missing hasTimestamp (#8010) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-23 17:49:28 +02:00
Pierre Noël
7221412d68 Draft publish/validators (#7853) 
* add validators for dz, components and relations

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:45:59 +02:00
Jean-Sébastien Herbaux
c4716d5668 [D&P] Return published content by default from get apis (#7657) 
* Add _publicationState request param / Returns live by default for CT that have D&P activated

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-09-22 17:39:46 +02:00
Pierre Noël
74a85c1127 Add migration d&p 2020-09-22 17:39:40 +02:00
Pierre Noël
38216554d5 Draft publish/remove some validators for drafts (#7537) 
* remove required + minLength validator for drafts

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:24 +02:00
Pierre Noël
e29c1b7de9 add published_at (#7374) 
* add published_at

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:18 +02:00
Alexandre Bodin
8b6bf7fd10 Fix core_store init first 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-27 20:26:56 +02:00
Pierre Noël
6d825fc3ca fix count with sort param 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-24 15:06:38 +02:00
Convly
20f80b2361 Better permissions-manager.sanitize behavior 
Forbid empty arrays as fields for permissions (on ability creation)
Differentiate input from output sanitizing

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:38 +02:00
Alexandre Bodin
85ea0abdc8 Add condition 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:16 +02:00
Alexandre Bodin
4edad86029 Add basic created_by updated_by 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:16 +02:00
Alexandre Bodin
966d9c554f Move hasDeepFilters to utils 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:36:26 +02:00
Alexandre Bodin
c8d743ef60 Cleanup and add tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:36:26 +02:00
Alexandre Bodin
82316bbf3a Allow or operator and working with bookshelf 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:32:44 +02:00
Pierre Noël
3084b854d4 rename attributes -> values 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:53 +02:00
Pierre Noël
8598cee8d0 fourth refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:52 +02:00
Pierre Noël
6a1d65bc37 third refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:52 +02:00
Alexandre Bodin
7c8d51d15d fix 204 issues and use strapi.db.getModelByAssoc 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:59:38 +02:00
Alexandre Bodin
ba8509eac8 Apply PR feedbacks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:59:38 +02:00
Alexandre Bodin
c6e08dcb57 Add assign permission 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:59:37 +02:00
Pierre Noël
970a470034 add tests + make role decription optional + refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:59:34 +02:00
Pierre Noël
86882a4aaa refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:58:08 +02:00
Pierre Noël
308beddb24 add DELETE /admin/roles 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:58:07 +02:00
Convly
651d42dbea fix PR comments, move pagination logic to the database layer, handle searches 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:50:44 +02:00
Convly
60b24dd3c3 Add GET /admin/users route and new pagination system 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:49:22 +02:00
Convly
1182b848dd Fix weird behavior on strapi-admin e2e tests for mongo 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:38:18 +02:00
Convly
8a69d187d0 Update models attributes & get models from the database manager 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:24 +02:00
Convly
1f3506710d Handle special scenarios where pluginName === 'admin' when retrieving models 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:16 +02:00
Pierre Noël
10092f5a57 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-01 11:59:33 +02:00
Pierre Noël
950a21469f add filtering to search route 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-06-30 15:50:52 +02:00
Abel Soares
af634b7f32
Remove options pool for non sqlite3 clients (#6469) 
Signed-off-by: abelsoares <abelbarbosasoares@gmail.com>
 2020-06-11 12:04:41 +02:00
Pierre Noël
57d7d876b7
Fix/#4513/ability to use a sub path behind a proxy (#5833) 
* add possibility to use strapi on a non-root base url path

* fix documentation password form

* use server.url and admin.url in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update doc proxy

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* move server.url location in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* add possibility to put relative urls

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* allow '/' as an admin url + refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update yarn.lock

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove default proxy option

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

* fix github provider

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* fix github login

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove files that should be here

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

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-08 13:50:00 +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
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
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
015480b1b5 Change search logic 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-30 19:47:02 +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
Alexandre Bodin
431715138a Init restricted-names API 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
45f1a1ffbe Remove idAttribute and idAttributeType options because breaks strapi 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-28 15:44:05 +02:00
Pierre Noël
17e8cba03e remove useless async 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 16:49:36 +02:00
Pierre Noël
555dbda454 fix count() result not a number 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 16:43:00 +02:00
soupette
a38c6738e1 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-04-09 09:13:10 +02:00
Alexandre BODIN
574a61de2f
Update sqlite table migration query to escape column names (#5746) 
Fix #4983

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-08 17:25:31 +02:00
Alexandre Bodin
cc9d23c3ac Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-07 20:24:39 +02:00