6761 Commits

Author SHA1 Message Date
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
soupette
a6318cafcc Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-16 11:29:32 +02:00
soupette
244489ee9d Created FilterOptions compo 2018-05-16 11:27:12 +02:00
Jim LAURIE
9db430a382
Merge pull request #1195 from strapi/improve-language-selector
New locale selector design
2018-05-16 10:57:25 +02:00
Jim LAURIE
1465a9b0d6
Merge branch 'master' into improve-language-selector 2018-05-16 10:48:01 +02:00
Jim LAURIE
12182ff9ee
Merge pull request #1201 from nurikabe/patch-4
Fix spelling
2018-05-16 10:47:01 +02:00
soupette
ea6266eb48 Fix name 2018-05-16 09:18:30 +02:00
soupette
f68315ec3e Fix import 2018-05-16 09:14:18 +02:00
Evan Owens
4086506acf
Fix spelling 2018-05-15 16:08:47 -04:00
Jim LAURIE
76bb31970f
Merge pull request #1197 from johannpinson/graphql-use-playground
Move to GraphQL Playground
2018-05-15 18:24:46 +02:00
Jim LAURIE
c5d11e270b
Merge branch 'master' into graphql-use-playground 2018-05-15 18:15:15 +02:00
Jim LAURIE
f881f4f35e
Merge pull request #1190 from strapi/reserved-attributes
Disable reserved attributes
2018-05-15 18:12:34 +02:00
Jim LAURIE
12bccbd8af
Merge branch 'master' into reserved-attributes 2018-05-15 18:02:07 +02:00
Jim LAURIE
d6e110ba39
Merge pull request #1192 from kamalbennani/bugfix/fixes-1061
Fixes error when trying to access model ref inside of a GraphQL plugin
2018-05-15 17:23:54 +02:00
Jim Laurie
e082672d53 Fix feedback PR 2018-05-15 17:20:46 +02:00
soupette
d9a4b2990f Init filter design 2018-05-15 17:01:47 +02:00
Johann Pinson
aeefa6156e feat(graphql): move to GraphQL Playground 2018-05-15 16:03:22 +02:00
soupette
17d04592b3 Fixes #1166 2018-05-15 14:47:19 +02:00
soupette
51f5adc56a Add styled-components 2018-05-15 14:07:18 +02:00
Jim Laurie
756accaab2 Fix conflicts 2018-05-15 13:55:46 +02:00
soupette
ce6b56638e Fix feedback design 2018-05-15 12:38:27 +02:00
soupette
9d9ca631e1 Add separator between logout and language selector 2018-05-15 12:14:30 +02:00
Kamal Bennani
ba809f6149
correctly access the ref of the given model as param 2018-05-14 20:55:26 +02:00
soupette
a1e69197a3 Change LocaleToggle css 2018-05-14 18:22:37 +02:00
Jim LAURIE
be148bd5c5
Merge pull request #1157 from strapi/enhance/relations
Move business logic to manage relations inside the hooks
2018-05-14 17:52:55 +02:00
Jim LAURIE
f4905a9b2e
Merge branch 'master' into enhance/relations 2018-05-14 17:33:37 +02:00
Jim LAURIE
f222de8177
Merge pull request #1188 from Duske/patch-3
Upgrade to latest alpha-12.x in migration guide
2018-05-14 17:30:34 +02:00
Dustin
65fe7a44e0
(doc) use latest version alpha.12.1.3 2018-05-14 17:19:43 +02:00
Dustin
8a439e22d1
(doc) use latest version of strapi alpha.12.x 2018-05-14 17:08:57 +02:00
Dustin
7eabef259e
Merge branch 'master' into patch-3 2018-05-14 17:07:41 +02:00
Jim Laurie
d3fac43ce5 Add missing comma 2018-05-14 17:01:51 +02:00
Jim LAURIE
96b28db97d
Merge branch 'master' into reserved-attributes 2018-05-14 16:58:05 +02:00
Jim LAURIE
fe733135fe
Merge pull request #1185 from Duske/patch-2
Add npm install as last step of migration guide
2018-05-14 16:57:18 +02:00
Jim LAURIE
04eaab71aa
Merge branch 'master' into patch-2 2018-05-14 16:45:03 +02:00
Jim LAURIE
0c6f86ce3e
Merge branch 'master' into eslint 2018-05-14 16:13:47 +02:00
soupette
4563aae50a Change locale error to locale warning 2018-05-14 16:11:58 +02:00
Jim LAURIE
6c83f25381
Merge branch 'master' into reserved-attributes 2018-05-14 16:06:11 +02:00
Jim Laurie
4f3e6aad6a Disable reserved attributes fix #791 2018-05-14 16:01:09 +02:00
soupette
872393eab5 Fix login bug when registering the first admin user 2018-05-14 15:43:27 +02:00
Jim LAURIE
489b873da4
Merge pull request #1187 from strapi/fix-870
Fixes the updatedAt or updated_at field bug when updating an entry from the admin panel
2018-05-14 15:24:38 +02:00
Jim LAURIE
371d2fbebb
Merge branch 'master' into fix-870 2018-05-14 15:06:42 +02:00
soupette
de22d0e130 Remove createdAt fields as well 2018-05-14 15:02:30 +02:00
Dustin
04a91145e2
(doc) upgrade to latest alpha-12.x 2018-05-14 14:57:56 +02:00
Jim LAURIE
66ef5410c3
Merge pull request #1184 from strapi/fix-generators
Fix and harmonize generators
2018-05-14 14:32:10 +02:00
soupette
17e9340276 Fixes #870 2018-05-14 14:17:51 +02:00
Jim Laurie
c2ceb04959 Remove eslint from strapi-helper-plugin waiting for eslint PR 2018-05-14 14:08:06 +02:00
Dustin
f661b9699a
(doc) add npm install as last step
For me, copying the files from the newly generated strapi environment was not sufficient. When I started the strapi after following the guide, 
I got the following error: 
```
/home/xxx/Dev/Projects/xxx/server/node_modules/mongodb/lib/mongo_client.js:804
          throw err;
          ^

TypeError: Cannot read property 'globalId' of undefined

```
I guess this was the case because strapi-mongoose was not upgraded.  I don't know if I'm blind or did not read the migration guide carefully enough, but for me a `npm install` at the end did the trick and upgraded it.
Maybe this is helpful for you
2018-05-14 13:39:04 +02:00
Jim Laurie
79881f3707 Remove componentDidCatch from Edit page content manager 2018-05-14 13:35:15 +02:00
Jim Laurie
86677cb373 Add strapi generate model in strapi deps 2018-05-14 12:29:52 +02:00
Jim Laurie
860cb8315b Add strapi generate controller in strapi deps fix #644 2018-05-14 12:28:49 +02:00