9182 Commits

Author SHA1 Message Date
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
1980dafa06
Merge pull request #6315 from strapi/jwtconfig
Add JWT configurations
2020-05-25 14:55:42 +02:00
Jørgensen
b23286a90f
Clarified upload proxy error messages 2020-05-25 10:09:19 +02:00
HichamELBSI
1f0f96e46b Change the logo
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
2020-05-22 15:35:08 +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
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
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
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
Alexandre Bodin
1ab5afc33d Merge branch 'develop' 2020-05-18 09:55:53 +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
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
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
Alexandre Bodin
ec0a573cef Merge branch 'master' into develop 2020-05-14 10:45:45 +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
Alexandre Bodin
86edfa496d Merge branch 'master' into develop 2020-05-14 09:40:59 +02:00
soupette
4395f72df5 Add email plugin description
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-05-14 01:54:36 +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
trick0
a824f807fc Merge branch 'master' into master
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
2020-05-13 18:25:41 +02:00
soupette
ea84a5e669 Merge branch 'develop' of github.com:strapi/strapi into chore/remove-email-config 2020-05-13 17:22:14 +02:00
soupette
5400f3e1dd Remove email plugin admin files
Signed-off-by: soupette <cyril.lpz@gmail.com>
2020-05-13 17:21:17 +02:00
Alexandre BODIN
2f84e42c44
Merge pull request #6112 from strapi/chore/configuration-dump-cli
Configuration dump and restore cli
2020-05-13 16:51:26 +02:00
Marvin König
fa31b5dfc2
Fix file names containing reserved and unsafe URL characters
This fixes the `generateFileName` function in the Strapi upload plugin,
so that reserved and unsafe charactes for URLs are replaced with
underscores.

Signed-off-by: Marvin König <dev@mkqavi.com>
2020-05-13 13:17:26 +02:00
Alexandre Bodin
35f4b1748e Add import stats
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-12 18:02:11 +02:00
David Thomas
ba6c0b4ba2
Add Twitch auth provider (#6171)
* Add Twitch auth provider

Signed-off-by: David Thomas <dev@synth3.tk>

* Remove unneeded label exclusion

Signed-off-by: David Thomas <dev@synth3.tk>
2020-05-12 16:48:18 +02:00
Sulakin Vadim
30ba717525
fix vk providers (#5783) 2020-05-12 14:04:52 +02:00
Alexandre Bodin
d1d13fab23 Cleanup code
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-12 12:47:23 +02:00
Filipe Medeiros
3b9661acb2
Upgrade dependency version (#6149)
* Ok, now I translated from start to finish

 Should be good to go, some stuff is still in English because it's impossible/worse to translate to PT

Signed-off-by: Filipe <filipesilvamedeiros@gmail.com>

* Updated the dependency. It's a patch, so it shouldn't break anything at all

Signed-off-by: Filipe <filipesilvamedeiros@gmail.com>

* Revert "Ok, now I translated from start to finish"

This reverts commit 7ea0574db78abb6fc0d328465e618b860fff89bb.

Signed-off-by: Filipe <filipesilvamedeiros@gmail.com>
2020-05-12 12:03:15 +02:00
Alexandre Bodin
768b699eb6 Add aliases
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-12 10:55:10 +02:00
cyril lopez
18409f043e
Merge branch 'develop' into fix/ctb-default-date-input 2020-05-12 09:19:20 +02:00
Pierre Noël
57d7d876b7
Fix/#4513/ability to use a sub path behind a proxy (#5833)
* add possibility to use strapi on a non-root base url path

* fix documentation password form

* use server.url and admin.url in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update doc proxy

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* move server.url location in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* add possibility to put relative urls

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* allow '/' as an admin url + refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update yarn.lock

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove default proxy option

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* fix github provider

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* fix github login

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove files that should be here

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-08 13:50:00 +02:00
Alexandre Bodin
937e3baca8 Make strapi.load chainable
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-07 18:49:44 +02:00
Alexandre Bodin
7da81fef9e Add configuration:dump & configuration:restore commands
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-07 16:54:56 +02:00
Alexandre Bodin
34026fd88c Init
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
2020-05-07 16:54:56 +02:00
Alexandre BODIN
2b3d94d747
Merge pull request #6047 from gfpacheco/bug/ignore-private-fields-on-register
Ignore private fields input on user register
2020-05-07 15:21:33 +02:00
Alexandre Bodin
c90e3eb67b Merge branch 'develop' of github.com:strapi/strapi into develop 2020-05-07 13:14:35 +02:00