yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-25 01:49:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,619 Commits 114 Branches 486 Tags
Commit Graph

1558 Commits

Author SHA1 Message Date
Ralph
b35b8f72b3
AWS Cognito provider (#6917) 
Add login provider AWS Cognito

Signed-off-by: ralphsomeday
 2020-10-06 11:45:22 +02:00
Alexandre Bodin
48b138e81c Merge branch 'master' into documentation 2020-10-06 11:06:24 +02:00
Alexandre BODIN
44894ce220
Merge pull request #8183 from strapi/3.2/docs 
Draft & Publish documentation
 2020-10-05 20:16:04 +02:00
Derrick Mehaffy
b8bd0b7b56 PR feedback from Megane 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-10-05 10:05:57 -07:00
Mégane Lacheny
6e41cf1935 Fix more typos in the Draft and Publish documentation 2020-10-05 16:24:26 +02:00
Convly
0951e45d12 Add publicationState argument for graphql queries 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-05 15:56:30 +02:00
Mégane Lacheny
05494c50b5 Fix typos + Improve Draft and Publish documentation explanations 2020-10-05 15:54:42 +02:00
Mégane Lacheny
e870d21686 Change order of Draft and Publish file in documentation TOC 2020-10-05 15:43:08 +02:00
Mégane Lacheny
b005cd2082 Add note about roles and permissions for Draft and Publish documentation 2020-10-05 15:41:11 +02:00
Mégane Lacheny
b11171fec6 Add Edit icon in Draft and Publish documentation 2020-10-05 15:19:54 +02:00
Jim LAURIE
bc16fda42a docs: Add FA icons 2020-10-05 14:40:51 +02:00
Mégane Lacheny
4ff007e911 Add screenshots for Draft and Publish documentation 2020-10-05 12:03:38 +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
Mégane Lacheny
235b2ef326 Fix Caution message in Draft and Publish documentation 2020-10-05 11:44:21 +02:00
Mégane Lacheny
063b779548 Add Caution about relations with non-published contents for Draft and Publish documentation 2020-10-05 11:41:07 +02:00
Mégane Lacheny
fd335637d0 Improve wording for Draft and Publish documentation 2020-10-05 10:36:06 +02:00
Mégane Lacheny
ac5918946a Update TOC with Draft and Publish 2020-10-04 20:47:38 +02:00
Mégane Lacheny
dc94bdbcd5 Create new file for Draft and Publish documentation + Write first draft 2020-10-04 20:46:30 +02:00
Derrick Mehaffy
2ac93e24b4 Fix heroku guide to set database settings in proper env path 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-10-02 13:43:33 -07:00
Wes Bos
65308ae2cd
Provide docs on how to use the auth with graphql (#8154) 
* Provide docs on how to use the auth with graphql

* Update graphql.md
 2020-10-02 09:16:34 -07:00
Alexandre BODIN
e379a87378
Merge pull request #7907 from cotapon/patch-3 
LeftMenuHeader Path FIX
 2020-10-02 17:36:55 +02:00
Wes Bos
5afa8bbe44
Add docs for sorting graphql queries (#8155) 2020-10-02 17:35:51 +02:00
Thew Dhanat
620f84a962
Update configurations.md (#8150) 
Signed-off-by: ThewBear <26767607+ThewBear@users.noreply.github.com>
 2020-10-02 06:42:51 -07:00
Alexandre Bodin
66e8579fc7 Merge branch 'master' into features/templates-cli 2020-10-02 15:21:16 +02:00
Convly
4844ba9ebe Merge branch 'master' into documentation 2020-10-02 11:57:51 +02:00
Alexandre Bodin
0e064d10e8 Merge branch 'master' into features/templates-cli 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-02 10:20:10 +02:00
Dave Judd
ac06194953
Fix grammar (#8126) 
Change "...you can access to every..." to "...you can access every...:"
 2020-10-01 08:47:29 -07: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
8589848ce4 Merge branch 'features/draft-publish' into releases/3.2 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-01 16:23:32 +02:00
Maxime Castres
34f143827c
Docs/integrations (#7792) 
* 5 new integrations

* More integrations

Signed-off-by: Maxime Castres <mcastres@student.42.fr>

* AUpdate Nuxt.js --amend --signoff

* Add 11ty

Signed-off-by: Maxime Castres <mcastres@student.42.fr>

* Correction after soupette's review

* Correct python file

* Alex review

* Alex review 2: replace console.error to log
 2020-09-30 14:52:14 +02:00
Rémi de Juvigny
5726c36edf Fix yarn lock conflict 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-30 11:19:20 +02:00
Mattias van den Belt
c5275958b0
Per hook timeout config option (#8081) 
* Add per hook timeout config

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>

* Update hook docs with timeout config options

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-09-29 16:07:10 +02:00
Alexandre BODIN
2741cfc372
Merge pull request #7942 from Igi4/patch-1 
Fix incorrect PostgreSQL data path in example doc
 2020-09-29 15:00:42 +02:00
erictsangx
1e4c3b7237
Allow browser options while using watch-admin (#8054) 
Signed-off-by: erictsangx <erictsangx@gmail.com>
 2020-09-29 14:12:38 +02:00
Jim LAURIE
451d551f27
Merge pull request #7720 from danilopolani/patch-1 
Fix documentation about unit testing
 2020-09-28 17:09:14 +02:00
Jim LAURIE
693ca6ec7b
Merge pull request #8030 from strapi/docs/links/forum 
Add forum to header links on docs
 2020-09-28 14:56:40 +02:00
Mattias van den Belt
82ad488ea4
Update upload.md (#8045) 
Add popularity sorting parameter to provider list link.

Signed-off-by: MattieBelt <mattiasvandenbelt@gmail.com>
 2020-09-28 11:25:52 +02:00
Pierre Noël
e566e6389d
Merge branch 'documentation' into patch-1 2020-09-25 16:48:19 +02:00
kotake_satoshi
567b02c215 Update customization.md 
Signed-off-by: kotake_satoshi <cotapon@gmail.com>
 2020-09-25 17:08:04 +09:00
Derrick Mehaffy
63e02724c2 Add forum to header links on docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-09-24 07:01:46 -07:00
Alexandre BODIN
2e24b6f864
Merge pull request #8011 from strapi/forum 
Update all references from GHD to Forum
 2020-09-24 15:15:29 +02:00
Alexandre Bodin
4a27d9d46b Merge branch 'master' into documentation 2020-09-24 14:55:21 +02:00
Diego Albitres
0670c896e3
Add privateAttributes to global and per model response (#7331) 
* Added privateAttributes globally and per model

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added tests for sanitizeEntity

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed broken test

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added privateAttributes to GraphQL responses

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added docs for privateAttributes

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Refactored and fixed PR comments

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Merged tests and fixed broken tests from merge

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Updated documentation for new option

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Refactored GraphQL implementation

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed PR comments

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed tests for sanitize-entity

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Removed code and tests for ignorePrivateFor

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Exported getPrivateAttributes for GraphQL plugin

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Removed ignorePrivateFor from docs

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>
 2020-09-24 09:40:10 +02:00
Simon Appelt
8254aca5f2
Bugfix to last commit 2020-09-23 18:35:16 +02:00
Simon Appelt
c9fe16d38c
Update services.md 
I updated the code so it looks more like the strapi internal implementation.
https://github.com/strapi/strapi/blob/master/packages/strapi/lib/services/entity-service.js#L65
 2020-09-23 18:31:29 +02:00
Alexandre Bodin
90761175f6 Merge branch 'master' into features/draft-publish 2020-09-23 18:19:26 +02:00
Derrick Mehaffy
7ecf2d74b8 Update all references from GHD to Forum 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-09-23 08:49:42 -07:00
Rémi de Juvigny
3b0e02fe00 Autofix yarn.lock conflict 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-09-23 14:25:55 +02:00
Adam
94f3b24ee2
feat(server): allow listening on unix socket through server.socket config (#7824) 
* feat(server): allow listening on unix socket through `server.socket` configuration

Signed-off-by: Adam Lee <duo1123@gmail.com>

* docs(server): documentation for socket config

Signed-off-by: Adam Lee <duo1123@gmail.com>
 2020-09-23 11:59:31 +02:00
Simon Appelt
510556b5b5
Update services.md 
Added entityValidator to create and update service, so it act like the default service and doesn't throw a 500 Error on invalid data.
 2020-09-23 09:34:38 +02:00