4274 Commits

Author SHA1 Message Date
Aurelsicoko
dfec0b630b Add updateRelations on models and update generated API to use this method 2018-05-09 12:52:32 +02:00
Aurelsicoko
fc44709069 Move relational management into a separate file 2018-05-08 18:44:47 +02:00
Aurelsicoko
13209fd3a5 Fixes #1134 2018-05-08 17:54:23 +02:00
Jim LAURIE
6cc7957dce
Merge pull request #1137 from strapi/fix-publish-email
Fix npm publish email plugin
2018-05-08 12:10:26 +02:00
Jim LAURIE
289ff7d698
Merge branch 'master' into fix-publish-email 2018-05-08 11:58:49 +02:00
Jim LAURIE
a1129b5b16
Merge pull request #1140 from strapi/issue/902
Disable minimize option by default on Mongoose
2018-05-08 11:58:28 +02:00
Jim LAURIE
3442a9787a
Merge branch 'master' into issue/902 2018-05-08 11:49:14 +02:00
Jim LAURIE
aefb6c08c8
Merge pull request #1122 from abdonrd/npmignore
Ignore .editorconfig & .gitattributes in npm plugins & admin
2018-05-08 11:48:53 +02:00
Jim LAURIE
0bb4f9cfae
Merge branch 'master' into npmignore 2018-05-08 11:36:35 +02:00
Aurelsicoko
de4ac8042d Disable minimize option by default on Mongoose 2018-05-07 17:44:02 +02:00
Jim LAURIE
7fb94c24c8
Merge pull request #1002 from strapi/fix/736
Fix loose of permissions during restart
2018-05-07 15:39:09 +02:00
Jim LAURIE
d0b9233b17
Merge branch 'master' into fix/736 2018-05-07 15:27:41 +02:00
Jim Laurie
3e10c2e6cd Fix npm publish email plugin 2018-05-07 15:22:41 +02:00
Jim LAURIE
462a132833
Merge pull request #1136 from strapi/fix-relation-input
Fix input relation
2018-05-07 11:04:33 +02:00
Jim Laurie
8f5443db17 3.0.0-alpha.12.1.3 2018-05-07 10:46:43 +02:00
Jim LAURIE
52271fa769
Merge pull request #1126 from nurikabe/patch-3
Tweak grammar of error message
2018-05-06 20:43:53 +02:00
Jim Laurie
38fc1aade7 Fix input relation 2018-05-06 20:34:33 +02:00
Evan Owens
185781c65d
Tweak grammar of error message 2018-05-05 10:34:48 -04: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
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
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
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
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
Aurelsicoko
2fe530e334 Merge branch 'master' of github.com:strapi/strapi into upload/bookshelf 2018-05-02 17:08:07 +02:00
Aurelsicoko
e3fc6ad30b Remove the return to avoid the loop break 2018-05-02 17:07:03 +02:00
Jim LAURIE
fc6e126165
Merge pull request #1089 from strapi/fix-cm-entry-relations
Fix entry create relations
2018-05-02 17:06:32 +02:00
Jim LAURIE
e6a14367f3
Merge branch 'master' into fix-cm-entry-relations 2018-05-02 17:04:41 +02:00