33691 Commits

Author SHA1 Message Date
Nick Verwymeren
0034ebae41
Update index.js
changed the glob as per @maturanomx comment
2018-11-01 10:12:46 -05:00
Jim LAURIE
4d76c4276f
Merge pull request #2233 from peluprvi/patch-1
Update PT-BR translations
2018-11-01 12:56:19 +01:00
Jim LAURIE
761192e73a
Merge branch 'master' into patch-1 2018-11-01 12:55:35 +01:00
Jim LAURIE
41c7692898
Merge pull request #2234 from peluprvi/patch-2
Update PT-BR translations
2018-11-01 12:54:45 +01:00
Jim LAURIE
1253fc02a2
Merge branch 'master' into patch-2 2018-11-01 12:54:38 +01:00
Jim LAURIE
50fc169d3e
Update PR feedback 2018-11-01 12:46:20 +01:00
Jim LAURIE
ac34d556e2
Merge pull request #2236 from umuttuncer/patch-1
Update CONTRIBUTING.md
2018-11-01 12:06:53 +01:00
Jim LAURIE
0fd2072e88
Merge branch 'master' into patch-1 2018-11-01 12:06:20 +01:00
Jim LAURIE
52de49a69c
Link installation guide 2018-11-01 11:57:13 +01:00
Jim LAURIE
af3907c529
Merge pull request #2235 from strapi/improvements/webhooks
Add Webhooks guide in documentation
2018-11-01 11:28:03 +01:00
Jim LAURIE
260dc4c00b
Merge branch 'master' into improvements/webhooks 2018-11-01 11:27:55 +01:00
Alberto Maturano
307670546e Upgrade eslint to version 4 2018-10-31 12:17:56 -06:00
aDeve
f39e917ab1 fix #2108 : handle redirect after reset password 2018-10-31 17:36:00 +01:00
Jim LAURIE
4ca3d45c29
Remove empty line 2018-10-31 17:27:15 +01:00
Jim LAURIE
02d935188d Fix test launch 2018-10-31 17:20:09 +01:00
Jim LAURIE
e95403f1c8
Merge pull request #2232 from molcay/patch-1
Fix typo on CLI.md
2018-10-31 14:40:53 +01:00
Umut Tuncer
98fba70983
Update CONTRIBUTING.md
Strapi requirements changed. I guess need to update contributing guide need to change too.
2018-10-31 12:34:33 +03:00
Pierre Burgy
529f2f81ed Fix documentation build 2018-10-31 09:46:26 +01:00
Pierre Burgy
a377f20791 Add Webhooks guide 2018-10-31 09:46:06 +01:00
Alberto Maturano
980b6d240d Improve code style and code quality
Just some little improvements that I found looking around the code.

Related 2410d5a
2018-10-30 16:55:11 -06:00
Alberto Maturano
2e649567aa Revert linter error 2018-10-30 15:52:54 -06:00
Pedro Vieira
6d82b8a7b6
Add pt-BR missing keys to manager 2018-10-30 18:04:26 -03:00
Pedro Vieira
78ef72a617
Add missing keys to strapi-admin
Partial fix for https://github.com/strapi/strapi/issues/1625
2018-10-30 17:48:42 -03:00
M. Olcay TERCANLI
3986afc58d
Fix typo 2018-10-30 21:34:11 +03:00
Alberto Maturano
fadce9be7b Run linter on Travis 2018-10-30 12:20:23 -06:00
Alberto Maturano
889a9ccc2a Introduce a linter error for testing CI
This commit is provokin this error:

```
/strapi/strapi/packages/strapi/lib/index.js  6:7  error
'foo' is assigned a value but never used  no-unused-vars
```

The CI should detect this and avoid the merge to `master`
2018-10-30 11:49:34 -06:00
cyril lopez
b06997014a Fixes #2213 2018-10-30 17:27:43 +01:00
aissa-bouguern
cbf877074d
GraphQL many-to-many relations symmetry
Querying content types that share many-to-many relations do not return expected results.

