9866 Commits

Author SHA1 Message Date
Mickael D
359fd2bb21
Merge branch 'master' into fix/4537 2019-12-04 21:55:35 +01:00
Alexandre BODIN
4c72a53536
Merge pull request #4638 from Cow258/@4625
Fix no response when get user permission role with internal network
2019-12-04 17:43:11 +01:00
Alexandre BODIN
88c530e133
Merge branch 'master' into @4625 2019-12-04 17:42:58 +01:00
Jim LAURIE
1f6ddbeb9d
Merge pull request #4405 from mhelmetag/remove_old_warning_from_contrib_doc
Remove old admin panel warning
2019-12-03 14:07:58 +01:00
Jim LAURIE
4a837f8f93
Merge branch 'master' into remove_old_warning_from_contrib_doc 2019-12-03 14:03:56 +01:00
Jim LAURIE
509f7a60e5
Fix soupette feedback 2019-12-03 13:59:34 +01:00
Alexandre BODIN
5bf005b72f
Merge pull request #4628 from strapi/identify-docker
Add parameter to identify Docker projects
2019-12-02 15:40:09 +01:00
Alexandre BODIN
164c91dabb
Merge branch 'master' into identify-docker 2019-12-02 15:39:53 +01:00
Aurélien Georget
cf9bcc2337 Use environment variable instead of argument 2019-12-02 15:30:22 +01:00
Cowboy
b6ee350ac0 Fix no response when get user permission role with internal network 2019-12-02 14:58:57 +08:00
Alexandre Bodin
cf6ecbff4f v3.0.0-beta.17.8 v3.0.0-beta.17.8 2019-12-01 23:20:50 +01:00
Alexandre BODIN
c198c26668
Merge pull request #4636 from strapi/fix/plugin-name
Validate plugin name
2019-12-01 23:19:29 +01:00
Alexandre Bodin
1500b4f49a Valid plugin name 2019-12-01 23:05:58 +01:00
Aurélien Georget
773b89bc79 Add parameter to identify Docker projects 2019-11-29 18:10:32 +01:00
Jim LAURIE
8199f2d59c v3.0.0-beta.17.7 2019-11-29 17:36:51 +01:00
Jim LAURIE
f32b804061
Merge pull request #4624 from strapi/fix/secu
Hotfix mongo aggregate policy verifications
v3.0.0-beta.17.7
2019-11-29 17:33:50 +01:00
Alexandre Bodin
7a3b64016c Hotfix mongo aggregate policy verifications 2019-11-28 18:33:02 +01:00
Jim LAURIE
f36a5cf096
Merge pull request #4584 from sulakin/admin-russian-translation
Update Russian translation for admin panel
2019-11-28 16:51:32 +01:00
Jim LAURIE
c7d20d0358
Merge branch 'master' into admin-russian-translation 2019-11-28 16:51:15 +01:00
Jim LAURIE
d1326aa35a
Merge pull request #4620 from strapi/docs-ga
Add GA in the docs
2019-11-28 11:53:25 +01:00
Jim LAURIE
2e6d0c7f41 Add GA in the docs 2019-11-28 11:45:45 +01:00
Alexandre BODIN
24fde718db
Merge pull request #4619 from strapi/revert-4614-docs-warning-alpha
Revert "Revert docs update"
2019-11-28 10:47:42 +01:00
Jim LAURIE
e0b96b9738
Revert "Revert docs update" 2019-11-28 10:43:33 +01:00
Alexandre BODIN
a6115daab5
Merge pull request #4600 from strapi/docs-website-link
Fix docs website link in the top menu
2019-11-28 09:00:19 +01:00
Alexandre BODIN
0cc737145e
Merge branch 'master' into docs-website-link 2019-11-28 09:00:11 +01:00
Sulakin Vadim
c516051b3f
Merge branch 'master' into admin-russian-translation 2019-11-28 09:27:14 +03:00
Jim LAURIE
b2e99a3e20
Merge pull request #4614 from strapi/docs-warning-alpha
Revert docs update
2019-11-27 18:14:07 +01:00
Jim LAURIE
fd66ffb337
Merge branch 'master' into docs-warning-alpha 2019-11-27 18:14:00 +01:00
Jim LAURIE
11addd3485 Revert docs update 2019-11-27 18:13:18 +01:00
Jim LAURIE
f0766e5b7f
Merge pull request #4613 from strapi/docs-warning-alpha
Fix docs build
2019-11-27 18:06:22 +01:00
Jim LAURIE
d0563e8d38
Merge branch 'master' into docs-warning-alpha 2019-11-27 18:06:15 +01:00
Jim LAURIE
885f7c63f9 Fix docs build 2019-11-27 18:05:21 +01:00
Alexandre BODIN
56d359fd97
Merge pull request #4612 from strapi/docs-warning-alpha
Display a deprecated message docs alpha
2019-11-27 17:30:09 +01:00
Alexandre BODIN
2f3cd26acc
Merge branch 'master' into docs-warning-alpha 2019-11-27 17:30:00 +01:00
Jim LAURIE
6a2b667b74 Fix ; 2019-11-27 17:28:08 +01:00
Jim LAURIE
93130a1676 Display a deprecated message docs alpha 2019-11-27 17:26:30 +01:00
Alexandre BODIN
ad3cd2ee94
Merge pull request #4611 from strapi/docs-deploy-docker
Add a docker ref in the docs
2019-11-27 16:36:43 +01:00
Alexandre BODIN
1f7688cb77
Merge branch 'master' into docs-deploy-docker 2019-11-27 16:36:34 +01:00
Jim LAURIE
bb2a54525d Add a docker ref in the docs 2019-11-27 16:25:36 +01:00
Alexandre BODIN
17c47bafc1
Merge pull request #4599 from strapi/fix-4559
Fix lowercase email in forgot password function
2019-11-27 15:25:42 +01:00
Alexandre BODIN
8376793a9a
Merge branch 'master' into fix-4559 2019-11-27 15:25:26 +01:00
Sulakin Vadim
9899480562
Merge branch 'master' into admin-russian-translation 2019-11-27 16:42:01 +03:00
Sulakin Vadim
c5d91ed514
Update ru.json 2019-11-27 16:41:39 +03:00
Jim LAURIE
d3746702ff
Merge pull request #4585 from dearprakash/patch-1
Update link to pm2 guide
2019-11-27 11:48:56 +01:00
Jim LAURIE
ad6f613631
Merge branch 'master' into patch-1 2019-11-27 11:48:25 +01:00
Mickael D
e4a12f6cb2
Merge branch 'master' into fix/4537 2019-11-27 10:35:43 +01:00
Jim LAURIE
9eb1490a7a Fix #4576 docs website link 2019-11-26 16:58:35 +01:00
Jim LAURIE
3fe87ffcc7 Fix #4559 lowercase the email in the forgot password function 2019-11-26 16:03:06 +01:00
Jim LAURIE
ee76396920
Merge pull request #4571 from strapi/docs-custom-data-guide
Add data response customization
2019-11-26 11:58:44 +01:00
Jim LAURIE
07fb1e5337
Merge branch 'master' into docs-custom-data-guide 2019-11-26 11:58:35 +01:00