4547 Commits

Author SHA1 Message Date
soupette
248db997b4 Lint strapi-generate-model 2018-05-04 17:52:04 +02:00
soupette
50598616f4 Lint strapi-generate-new 2018-05-04 17:50:39 +02:00
soupette
0bfbdf8e72 Lint strapi-generate-model 2018-05-04 17:44:42 +02:00
soupette
2c9aeb61a5 Lint strapi-generate-controller 2018-05-04 17:43:38 +02:00
soupette
666673961a Lint strapi-generate-api 2018-05-04 17:39:37 +02:00
soupette
3f8b7b2177 Lint strapi-generate-api 2018-05-04 17:38:29 +02:00
soupette
f389ea8860 Lint strapi-generate 2018-05-04 17:36:50 +02:00
soupette
e14c1373f9 Lint strapi-ejs 2018-05-04 17:31:21 +02:00
soupette
e9f68a3bc9 Lint in strapi-bookshelf 2018-05-04 17:29:44 +02:00
soupette
6633b14ef3 Add lint to strapi 2018-05-04 17:02:27 +02:00
Abdón Rodríguez Davila
0fbf3cae79 Ignore .editorconfig & .gitattributes in npm plugins & admin 2018-05-04 16:47:07 +02:00
Jim LAURIE
63f40fc356
Merge pull request #1121 from abdonrd/issue-templates
Fix the issue templates
2018-05-04 16:11:49 +02:00
Abdón Rodríguez Davila
6b26718f09 Fix issue templates 2018-05-04 16:07:13 +02:00
soupette
f9f78745ca Change test logic 2018-05-04 15:38:42 +02:00
Jim LAURIE
d05f8146a5
Merge pull request #1117 from strapi/update-issue-templates
Update issue and pr templates
2018-05-04 15:27:08 +02:00
Jim Laurie
9e0401de25 Update issue and pr templates 2018-05-04 12:44:15 +02:00
soupette
1a68f3ea9f Change test 2018-05-04 11:56:08 +02:00
soupette
74de4da177 Change test 2018-05-04 11:55:34 +02:00
soupette
601143b4d5 Remove eslint dependencie in all packages 2018-05-04 11:08:41 +02:00
Jim LAURIE
495a20728d
Merge pull request #1107 from strapi/eslint-utils-fix
Add eslint to strapi-utils
2018-05-04 11:07:50 +02:00
Udschal Imanov
8095cc3e03 Merge branch 'master' into fix-reload
* master:
  Keep first set permissions & remove duplicate
  3.0.0-alpha.12.2
  Improve the check of the database tables
  Add strapi-knex in generated project dependencies
  Avoid to loose relationship when editing from the many side
  Fix loosing of morph relations on update in CM with Bookshelf
  Fix loose many dominant
  Remove the return to avoid the loop break
  Fix single upload with Bookshelf
  Fix entry create relations
  Remove duplicate permissions
  Fixes #886
  add translations for EN and DE for authenticationDatabase and SSl in admin panel
  add authenticationDatabase and SSL to admin panel
2018-05-03 22:24:30 +02:00
soupette
942be55c8d Add eslint to strapi-utils 2018-05-03 18:13:22 +02:00
soupette
e808c9420c Merge branch 'eslint' of github.com:strapi/strapi into eslint 2018-05-03 17:47:50 +02:00
soupette
0bd9dd3509 Remove strapi-lint from hooks 2018-05-03 17:46:30 +02:00
soupette
2a30a20e7e Important! fix monorepo setup build command 2018-05-03 17:39:24 +02:00
Jim LAURIE
caff62850a
Merge pull request #1103 from strapi/fix/permissions
Fix permissions disappear from UI
2018-05-03 16:56:21 +02:00
Jim LAURIE
58deb0c3e9
Merge branch 'master' into fix/permissions 2018-05-03 16:46:06 +02:00
Jim LAURIE
af7a3c474b
Merge pull request #1079 from stephledev/master
Add authSource & ssl options to the admin panel
2018-05-03 16:41:06 +02:00
Aurelsicoko
451ad266fb Keep first set permissions & remove duplicate 2018-05-03 16:26:57 +02:00
Jim LAURIE
e328338181
Merge branch 'master' into master 2018-05-03 16:18:11 +02:00
Jim LAURIE
4db33cec4a
Merge pull request #1081 from strapi/fix/886
Remove attribute plugin in model
2018-05-03 16:09:42 +02:00
Jim LAURIE
10eee03393
Merge branch 'master' into fix/886 2018-05-03 15:59:11 +02:00
Jim LAURIE
3c61ed106a
Merge pull request #1100 from strapi/3.0.0-alpha.12.2
3.0.0-alpha.12.1
2018-05-03 14:19:16 +02:00
Jim Laurie
c491c61a97 3.0.0-alpha.12.2 v3.0.0-alpha.12.1 2018-05-03 14:15:21 +02:00
Jim LAURIE
30c21aef35
Merge pull request #1085 from strapi/eslint-email-graphql
Eslint email graphql
2018-05-03 14:06:39 +02:00
Jim LAURIE
e67da24554
Merge pull request #1098 from strapi/fix/knex
Add strapi-knex in generated project dependencies
2018-05-03 12:46:39 +02:00
Aurelsicoko
54c5afa311 Merge branch 'fix/knex' of github.com:strapi/strapi into fix/knex 2018-05-03 12:46:11 +02:00
Aurelsicoko
add8d47a86 Improve the check of the database tables 2018-05-03 12:45:02 +02:00
Jim LAURIE
8a5e3a59bb
Merge branch 'master' into fix/knex 2018-05-03 12:44:20 +02:00
Jim LAURIE
67a96da6d6
Merge pull request #1097 from strapi/fix/many-to-one
Avoid to loose relationship when editing from the many side
2018-05-03 12:35:42 +02:00
Aurelsicoko
120e10ef65 Add strapi-knex in generated project dependencies 2018-05-03 12:35:32 +02:00
Aurelsicoko
c67e2ef6d4 Avoid to loose relationship when editing from the many side 2018-05-03 12:08:35 +02:00
Jim LAURIE
750167aad4
Merge pull request #1092 from strapi/upload/bookshelf
Fix loosing of morph relations on update in CM with Bookshelf
2018-05-03 10:08:56 +02:00
Udschal Imanov
ae8023c52d fix strapi.reload.isWatching === undefined 2018-05-02 22:16:13 +02:00
Jim LAURIE
902ea63c05
Merge branch 'master' into upload/bookshelf 2018-05-02 17:57:24 +02:00
Jim LAURIE
899faecfa0
Merge pull request #1091 from strapi/fix-ctb-relations-many
Fix loose many to many dominant
2018-05-02 17:55:56 +02:00
Aurelsicoko
e9202c7a24 Fix loosing of morph relations on update in CM with Bookshelf 2018-05-02 17:52:23 +02:00
Jim LAURIE
ddff1ab3be
Merge branch 'master' into fix-ctb-relations-many 2018-05-02 17:43:55 +02:00
Jim Laurie
c944cb9e26 Fix loose many dominant 2018-05-02 17:41:09 +02:00
Jim LAURIE
19f360a43a
Merge pull request #1090 from strapi/upload/bookshelf
Fix when there are many manyMorphOne relations in the model
2018-05-02 17:18:25 +02:00