693 Commits

Author	SHA1	Message	Date
Jim Laurie	8085a2deaf	Update oneToOne test with id	2018-06-03 20:46:43 +02:00
soupette	78c9c8b936	Merge branch 'master' of github.com:strapi/strapi into content-manager-filters	2018-06-01 14:55:12 +02:00
Jim LAURIE	a9d725c74c	Merge branch 'master' into third-party-windows-auth	2018-05-31 14:54:51 +02:00
Jim LAURIE	aee7157d5a	Merge branch 'master' into fix/graphql	2018-05-29 21:09:57 +02:00
soupette	1b5be59745	Fix css	2018-05-28 16:13:17 +02:00
Aurelsicoko	4ca24a37de	Add usage tracking link in the menu #1280	2018-05-28 14:39:02 +02:00
soupette	48514fa8c4	Fix strapi utils convert params function	2018-05-25 15:57:07 +02:00
soupette	c95be9312d	Merge branch 'fix/graphql' of github.com:strapi/strapi into content-manager-filters	2018-05-25 13:33:52 +02:00
soupette	3847fd8c67	Fix filter for decimal	2018-05-25 13:21:57 +02:00
soupette	88d5cc2c37	Merge branch 'master' of github.com:strapi/strapi into content-manager-filters	2018-05-25 12:23:55 +02:00
soupette	eecccbcbd8	Remove Json from available filters	2018-05-24 18:15:35 +02:00
Aurelsicoko	c111aaba13	Fixes #1247	2018-05-24 17:20:32 +02:00
Johan Baath	1cdb1dfc76	fix clean up of duplicate permissions	2018-05-23 14:25:32 +02:00
soupette	87d70a8d34	Fix count query bookshelf in ctm & users-permissions	2018-05-23 10:29:04 +02:00
soupette	cc1669faf5	Fix sort query bookshelf users-permissions	2018-05-22 18:27:07 +02:00
soupette	d1dfb7fc40	Merge branch 'master' of github.com:strapi/strapi into content-manager-filters	2018-05-22 18:17:56 +02:00
soupette	7d3dd2ad0c	Clean user model	2018-05-22 17:56:13 +02:00
Yakup AD	58e4b27ddb	update Turkish language translates	2018-05-20 14:08:47 +03:00
soupette	f3bdbff968	Fix conflicts	2018-05-18 14:56:40 +02:00
Jim Laurie	6c194ff333	Init create new app test	2018-05-18 14:22:24 +02:00
Jim LAURIE	74d3987a11	Merge branch 'master' into add-styled-component	2018-05-18 11:07:32 +02:00
Jim Laurie	31c0d7457a	3.0.0-alpha.12.2	2018-05-17 16:54:27 +02:00
Aurelsicoko	bcb81a928e	Remove layout.json & add it in .gitignore	2018-05-17 15:12:00 +02:00
Aurelsicoko	535e263203	Fix icons which were not displayed in list row	2018-05-17 13:44:32 +02:00
Jim Laurie	4069a3bdaf	Fix fail build on publish npm release	2018-05-16 15:22:20 +02:00
soupette	97d8200c6c	Merge branch 'master' of github.com:strapi/strapi into content-manager-filters	2018-05-16 14:41:28 +02:00
soupette	fdad43f60d	Created Filter component	2018-05-16 12:47:59 +02:00
Jim Laurie	4fe7b6176e	Fix conflicts & lint	2018-05-16 12:07:02 +02:00
soupette	d9a4b2990f	Init filter design	2018-05-15 17:01:47 +02:00
soupette	51f5adc56a	Add styled-components	2018-05-15 14:07:18 +02:00
Jim LAURIE	f4905a9b2e	Merge branch 'master' into enhance/relations	2018-05-14 17:33:37 +02:00
Jim LAURIE	0c6f86ce3e	Merge branch 'master' into eslint	2018-05-14 16:13:47 +02:00
Jim Laurie	8cd33563ae	Harmonize model templates	2018-05-14 12:05:09 +02:00
cyril lopez	1f019c60c3	Merge branch 'master' into eslint	2018-05-14 11:50:32 +02:00
Marco Stephan	10b0bbffad	Fix third party authenticators always disabled on windows	2018-05-11 22:18:02 +02:00
Konstantin Tsabolov	9e897bcfda	Return HTTP 403 if user is not allowed to perform an operation	2018-05-10 19:36:15 +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	02a2e087cc	Remove warning where clause	2018-05-09 15:11:55 +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
Aurelsicoko	13209fd3a5	Fixes #1134	2018-05-08 17:54:23 +02:00
Jim LAURIE	0bb4f9cfae	Merge branch 'master' into npmignore	2018-05-08 11:36:35 +02:00
Jim LAURIE	c09f5138a2	Merge branch 'master' into eslint	2018-05-07 16:03:35 +02:00
Jim LAURIE	d0b9233b17	Merge branch 'master' into fix/736	2018-05-07 15:27:41 +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
Abdón Rodríguez Davila	0fbf3cae79	Ignore .editorconfig & .gitattributes in npm plugins & admin	2018-05-04 16:47:07 +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	58deb0c3e9	Merge branch 'master' into fix/permissions	2018-05-03 16:46:06 +02:00