yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-22 06:50:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 123 Branches 496 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derrick Mehaffy
3e2b2898f3
Update GCP host in beta docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 11:47:30 -07:00
Pierre Noël
83f847f359 change config format 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-14 18:11:24 +02:00
Jim LAURIE
a3e82f29c4
Merge pull request #6211 from strapi/docs/faqUpdateBeta 
Update FAQ for Beta Docs
 2020-05-14 17:30:36 +02:00
Derrick Mehaffy
f80021eb9f
Add note about CLI migration feature coming in stable. 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 08:14:17 -07:00
Derrick Mehaffy
58295534a3
Update FAQ for Beta Docs 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 08:11:02 -07:00
Jim LAURIE
03c2149764
Merge pull request #6150 from strapi/docs/proxy/haproxy 
Add HAProxy proxy documentation
 2020-05-14 17:02:22 +02:00
Derrick Mehaffy
0838b24f5f
Fix path and minor fix to azure desc 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 08:00:00 -07:00
Derrick Mehaffy
fbc6253d44
Temporary menu until a proper SVG can be added 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 08:00:00 -07:00
Derrick Mehaffy
f347394dfc
finish config examples for HAProxy 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:58:55 -07:00
Derrick Mehaffy
7f59027ae0
Initialize HAProxy proxying guide 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:58:55 -07:00
Jim LAURIE
98701dad6e
Merge pull request #6136 from strapi/docs/proxy/caddy 
Add Caddy proxy documentation
 2020-05-14 16:58:15 +02:00
Pierre Noël
0fe0f34895 update email settings configuration 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-14 16:56:14 +02:00
Pierre Noël
471d9ef89c move email settings from db to files 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-14 16:56:14 +02:00
Derrick Mehaffy
a599a8bad8
fix paths to match standards 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:45:13 -07:00
Derrick Mehaffy
46f04c2bdf
Add Caddy logo (Thanks to <matthew.holt@gmail.com> ) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:44:19 -07:00
Derrick Mehaffy
61e7d61af0
adjust some wording and add Caddy menu item (no icon) 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:44:19 -07:00
Derrick Mehaffy
eb0aad0a1d
Initialize Caddy proxy documentation 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:44:19 -07:00
Jim LAURIE
af4b8a6659
Merge pull request #6134 from strapi/docs/proxy/nginx 
Update Nginx proxy docs for new proxy changes
 2020-05-14 16:43:15 +02:00
Derrick Mehaffy
df59a6b5a5
PR Feedback - fix path 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:41:20 -07:00
Derrick Mehaffy
1c0cc8b25f
Update Nginx proxy docs for new proxy changes 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-05-14 07:41:05 -07:00
Jim LAURIE
cadb0ea520
Merge pull request #6180 from strapi/docs/beta/movetoGHDiscussion 
Move to Github discussions for beta docs
 2020-05-14 16:11:39 +02:00
Jim LAURIE
5bc5ee79ed
Merge pull request #6140 from louisguitton/patch-1 
Fix broken link in Heroku deployment guide
 2020-05-14 16:03:06 +02:00
Jim LAURIE
bdb4664d29
Merge branch 'master' into patch-1 2020-05-14 16:02:48 +02:00
Jim LAURIE
d10924acb7
Merge pull request #6068 from kwinyyyc/patch-1 
Update gcs file config in GAE deployment guide
 2020-05-14 11:14:13 +02:00
Jim LAURIE
a8479c3dd7
Merge branch 'master' into patch-1 2020-05-14 11:13:41 +02:00
Jim LAURIE
728ac2f32f
Merge pull request #6052 from JozefCulen/patch-1 
Updated variables in email docs
 2020-05-14 11:11:45 +02:00
Jim LAURIE
9da58872ec
Merge branch 'master' into patch-1 2020-05-14 11:11:19 +02:00
Alexandre Bodin
ec0a573cef Merge branch 'master' into develop 2020-05-14 10:45:45 +02:00
Alexandre Bodin
4fb658efe8 Merge branch 'master' of github.com:strapi/strapi 2020-05-14 10:45:35 +02:00
Alexandre Bodin
2cd1b440ca Update yarn.lock 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-14 10:45:28 +02:00
Jim LAURIE
bcb3c3277f
Merge pull request #6032 from robertpiosik/docs/plugins-graphql 
Clean GraphQL plugin docs
 2020-05-14 10:32:56 +02:00
Jim LAURIE
7d958b0e97
Merge branch 'master' into docs/plugins-graphql 2020-05-14 10:32:48 +02:00
Jim LAURIE
ea834b963f
Merge pull request #6030 from LordSimal/patch-1 
Add strapi rebuild after WYSIWYG plugin has been created and add npm/yarn commands alternatives
 2020-05-14 10:31:06 +02:00
Jim LAURIE
4c7746d3e1
Merge branch 'master' into patch-1 2020-05-14 10:30:30 +02:00
Diogo Correia
9315d62e89
Update European Portuguese translations for strapi-admin (#6022) 
* Re-order and add missing translations to "pt" locale for strapi-admin

New translations haven't been translated to Portuguese yet.

Signed-off-by: Diogo Correia <me@diogotc.com>

* Update pt translations on strapi-admin

Signed-off-by: Diogo Correia <me@diogotc.com>

* Fix small typos in the new pt locale translations for strapi-admin

Signed-off-by: Diogo Correia <me@diogotc.com>

* Update pt_PT translations with suggestions from PR #6110

Signed-off-by: Diogo Correia <me@diogotc.com>

Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-05-14 10:23:25 +02:00
Jim LAURIE
99544a7a16
Merge pull request #5893 from strapi/docs/fixLinks 
Clean up parameter and migration guide documentation and links
 2020-05-14 10:16:11 +02:00
Jim LAURIE
0bd9832ad0
Merge branch 'master' into docs/fixLinks 2020-05-14 10:16:00 +02:00
Alexandre Bodin
86edfa496d Merge branch 'master' into develop 2020-05-14 09:40:59 +02:00
Alexandre BODIN
7a5fbf6905
Merge pull request #6199 from trick0/user-count 
* added user count

Signed-off-by: Walter Cossu <walter.cossu@realt.it>

* added countSearch method to user service

* added countSearch method to user service

Signed-off-by: Walter Cossu <walter.cossu@realt.it>

* added user count

Signed-off-by: Walter Cossu <walter.cossu@realt.it>

* added user count

Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-14 09:40:19 +02:00
Alexandre BODIN
71798cf6d9
Merge pull request #6195 from strapi/chore/remove-email-config 
Remove email plugin admin files
 2020-05-14 09:38:40 +02:00
soupette
4395f72df5 Add email plugin description 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-14 01:54:36 +02:00
Walter Cossu
f5e9edb124 added user count 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 20:33:17 +02:00
Walter Cossu
26b66c6d50 Merge branch 'user-count' of https://github.com/trick0/strapi into user-count 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 20:27:12 +02:00
Walter Cossu
573d496293 added countSearch method to user service 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 20:25:46 +02:00
Walter Cossu
d139ca9591 added user count 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 20:23:54 +02:00
Walter Cossu
43a73b6f7c added countSearch method to user service 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 19:37:07 +02:00
Walter Cossu
bbb2bc235b Merge branch 'master' of https://github.com/trick0/strapi 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 19:13:23 +02:00
Walter Cossu
92299872da Merge branch 'master' of https://github.com/trick0/strapi 2020-05-13 19:10:45 +02:00
Walter Cossu
ff455cb616 added countSearch method to user service 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 19:10:05 +02:00
trick0
04337262cb Merge branch 'master' into master 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 18:33:44 +02:00