599 Commits

Author	SHA1	Message	Date
Jim Laurie	8cd33563ae	Harmonize model templates	2018-05-14 12:05:09 +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	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	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
Abdón Rodríguez Davila	0fbf3cae79	Ignore .editorconfig & .gitattributes in npm plugins & admin	2018-05-04 16:47:07 +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
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
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
Aurelsicoko	61fb2dec45	Avoid random restart on permission update	2018-04-23 14:21:24 +02:00
Jim LAURIE	a77adb5b6a	Merge branch 'master' into fix-search-select	2018-04-23 13:36:01 +02:00
Jim LAURIE	36393b9594	Merge branch 'master' into reduce-setup-monorepo	2018-04-23 12:32:01 +02:00
Zhuang	e69dcc433b	reload grant value to db when add/delete provider	2018-04-21 12:29:00 +08:00
soupette	44d3519130	remove relations	2018-04-19 17:23:23 +02:00
soupette	81383f3562	Fixes #959	2018-04-19 15:45:35 +02:00
Juampy NR	6d366b78c1	Merge branch 'master' into fix-mysql-5.7	2018-04-18 19:05:16 +02:00
Juampy	32095d08c5	Fix invalid timestamp default values for MySQL 5.7	2018-04-18 19:01:19 +02:00
soupette	21e45890db	Fixes #964	2018-04-18 14:25:56 +02:00
Jim Laurie	ebd144fddb	3.0.0-alpha.12	2018-04-18 12:03:16 +02:00
cyril lopez	77bc3975c4	Merge branch 'master' into reduce-setup-monorepo	2018-04-18 11:54:36 +02:00
soupette	fcc374c3fd	Fix conflicts	2018-04-17 11:50:52 +02:00
soupette	7b87af5e1b	Remove prebuild test and update documentation	2018-04-17 11:49:09 +02:00
Jim LAURIE	c0ea8fa807	Merge branch 'master' into graphql	2018-04-16 16:39:50 +02:00
Jim LAURIE	23978a3da7	Merge branch 'master' into master	2018-04-16 09:49:58 +02:00
Jim LAURIE	ab238dca61	Remove space	2018-04-16 09:48:43 +02:00
cece95	32aefbe5be	fixed issue #923	2018-04-16 08:49:41 +02:00
Administrator	0168b9ffe5	Russian language for User Permission plugin	2018-04-15 21:42:05 +03:00
Aurelsicoko	87b07c8eeb	Resolve conflicts	2018-04-13 18:04:03 +02:00
Jim LAURIE	950122dbdb	Merge branch 'master' into poly-cm	2018-04-12 17:58:51 +02:00
Aurelsicoko	0ac7c435f3	Merge branch 'master' of github.com:strapi/strapi into graphql	2018-04-12 16:37:23 +02:00
Aurelsicoko	78e69cebd5	Add description to explain specificities of the roles query	2018-04-12 15:57:25 +02:00