621 Commits

Author	SHA1	Message	Date
Aurelsicoko	c111aaba13	Fixes #1247	2018-05-24 17:20:32 +02:00
Yakup AD	58e4b27ddb	update Turkish language translates	2018-05-20 14:08:47 +03: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
Jim Laurie	4fe7b6176e	Fix conflicts & lint	2018-05-16 12:07:02 +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
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
Aurelsicoko	451ad266fb	Keep first set permissions & remove duplicate	2018-05-03 16:26:57 +02:00
Jim Laurie	c491c61a97	3.0.0-alpha.12.2	2018-05-03 14:15:21 +02:00
Aurelsicoko	f62c5f52fc	Remove duplicate permissions	2018-05-02 11:40:42 +02:00
Jim LAURIE	a3d9454ee0	Merge branch 'master' into fix-ctb	2018-05-01 11:29:31 +02:00
soupette	68504fbe16	Add eslint to users-permissions backend	2018-04-30 18:26:56 +02:00
Zhuang	7634ff5602	add simplify chineses translation for plugins	2018-04-30 22:09:53 +08:00
soupette	ba6011beda	Fix popuprelation bug	2018-04-30 15:30:49 +02:00
Jim LAURIE	9cc62373f0	Merge branch 'master' into sql-xp	2018-04-27 16:29:49 +02:00
soupette	0ca85934ac	Add strapi-lint to ctm plugin and modify monorepo setups script to install it. ... Now the strapi-lint is installed in both the ctm and the helper-plugin. It will be installed in all plugins later. Important the updated eslint configuration requires to modify a lot of files....	2018-04-27 16:25:23 +02:00
Aurelsicoko	dffbf3bbb3	Concat promise to return a single array	2018-04-27 15:48:52 +02:00
Jim LAURIE	1850d5539b	Merge branch 'master' into improve-webpack-config	2018-04-26 14:20:10 +02:00
soupette	611dfb32eb	Merge branch 'master' of github.com:strapi/strapi into sql-xp	2018-04-26 10:26:09 +02:00
soupette	b7fffb0ce7	Fixes #958	2018-04-25 16:34:20 +02:00
Jim LAURIE	d94be998a4	Fix prevGrantConfig equal undefined when config not exist in db	2018-04-25 14:12:24 +02:00
Jim Laurie	29dab8fbb5	Fix #1013	2018-04-25 12:17:45 +02:00
Jim Laurie	8d2a46cd0c	Fix conflict timestamp	2018-04-25 11:06:12 +02:00
Zhuang	5718a04bb8	Merge branch 'master' of https://github.com/strapi/strapi into reload-grant-config-when-changed	2018-04-24 22:20:21 +08:00
Zhuang	d23ebfeaf0	merge the previous provider config	2018-04-24 22:18:21 +08:00
Jim Laurie	79ddc27cb1	U&P setup in bookshelf and handle oneToMany relation	2018-04-24 14:29:28 +02:00
soupette	6b3e3d472f	Improve errors notifications	2018-04-24 11:45:09 +02:00
Jim Laurie	8191c43ce5	Create tables is not exist instead of log queries	2018-04-23 16:09:01 +02:00
Aurelsicoko	7149cfa36e	Avoid badRequest when an API hasn't routes	2018-04-23 14:39:27 +02:00