yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,159 Commits 121 Branches 507 Tags
Commit Graph

13159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre BODIN
b4f168963d
Merge pull request #6226 from caiojhonny/patch-1 
documentaiton typo
 2020-05-25 14:57:36 +02:00
Alexandre BODIN
efe40dc3ac
Merge pull request #6313 from epegzz/patch-2 
Fix typo
 2020-05-25 14:56:45 +02:00
Alexandre BODIN
1980dafa06
Merge pull request #6315 from strapi/jwtconfig 
Add JWT configurations
 2020-05-25 14:55:42 +02:00
Caio Jhonny
71fb8156a7
Merge branch 'master' into patch-1 2020-05-25 12:04:39 +02:00
Alexandre BODIN
2b22675edc
Merge pull request #6321 from strapi/ui/logo 
Change the logo
 2020-05-22 15:54:21 +02:00
HichamELBSI
1f0f96e46b Change the logo 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-05-22 15:35:08 +02:00
Caio Jhonny
a3ee191d5a
Merge branch 'master' into patch-1 2020-05-22 12:49:20 +02:00
Jim LAURIE
fc4cef9926 fix: fix pr feedback 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-05-22 10:34:38 +02:00
Jim LAURIE
16c304d710 Merge branch 'master' of github.com:strapi/strapi into jwtconfig 2020-05-22 10:22:14 +02:00
Daniel Schäfer
3f0a67234d
Fix typo 2020-05-21 19:56:22 +02:00
Alexandre BODIN
a358d87a68
Merge pull request #6293 from strapi/fix/policy-find-case-insensitive 
Fix global policies case sensitive
 2020-05-20 14:16:40 +02:00
Alexandre BODIN
688311173a
Merge pull request #6291 from strapi/fix/ctb 
Fix ctb react-select ui
 2020-05-20 14:08:47 +02:00
Alexandre Bodin
82c6240111 Fix global policies case sensitive 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-20 14:07:57 +02:00
soupette
633744a29c Fix ctb react-select ui 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-20 12:09:55 +02:00
Caio Jhonny
6467384d0d Add missing comma 
Signed-off-by: Caio Jhonny <caiojhonnyp@gmail.com>
 2020-05-20 10:18:10 +02:00
yvesdo
d754c2b102
Update README.md 2020-05-19 19:43:24 +02:00
Alexandre BODIN
f1116160ad
Merge pull request #6012 from mkqavi/fix/local-upload-url-encoding 
Fix url encoding for local upload provider
 2020-05-19 13:40:18 +02:00
Alexandre BODIN
9f5844949d
Merge pull request #6124 from frosato-dev/master 
Prevent user registration with confirmed status
 2020-05-19 13:21:58 +02:00
François Rosato
37e97d6219 Prevent user registration with confirmed status 
Pull request https://github.com/strapi/strapi/pull/6072 aimed to add security by preventing creation of user with email confirmation enabled. By limiting user params to 'username', 'email', 'password', the current code do not allow adding custom field to user entity during registration which may breaks existing applications that have added required custom fields into user model .

Signed-off-by: François Rosato <francois.rosato@ekino.com>
 2020-05-19 11:52:45 +02:00
Jim LAURIE
f775f85bcd
Merge pull request #6254 from strapi/1-click-buttons-readme 
Add 1 click buttons in the README.md
 2020-05-18 19:10:43 +02:00
Maxime Castres
00768bd1bd
Align buttons 2020-05-18 19:09:21 +02:00
Maxime Castres
b907750a50
Add 1 click buttons on the README.md 2020-05-18 18:54:26 +02:00
Alexandre Bodin
1ab5afc33d Merge branch 'develop' v3.0.0-rc.1 2020-05-18 09:55:53 +02:00
Alexandre BODIN
95b7e94d45
Merge pull request #6210 from strapi/feature/moveEmailConfigInFiles 
Move email config in files
 2020-05-18 09:55:26 +02:00
Alexandre Bodin
f2dd146bf4 Clear getstarted config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-15 19:41:56 +02:00
Pierre Noël
73849b8415 change emails in doc 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 19:33:55 +02:00
Pierre Noël
aea700efc3 add default settings to plugin email 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 19:22:57 +02:00
Pierre Noël
978549febe remove ^ 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 17:17:21 +02:00
Pierre Noël
20aedc0e68 refactor 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 17:15:24 +02:00
Pierre Noël
bc3cee4c54 sanatize email options 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 16:39:35 +02:00
Pierre Noël
8821f42694 update email settings getstarted 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 15:47:04 +02:00
Pierre Noël
d8f1449e73 change config format 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-05-15 15:05:35 +02:00
ramigs
24e015e3c0
in register, response has the jwt property only if email confirmation setting is true (#6192) 
Signed-off-by: ramigs <ramigs@gmail.com>
 2020-05-15 09:20:35 +02: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
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
5bc5ee79ed
Merge pull request #6140 from louisguitton/patch-1 
Fix broken link in Heroku deployment guide
 2020-05-14 16:03:06 +02:00