soupette
|
66104d9e11
|
Fix conflicts
|
2019-10-01 17:56:52 +02:00 |
|
Jim LAURIE
|
fcf6e76804
|
Fix default config usage ejs
|
2019-09-27 10:07:53 +02:00 |
|
Abdón Rodríguez Davila
|
187a669d1e
|
Merge branch 'master' into eslint-update
# Conflicts:
# .eslintrc.js
# package.json
# packages/strapi-admin/admin/src/containers/HomePage/CommunityContent.js
# packages/strapi-admin/admin/src/containers/HomePage/WelcomeContent.js
# packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js
# packages/strapi-hook-bookshelf/lib/index.js
# packages/strapi-hook-bookshelf/lib/utils/graphql.js
# packages/strapi-hook-bookshelf/lib/utils/index.js
# packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js
# packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
# packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js
# packages/strapi-plugin-content-manager/admin/src/components/TableHeader/index.js
# packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js
# packages/strapi-plugin-content-manager/admin/src/containers/SettingPage/index.js
# packages/strapi-plugin-content-manager/config/policies/routing.js
# packages/strapi-plugin-content-manager/services/ContentManager.js
# packages/strapi-plugin-content-type-builder/admin/src/components/TableListRow/index.js
# packages/strapi-plugin-content-type-builder/admin/src/containers/AttributesPickerModal/index.js
# packages/strapi-utils/lib/models.js
# yarn.lock
|
2019-09-09 15:26:35 +02:00 |
|
Abdón Rodríguez Davila
|
21a14ee737
|
Remove definitions for rules were not found
|
2019-08-28 12:20:27 +02:00 |
|
Alexandre Bodin
|
80989ee8ec
|
Make hook loading async
|
2019-08-19 09:37:37 +02:00 |
|
Alberto Maturano
|
154fc28a57
|
Normalize to standar file permissions
As a result of taking a look on PR #1967 I realized there is 819
executable files in this repository. It is obvious this is an error.
|
2018-09-24 12:33:09 -05:00 |
|
Jim LAURIE
|
cf8184e223
|
Use hook prefix and rename
|
2018-07-11 16:23:14 +02:00 |
|