cyril lopez
377da271e4
Fix lint from master
2018-11-05 11:31:36 +01:00
cyril lopez
a20e827b38
Merge branch 'master' of github.com:strapi/strapi into fix/2213
2018-11-05 11:09:50 +01:00
dimitrinicolas
f168da8acc
Fix responsive admin headers
2018-11-04 12:47:55 +01:00
dimitrinicolas
3d4d4c0525
Update FR translations
2018-11-04 12:28:04 +01:00
Leo
03803780bf
Fix a missing translation
2018-11-03 16:56:21 +08:00
Leo
d2be992a14
Fix strange translations
2018-11-03 16:14:53 +08:00
Leo
b160fdf79e
Translations final fix
2018-11-03 15:03:31 +08:00
Leo
6dc594217c
Translations for ZH completed
2018-11-03 14:30:22 +08:00
Leo
a9e5b083e9
Update Email translations
2018-11-03 01:14:07 +08:00
Leo
935928bdf3
Update Content Type Builder translations
2018-11-03 00:57:57 +08:00
Leo
7d5d6b5381
Update ZH translations
...
Updated admin panels & content manager
2018-11-02 22:12:49 +08:00
aDeve
429973f814
code review : remove longline, and invers logic condition
2018-11-02 11:47:04 +01:00
Jim LAURIE
30370a1b0d
Merge pull request #2165 from greatwitenorth/patch-2
...
Allow the use of .graphql or .graphql.js
2018-11-01 17:39:57 +01:00
Jim LAURIE
e4b1d3c1d6
Merge branch 'master' into patch-2
2018-11-01 17:39:47 +01:00
Jim LAURIE
d6090099c8
Merge pull request #2243 from jacargentina/patch-1
...
Update models.md
2018-11-01 17:35:26 +01:00
Jim LAURIE
8c2a22f776
Merge pull request #2230 from maturanomx/testLinterInCI
...
Introduce a linter error for testing CI
2018-11-01 17:20:12 +01:00
Jim LAURIE
6ed7f494ad
Merge branch 'master' into testLinterInCI
2018-11-01 17:19:56 +01:00
Jim LAURIE
d0585aef6c
Merge pull request #2224 from strapi/fix-alpha-requirement
...
Remove @alpha from code
2018-11-01 17:12:24 +01:00
Jim LAURIE
358b23f07b
Merge branch 'master' into fix-alpha-requirement
2018-11-01 17:12:16 +01:00
Javier Castro
9158d58a64
Update models.md
...
The Model options specified are only used on strapi-hook-bookshelf. State it clearly
2018-11-01 13:11:28 -03:00
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
