4161 Commits

Author SHA1 Message Date
soupette
80dd0ef7d8 Fix setup 2018-04-30 16:04:29 +02:00
soupette
62246d185f Fix conflicts 2018-04-30 14:04:08 +02:00
soupette
0ca85934ac Add strapi-lint to ctm plugin and modify monorepo setups script to install it.
Now the strapi-lint is installed in both the ctm and the helper-plugin. It will be installed in all plugins later.

Important the updated eslint configuration requires to modify a lot of files....
2018-04-27 16:25:23 +02:00
soupette
7867239557 Created strapi-lint package to handle the repo lint configurations 2018-04-27 15:04:39 +02:00
Jim LAURIE
98ca83cf5d
Merge pull request #1049 from Luukth/master
Fix for host not in config.url
2018-04-26 16:37:55 +02:00
Jim LAURIE
b07f20392e
Merge branch 'master' into master 2018-04-26 16:25:53 +02:00
Jim LAURIE
c3ad5fdd74
Merge pull request #1046 from strapi/fix-838
Fixes settings-manager language deletion bug
2018-04-26 16:25:37 +02:00
Jim LAURIE
0410f12cb1
Merge branch 'master' into fix-838 2018-04-26 16:12:55 +02:00
Luukth
fbd060d49a
Merge pull request #1 from Luukth/Luukth-patch-1
Update configurations.js
2018-04-26 16:02:00 +02:00
Luukth
4f83965fa9
Update configurations.js
Fix for issue #800
this.config.url will now contain the host from the configuration file.
2018-04-26 16:00:05 +02:00
Jim LAURIE
d90cf10ded
Merge pull request #1045 from strapi/fix-1041
Fixes DatePicker display
2018-04-26 14:56:07 +02:00
Jim LAURIE
70cd38080e
Merge branch 'master' into fix-1041 2018-04-26 14:47:24 +02:00
Jim LAURIE
3f99ba3cc8
Merge pull request #1044 from strapi/fix-860
Fixes multiple relationships on different models name
2018-04-26 14:46:57 +02:00
Jim LAURIE
3416e46657
Merge branch 'master' into fix-860 2018-04-26 14:34:35 +02:00
Jim LAURIE
1570b594f9
Merge pull request #1033 from strapi/improve-webpack-config
Improve webpack config
2018-04-26 14:33:09 +02:00
soupette
22de691a13 Fixes #838 2018-04-26 14:21:17 +02:00
Jim LAURIE
1850d5539b
Merge branch 'master' into improve-webpack-config 2018-04-26 14:20:10 +02:00
Jim LAURIE
587197c00f
Merge pull request #1043 from strapi/fix-770
Block settings-manager & content-type-builder in production
2018-04-26 14:08:07 +02:00
soupette
5c49e76610 Fix PR feedback 2018-04-26 14:07:31 +02:00
soupette
d17f49c2e5 Fixes #1041
I commented the DatetimeStyles import in the InputDate because it was messing with webpack.
Since the new config it is not doing it anymore.
2018-04-26 13:44:26 +02:00
soupette
64984fded5 Fixes #860 2018-04-26 13:27:28 +02:00
soupette
d2b6667666 Fix menu footer css 2018-04-26 11:27:37 +02:00
soupette
42c64091e2 Fixes 770 2018-04-26 11:24:47 +02:00
Jim LAURIE
09c403f79b
Merge pull request #1035 from pedrocruzio/patch-1
Fixed misspelling in documentation text
2018-04-26 00:28:39 +02:00
Pedro Cruz
ce52ad4fb4
Fixed misspelling in documentation text 2018-04-25 14:14:47 -04:00
soupette
9e876370e0 Add comments 2018-04-25 17:27:09 +02:00
soupette
b7fffb0ce7 Fixes #958 2018-04-25 16:34:20 +02:00
Jim LAURIE
1cdca712f7
Merge pull request #1026 from stephledev/master
check if `strapi start` runs inside a strapi project
2018-04-25 14:59:40 +02:00
soupette
fb35bc75e0 Fix monorepo setup 2018-04-25 14:59:28 +02:00
Jim LAURIE
ffb0b93d3d
Merge branch 'master' into master 2018-04-25 14:35:33 +02:00
soupette
0a9f81765e Add new commands to fix npm run setup inside a project 2018-04-25 14:33:38 +02:00
Jim LAURIE
a274a6fb62
Merge pull request #1030 from strapi/fix-config-setup-up
Fix prevGrantConfig equal undefined when config not exist in db
2018-04-25 14:33:19 +02:00
Jim LAURIE
d94be998a4
Fix prevGrantConfig equal undefined when config not exist in db 2018-04-25 14:12:24 +02:00
Jim LAURIE
56e16bb62e
Merge pull request #1029 from derrickmehaffy/fix-v12-docs
Update v12 Readme.md
2018-04-25 14:02:29 +02:00
DMehaffy
8e81dfb27a Update v12 Readme.md
Updated reference to alpha.12
2018-04-25 04:50:20 -07:00
Jim LAURIE
246dd7b466
Merge pull request #1028 from strapi/fix/lifecycle
Fix beforeCreate lifecycle
2018-04-25 12:36:12 +02:00
Jim LAURIE
e6ad7de20e
Merge branch 'master' into fix/lifecycle 2018-04-25 12:27:33 +02:00
Aurelsicoko
265fb1bdd9 Fix beforeCreate lifecycle 2018-04-25 12:23:53 +02:00
stephledev
caa7e2cee2 check if strapi start runs inside a strapi project 2018-04-25 11:12:54 +02:00
Jim LAURIE
f716d0f4e5
Merge pull request #1021 from strapi/improve/ctb
Reorder model root attributes and remove "multiple" key
2018-04-24 18:59:45 +02:00
Jim LAURIE
4b508c8c39
Merge branch 'master' into improve/ctb 2018-04-24 18:10:50 +02:00
Jim LAURIE
e72a9b27e5
Merge pull request #1020 from strapi/enhance/generate
Move authentication and ssl in database options
2018-04-24 18:10:38 +02:00
Jim LAURIE
60eb9cf9d5
Merge branch 'master' into enhance/generate 2018-04-24 17:45:53 +02:00
Jim LAURIE
8bce274496
Merge pull request #996 from XcrossD/master
Update LeftMenuFooter style
2018-04-24 17:45:32 +02:00
Jim LAURIE
8a59fca0d1
Merge branch 'master' into master 2018-04-24 17:22:21 +02:00
Jim LAURIE
ee99a4ce80
Merge pull request #991 from zhuang17/reload-grant-config-when-changed
reload grant auth config into db when add/delete grant provider
2018-04-24 17:21:39 +02:00
Aurelsicoko
7a456da974 Move authentication and ssl in database options 2018-04-24 16:38:19 +02:00
Zhuang
5718a04bb8 Merge branch 'master' of https://github.com/strapi/strapi into reload-grant-config-when-changed 2018-04-24 22:20:21 +08:00
Aurelsicoko
1618d3f858 Reorder model root attribute and remove multiple key 2018-04-24 16:19:02 +02:00
Zhuang
d23ebfeaf0 merge the previous provider config 2018-04-24 22:18:21 +08:00