yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-06 23:28:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 120 Branches 493 Tags
Commit Graph

14807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Bodin
7df82f5e62 Add cleanup instruction 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:27:33 +02:00
Alexandre Bodin
9078081eba Add strucutre example 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:25:43 +02:00
Alexandre Bodin
02fcbf8f45 Update more configs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:25:43 +02:00
Alexandre Bodin
fc6245b2d5 Migration guide for stable 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:25:43 +02:00
Alexandre Bodin
004c881c61 Merge branch 'develop' 2020-05-25 15:21:37 +02:00
Alexandre BODIN
d91c5f19c5
Merge pull request #6053 from strapi/fix/ctb-default-date-input 
Fix/ctb default date input
 2020-05-25 15:21:18 +02:00
Alexandre Bodin
b512a19fc0 Merge branch 'master' of github.com:strapi/strapi 2020-05-25 15:18:55 +02:00
Alexandre Bodin
4a3ae0348b check timestamps option exists on model 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-25 15:18:46 +02:00
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
Alexandre BODIN
1caf7e0ff2
Merge pull request #6338 from Froelund/patch-9 
Clarified upload proxy error messages
 2020-05-25 14:53:31 +02:00
Caio Jhonny
71fb8156a7
Merge branch 'master' into patch-1 2020-05-25 12:04:39 +02:00
Jørgensen
b23286a90f
Clarified upload proxy error messages 2020-05-25 10:09:19 +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
ScottAgirs
ef861f19ff [bugfix] register() input, payload 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-19 12:03:31 -04:00
ScottAgirs
ebed726d7b [bugfix] register(input: UsersPermissionsRegisterInput) 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-19 11:58:36 -04: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
cyril lopez
586f3ba29d
Merge branch 'develop' into fix/ctb-default-date-input 2020-05-19 05:42:30 +02:00
ScottAgirs
13b379128d [bugfix] put back UsersPermissionsRegisterInput on register() 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-18 15:49:00 -04: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
Rasmus Nørskov
767c3e30c0 Added schema creation validation 
Signed-off-by: Rasmus Nørskov <rasmus@norskov.org>
 2020-05-17 16:21:42 +02:00
Rasmus Nørskov
314c4bb32c Corrected documentation 
Signed-off-by: Rasmus Nørskov <rasmus@norskov.org>
 2020-05-17 16:21:22 +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
Jim LAURIE
403e1169eb
Merge pull request #6215 from strapi/docs/gcpBetaHost 
Update GCP host in beta docs
 2020-05-15 18:36:30 +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