4547 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	43c6671373	Merge pull request #1146 from strapi/fix/duplicatePermissions ... Avoid to delete duplicate permissions per role	2018-05-09 17:36:52 +02:00
Jim LAURIE	e48ae12b42	Merge branch 'master' into fix/duplicatePermissions	2018-05-09 17:25:52 +02:00
Aurelsicoko	c7f871745a	Fix findOne user, many-to-many relationship loss and remove relation business logic from CM	2018-05-09 16:57:16 +02:00
Aurelsicoko	7e7b0f1d2f	Move relation management into a separate file for Bookshelf	2018-05-09 16:08:58 +02:00
Aurelsicoko	02a2e087cc	Remove warning where clause	2018-05-09 15:11:55 +02:00
Aurelsicoko	9d8cd3f620	Don't push model on useless collection tree	2018-05-09 14:58:47 +02:00
Aurelsicoko	b57449ebfa	Fix one-to-one relation on Mongoose	2018-05-09 14:56:08 +02:00
Aurelsicoko	dfec0b630b	Add updateRelations on models and update generated API to use this method	2018-05-09 12:52:32 +02:00
DMehaffy	680c7377fc	fix1148 ... Update MySQL float data type from `float` to `double` to properly store large float values.	2018-05-09 02:28:17 -07:00
Jim LAURIE	5b07acb7a6	Merge pull request #1147 from derrickmehaffy/fix1144 ... Update Strapi-Bookshelf to create enumeration columns	2018-05-09 10:05:45 +02:00
DMehaffy	0a2272515a	Update Strapi-Bookshelf to create enumeration columns ... Added a case for strapi bookshelf to create a varchar(255) column for enumeration values, inline to match how string columns are made.	2018-05-08 11:00:57 -07: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	0c3f8067ff	Merge pull request #1145 from nyl-auster/master ... Fix typo in fr translations : 'ajouter un champ'	2018-05-08 17:24:30 +02:00
Jim LAURIE	75fa810822	Merge branch 'master' into master	2018-05-08 17:15:23 +02:00
Jim LAURIE	4af9f21ca6	Merge pull request #1141 from abdonrd/patch-1 ... Docs: environments test to staging	2018-05-08 17:14:52 +02:00
yann	0a759762ab	fix typo on fr translation 'ajouter un champs'	2018-05-08 17:08:54 +02:00
Jim LAURIE	a9f9b6f428	Merge branch 'master' into patch-1	2018-05-08 12:10:40 +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	321adb39a4	Merge pull request #1138 from strapi/prettier ... Add prettier to `pre-commit` hook	2018-05-08 11:39:00 +02:00
Jim LAURIE	0bb4f9cfae	Merge branch 'master' into npmignore	2018-05-08 11:36:35 +02:00
Abdón Rodríguez Davila	fd161adb96	Docs: environments test to staging	2018-05-08 00:32:36 +02:00
Aurelsicoko	de4ac8042d	Disable minimize option by default on Mongoose	2018-05-07 17:44:02 +02:00
soupette	6f655cf873	Add prettier to precommit	2018-05-07 16:24:15 +02:00
Jim LAURIE	c09f5138a2	Merge branch 'master' into eslint	2018-05-07 16:03:35 +02:00
Jim LAURIE	81b9edff41	Merge pull request #1123 from strapi/lint-monorepo-only ... Lint monorepo only	2018-05-07 15:43:42 +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
soupette	0441c9c066	Add prettier	2018-05-07 14:52:48 +02:00
soupette	deb7749213	Add prettier	2018-05-07 12:07:16 +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
soupette	2df4cb3311	Remove npm run lint test in all packages	2018-05-07 09:29:35 +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
Ujal Imanov	d7e6d8ce22	Merge branch 'master' into fix-reload	2018-05-06 13:44:30 +02:00
Evan Owens	185781c65d	Tweak grammar of error message	2018-05-05 10:34:48 -04:00
soupette	bc39a640a5	Lint all packages	2018-05-04 18:27:39 +02:00
soupette	7f653f7e65	Lint all plugins	2018-05-04 18:12:06 +02:00
soupette	b608c5bda4	Lint ctm	2018-05-04 18:10:21 +02:00
soupette	6fe297e252	Lint strapi-mongoose	2018-05-04 18:09:55 +02:00
soupette	e593d03ae5	Lint strapi-knex	2018-05-04 18:03:41 +02:00
soupette	2580e49c4d	Lint strapi-helper-plugin	2018-05-04 18:02:35 +02:00
soupette	b5ed16d791	Lint strapi-generate-service	2018-05-04 17:53:35 +02:00
soupette	42310c5b83	Lint strapi-generate-policy	2018-05-04 17:53:01 +02:00