Let's say we have a product content type and a category centent type. those two models share many-to-many relation, and when we are querying categories we have the expected result, Ex :

Query : 
{
  categories {
    Name
    products {
      Name
    }
  }
}

Result : 

{
  "data": {
    "categories": [
      {
        "Name": "Category 1",
        "products": [
          {
            "Name": "Product 1"
          }
        ]
      },
      {
        "Name": "Category 2",
        "products": [
          {
            "Name": "Product 1"
          }
        ]
      }
    ]
  }
}

But when  we're querying products, the categories array is empty!!

Query:

{
  products {
    Name
    categories {
      Name
    }
  }
}

Result:

{
  "data": {
    "products": [
      {
        "Name": "Product 1",
        "categories": [ ]
      }
    ]
  }
}

categories should not be empty, it should be something like  that : 
...
"categories": [
          {
            "Name": "Category 1"
          },
          {
            "Name": "Category 2"
          }
        ]
....

I hope that was clear.
2018-10-29 22:36:39 +00:00
Jim LAURIE
20ee8f9e1e
Merge pull request #2225 from strapi/update/link_version
Update link version in left menu and fix typo in strapi-generate-new
2018-10-29 19:18:22 +01:00
aDeve
87512cc34b update link of version in leftMenuFooter : redirect now to changelog.
fix typo in strapi-generate-new.
2018-10-29 18:50:30 +01:00
Jim LAURIE
a0216e12a4 Remove @alpha from code 2018-10-29 18:34:31 +01:00
Jim LAURIE
6ab40d9694
Merge pull request #2214 from maturanomx/fix/vulnerabilityAlert
Avoid alert vulnerability on projects at github
2018-10-29 13:05:52 +01:00
Jim LAURIE
bc6cc25a58
Merge branch 'master' into fix/vulnerabilityAlert 2018-10-29 13:05:44 +01:00
g-div
cca35fe9ac fix(relations): avoid duplicate entries in manyToMany relations 2018-10-29 09:41:23 +01:00
Kamal Bennani
b9ad12f920
Add missing strapi-utils in the user-permissions package 2018-10-28 23:44:43 +01:00
Kamal Bennani
957368b8b2
Add a support of deep filter in bookshelf 2018-10-28 23:44:38 +01:00
Kamal Bennani
0ed9b7643a
Merge where and relation payload 2018-10-28 23:42:22 +01:00
Kamal Bennani
7801aac50f
Turn arrow functions to object functions to get to 'this' 2018-10-28 23:42:22 +01:00
Kamal Bennani
5bdb5c25e0
use stage functions from the relation file 2018-10-28 23:42:22 +01:00
Kamal Bennani
15a41614fa
Don't populate relations in Graphql context 2018-10-28 23:42:22 +01:00
Kamal Bennani
bbfb2418a5
Move functions that deals with stages to the mongoose relation file 2018-10-28 23:42:21 +01:00
Kamal Bennani
4d3d4c8d55
move utility functions to their own file 2018-10-28 23:42:21 +01:00
Kamal Bennani
ce534cf568
Take into account user model 2018-10-28 23:42:21 +01:00
Kamal Bennani
9862705f8f
fix rebase issue 2018-10-28 23:42:21 +01:00
Kamal Bennani
3c37c33d58
Rewrite the logic of deep population & matching 2018-10-28 23:42:20 +01:00
Kamal Bennani
2d1cf3591e
Split convertParams to multiple stage steps 2018-10-28 23:42:20 +01:00
Kamal Bennani
a84b640994
Make converQuery works also with array values 2018-10-28 23:42:20 +01:00
Kamal Bennani
d018e29a42
Use the correct hook folder path 2018-10-28 23:42:20 +01:00
Kamal Bennani
83da9fa38a
[Bugfix] take the correct localField when having a manyToOne RS 2018-10-28 23:42:19 +01:00
Kamal Bennani
382f52a2e8
Convert GraphQL params to one level-deep object 2018-10-28 23:42:19 +01:00