9892 Commits

Author SHA1 Message Date
Alexandre BODIN
309be28183
Merge branch 'master' into patch-7 2019-12-09 10:06:52 +01:00
Alexandre BODIN
ca751294e0
Merge pull request #4654 from AnandChowdhary/patch-1
Change "Mac O/S" to "macOS"
2019-12-09 10:06:17 +01:00
Alexandre BODIN
3af9905f4c
Merge branch 'master' into patch-1 2019-12-09 10:06:10 +01:00
Alexandre BODIN
4602318eae
Merge pull request #4656 from shuson/patch-1
Update model.template
2019-12-09 10:05:26 +01:00
Alexandre BODIN
d6f93bb755
Merge branch 'master' into patch-1 2019-12-09 10:04:30 +01:00
Alexandre BODIN
c10a985600
Merge pull request #4659 from pouyamiralayi/patch-1
Update upload.md documentation
2019-12-09 10:04:09 +01:00
Alexandre BODIN
232363beec
Merge branch 'master' into patch-1 2019-12-09 10:03:47 +01:00
Alexandre BODIN
c27cb3a0fb
Merge pull request #4671 from strapi/docs-draft
Add guide to create a draft system
2019-12-09 10:02:17 +01:00
Alexandre BODIN
ec6906c96c
Merge branch 'master' into docs-draft 2019-12-09 10:02:09 +01:00
Alexandre BODIN
f2571b0b2d
Merge pull request #4540 from victorlambert/improve-authorization-performance
Populate only role relation to authorize user
2019-12-09 09:58:08 +01:00
Alexandre BODIN
3acd646701
Merge branch 'master' into improve-authorization-performance 2019-12-09 09:57:58 +01:00
Alexandre BODIN
874df1846e
Merge pull request #4674 from mnelemans/fix/bookshelf-relations-search
Wrap tsvector attributes with coalesce before join
2019-12-09 09:56:30 +01:00
Jørgensen
8087a4ada5
Merge branch 'master' into patch-7 2019-12-09 09:24:03 +01:00
Mathijs Nelemans
fcdbc4fbe3 Wrap tsvector attributes with coalesce before join
Fixed a bug where joining multiple tsvector attributes results in NULL
because one of the columns contains NULL. The expected behaviour is to
ignore that column instead, which is achieved by setting it to an empty
string
2019-12-07 12:40:05 +01:00
Jim LAURIE
344f825778 Fix typo 2019-12-06 19:05:15 +01:00
Jim LAURIE
959472231f Add guide to create a draft system 2019-12-06 19:00:00 +01:00
Sergey Pravosud
23eb263e07 added missed comma in ecosystem.config.js example (#4657) 2019-12-06 17:15:12 +01:00
Jim LAURIE
d394eedf56
Merge pull request #4667 from strapi/docs-strapi-console
Add strapi console command
2019-12-06 14:43:58 +01:00
Alexandre BODIN
85c4dbe2bc
Merge branch 'master' into docs-strapi-console 2019-12-06 14:43:36 +01:00
Jim LAURIE
95d707dc0e Add strapi console comand 2019-12-06 14:40:25 +01:00
Sleva
52f5770b06 Updated ApolloServer configuration for introspection queries (#4660) 2019-12-06 12:35:06 +01:00
Jim LAURIE
8e2a4cd1bf
Merge pull request #4651 from iicdii/master
Update KO translation
2019-12-05 17:30:06 +01:00
Jim LAURIE
7eaeda7974
Merge branch 'master' into master 2019-12-05 17:29:50 +01:00
Pouya Miralayi
d1356a2a50
Update upload.md 2019-12-05 16:47:15 +03:30
Nevermoi
87f8f91b52
Update model.template
Wrong description of beforeSave and afterSave for model, since updating will not trigger these two hooks
2019-12-05 10:48:30 +08:00
Anand Chowdhary
aa69553246
Change "Mac O/S" to "macOS" 2019-12-04 11:53:44 -08: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
Jørgensen
7fd2dd348d
Merge branch 'master' into patch-7 2019-12-04 12:19:42 +01:00
harimkims
5f62dbc9a5 Update KO translation 2019-12-04 17:08:08 +09: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
Jørgensen
5fd9677406
Use the id of entry to update relations
Fixes #4644
2019-12-03 12:59:33 +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