yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 10:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,619 Commits 121 Branches 507 Tags
Commit Graph

14619 Commits

This Branch
This Branch
All Branches
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
95f3502ab4 v3.2.0 v3.2.0 2020-10-06 11:01:02 +02:00
Alexandre BODIN
fb66ece326
Merge pull request #8165 from strapi/docs/heroku/fixDatabaseGuide 
Fix heroku guide to set database settings in proper env path
 2020-10-06 10:56:38 +02:00
Alexandre BODIN
442f38a4ba
Merge pull request #8190 from strapi/fix/graphql-pubstate 
Fix publicationState for nested populations
 2020-10-06 10:54:07 +02:00
Alexandre Bodin
fcb2878987 Use a symbol to pass options add make it work with many before fixing them 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-06 10:08:31 +02:00
Alexandre Bodin
60b52cf946 Add publicationState only if received in the args 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-06 10:08:31 +02:00
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
ab66df4369
Merge pull request #8182 from strapi/features/allow-setting-published-at-in-api 
Allow setting the published_at field in the API
 2020-10-05 20:22:23 +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
Alexandre Bodin
af8a96c18b Fix search tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 18:07:50 +02:00
Alexandre BODIN
46c7c70148
Merge pull request #8185 from strapi/graphql-publication-state-argument 
Add publicationState argument for graphql queries
 2020-10-05 17:19:36 +02:00
Alexandre Bodin
29286c8fdb Use non visible attributes as a reference for rbac fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 16:30:48 +02:00
Jean-Sébastien Herbaux
eb5a94501e
Ensure bound permissions in database (#8180) 
* Ensure bound permissions in database

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

* Refactor, handle missing fields & fix e2e tests

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-05 16:26:55 +02:00
Mégane Lacheny
6e41cf1935 Fix more typos in the Draft and Publish documentation 2020-10-05 16:24:26 +02:00
Convly
773a86ae58 Fix conflicts / params => queryArguments 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-05 16:02:44 +02:00
Alexandre Bodin
cd6894e573 Fix tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 16:00:58 +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
Alexandre Bodin
c60f826f4e Fix unit test 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 14:24:41 +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
cyril lopez
ded8bc37bb
Merge pull request #8163 from strapi/fix/remove-static-permissions 
Replace static permissions by layout and update tests
 2020-10-05 12:12:57 +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
François de Metz
645c0b8cf4
Implement deleteFile graphql mutation (#5292). (#7937) 
* Implement deleteFile graphql mutation (#5292).

Signed-off-by: François de Metz <francois@2metz.fr>

* Test if the file exist before removing it.

Signed-off-by: François de Metz <francois@2metz.fr>

* Fix a typo.

Signed-off-by: François de Metz <francois@2metz.fr>
 2020-10-05 11:34:15 +02:00
Mégane Lacheny
85f0d4c9d1 Merge branch 'releases/3.2' of github.com:strapi/strapi into releases/3.2 2020-10-05 10:38:01 +02:00
Mégane Lacheny
fd335637d0 Improve wording for Draft and Publish documentation 2020-10-05 10:36:06 +02:00
Rémi de Juvigny
6bc8662ff6
Handle template download error (#8179) 
Signed-off-by: Rémi de Juvigny <remi@hey.com>
 2020-10-05 09:41:59 +02:00
ELABBASSI Hicham
8c52046e4b
Merge pull request #8130 from strapi/dp/front-events 
Add events regarding the D&P feature
 2020-10-05 09:38:30 +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
HichamELBSI
1c2aab1f67 Replace static permissions by layout 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-10-02 19:58:50 +02:00
Jean-Sébastien Herbaux
e77679e7bb
Fix author role for the publish permission action (#8153) 
* Prevent Author role to have access to the publish permission in CE

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

* Fix CE test on role's permissions update

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

* Fix unit tests

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-02 18:34:13 +02:00
soupette
617194d715 Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-10-02 18:23:42 +02: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
Max Veerapat Kumchom
64e015f32a
add strapi-plugin-content-manager thai translation (#8143) 
* init thai template

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>

* translate strapi-plugin-content-manager

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>
 2020-10-02 17:42:34 +02:00
Max Veerapat Kumchom
ea4a607770
add strapi-admin thai translation (#8139) 
* init thai template

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>

* translate strapi-admin

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>
 2020-10-02 17:41:34 +02:00
Max Veerapat Kumchom
3b4af55d33
add strapi-plugin-email thai translation (#8140) 
* init thai template

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>

* translate strapi-plugin-email

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>
 2020-10-02 17:39:10 +02:00
Max Veerapat Kumchom
4000896823
add strapi-plugin-documentation thai translation (#8141) 
* init thai template

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>

* translate strapi-plugin-documentation

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>
 2020-10-02 17:39:02 +02:00
Max Veerapat Kumchom
915743af37
add strapi-plugin-upload thai translation (#8142) 
* init thai template

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>

* translate strapi-plugin-upload

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>
 2020-10-02 17:38:53 +02:00
Max Veerapat Kumchom
ae3491f6ea
add strapi-plugin-users-permissions thai translation (#8144) 
* init thai template

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>

* translate strapi-plugin-users-permissions

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>
 2020-10-02 17:38:45 +02:00
Max Veerapat Kumchom
212472965d
add strapi-plugin-content-type-builder thai translation (#8145) 
* init thai template

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>

* translate strapi-plugin-content-type-builder and strapi-generate-plugin

Signed-off-by: themaxaboy <themaxaboy@hotmail.com>
 2020-10-02 17:38:01 +02:00