12264 Commits

Author SHA1 Message Date
Alexandre Bodin
dcc29b361b Merge branch 'develop' into features/webhooks 2020-01-13 09:41:20 +01:00
nurikabe
3c38fc33bf Remove soft hyphen (U+00AD) from reset password email subject line 2020-01-11 11:29:24 -05:00
Vilhelm Melkstam
85e1226f85
Update user permission docs to use correct user id
The correct id attribute on a user object is `id`, not `_id`, updating docs where this mistake was written.
2020-01-10 20:52:37 +01:00
Alexandre BODIN
46a38fd759
Merge pull request #4936 from strapi/chore/eslint-config
Improve eslint config for front-end files
2020-01-10 19:03:04 +01:00
Alexandre Bodin
58c15f9469 Merge branch 'features/webhooks' into front/webhooks-editview 2020-01-10 18:08:45 +01:00
virginieky
50643f94b3
Merge branch 'master' into chore/eslint-config 2020-01-10 17:44:43 +01:00
Alexandre Bodin
615f9682bc Merge branch 'develop' into features/webhooks 2020-01-10 17:35:32 +01:00
Alexandre BODIN
aff0075bb1
Merge pull request #4927 from strapi/tools/publish-script
tools: Init a simple publish script
2020-01-10 17:34:44 +01:00
Alexandre BODIN
33a19e8647
Merge branch 'master' into tools/publish-script 2020-01-10 17:32:22 +01:00
Virginie Ky
beda677349 input error border 2020-01-10 15:41:18 +01:00
Virginie Ky
4ff17a4c99 errors translation 2020-01-10 15:30:34 +01:00
Virginie Ky
d98215c10b clean code 2020-01-10 15:17:36 +01:00
Jim LAURIE
ba3586fbe7 docs: update way to create strapi app in deployment guide
By following a feedback on a Spectrum question, I updated the way to create the strapi app to respect the best practice.
It will prevent global version issue.
2020-01-10 15:15:24 +01:00
Alexandre BODIN
ede5691d42
Merge pull request #4970 from strapi/webhooks/add-default-headers
Add defaultHeaders option to webhooks
2020-01-10 14:56:10 +01:00
hkovacs
3f0d5d5408 corrected new components path to include category and be understandable 2020-01-10 15:14:23 +02:00
slackr
89675409ba
fix error reply text 2020-01-10 07:40:17 -05:00
Akinoso Toyosi
0e3d8c232a
Update install-requirements.md 2020-01-10 13:09:45 +01:00
Alexandre Bodin
d4a630a216 Add defaultHeaders option to webhooks 2020-01-10 12:42:57 +01:00
Alexandre Bodin
51b3dade8f Default opts in Strapi() 2020-01-10 12:25:41 +01:00
Alexandre Bodin
d5d80ba407 Fix missing await in file remove 2020-01-10 12:04:58 +01:00
Jim LAURIE
29a2fe00b5 docs: add login provider configs in the docs
Login provider docs with in the strapi/strapi-examples repo, I migrated them in the mono repo doc.
2020-01-10 11:20:34 +01:00
Patai Adam
3b7dc6dde5
Update content-type-builder.js 2020-01-10 09:58:47 +01:00
Virginie Ky
177fdb6c5d reset formErrors on header delete 2020-01-09 22:54:37 +01:00
Virginie Ky
50a9192599 Headers errors on change 2020-01-09 20:25:16 +01:00
Vedran Krizic
f29b712b86
changed location of overrides 2020-01-09 17:19:48 +01:00
Jim LAURIE
e20ed1b1fd
Merge pull request #4937 from loongmxbt/patch-1
Fix documentation type on request verb
2020-01-09 12:07:19 +01:00
Jim LAURIE
68dd02ba6f
Merge branch 'master' into patch-1 2020-01-09 12:06:36 +01:00
Virginie Ky
4aeb5399ee Merge branch 'features/webhooks' of github.com:strapi/strapi into front/webhooks-editview 2020-01-09 11:11:32 +01:00
Alexandre Bodin
f28292b384 Merge branch 'develop' into features/webhooks 2020-01-09 11:09:26 +01:00
Virginie Ky
d0650f1884 Conflicts resolved 2020-01-09 11:05:46 +01:00
Alexandre BODIN
a427c27cfd
Merge pull request #4947 from strapi/fix/use-strapi-service
Use strapi.services instead of requires to allow overrides
2020-01-09 10:13:05 +01:00
Alexandre BODIN
c5cef7dcbb fix - keep autoPopulate:false options on edit 2020-01-08 19:00:12 +01:00
Thomas Baxter
37dbd955e2 feat(purest): upgrading purest to 3.x 2020-01-08 12:55:16 -05:00
Virginie Ky
1b39898f66 errors states 2020-01-08 18:28:52 +01:00
Alexandre Bodin
7c94a2316d Init strapi.service and use it where services where required 2020-01-08 17:57:53 +01:00
soupette
60cd11624a Add test for adding a common attribute 2020-01-08 17:57:25 +01:00
soupette
c259377bd2 Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests 2020-01-08 17:20:06 +01:00
Alexandre BODIN
e6155814f0
Merge pull request #4928 from kuldipem/master
package.json name property must be in lowercase
2020-01-08 17:13:18 +01:00
Alexandre BODIN
28e00a80d3
Merge pull request #4941 from strapi/enhancement-2020
Update copyright date to 2020
2020-01-08 17:12:56 +01:00
Alexandre BODIN
260758f368
Merge branch 'master' into enhancement-2020 2020-01-08 17:12:30 +01:00
Alexandre BODIN
e974dfc9ca
Merge pull request #4945 from strapi/hotfix/ctb-date-edit
Fix edit date types
2020-01-08 17:11:23 +01:00
soupette
c7a83a9687 Merge branch 'master' of github.com:strapi/strapi into hotfix/ctb-date-edit 2020-01-08 17:10:34 +01:00
Alexandre BODIN
7dbb0f9283
Merge pull request #4944 from strapi/fix/datetime-ctb
Add datetime and time validators in ctb
2020-01-08 17:09:05 +01:00
soupette
af2c2a1841 Fix edit date types 2020-01-08 17:09:04 +01:00
Alexandre BODIN
521d11be1f
Merge branch 'master' into fix/datetime-ctb 2020-01-08 17:08:57 +01:00
Alexandre Bodin
4965846d36 Add datetiem and time validators in ctb 2020-01-08 17:03:03 +01:00
jozefcipa
9940f221f0 Add option to specify custom files to ignore 2020-01-08 16:54:20 +01:00
soupette
253fcff5da Merge branch 'master' of github.com:strapi/strapi into chore/ctb-front-end-tests 2020-01-08 16:42:17 +01:00
soupette
8a570964c6 Add tests for simple actions 2020-01-08 16:42:01 +01:00
Alexandre BODIN
b7999d4774
Merge pull request #4942 from strapi/fix-slug
Udpate steps to access to the view config page
2020-01-08 16:11:54 +01:00