1182 Commits

Author	SHA1	Message	Date
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
Aurelsicoko	73764d6ae0	Add containss in Bookshelf filters	2018-04-12 15:44:04 +02:00
Jim Laurie	bb114a592d	Clean model	2018-04-12 14:19:22 +02:00
Aurelsicoko	17c46b331d	Make GraphQL polymorphic relationships working with Bookshelf	2018-04-11 12:53:07 +02:00
Jim Laurie	bdd1583543	Handle polymorphic in admin ... Only for collection: * poly side	2018-04-10 14:46:36 +02:00
Aurelsicoko	3daf7523c8	Apply policy for each query and use generated API business logic	2018-04-10 11:47:01 +02:00
soupette	81109f558e	Fix conflict	2018-04-10 11:18:04 +02:00
Jan Brach	0efdd3a0b4	Merge branch 'master' into master	2018-04-06 17:25:00 +02:00
Jan Brachhold	51b7a93832	Improve german translation	2018-04-06 15:54:02 +02:00
Jim Laurie	ee12536e84	3.0.0-alpha.11.3	2018-04-05 14:13:50 +02:00
soupette	ff4253aeea	Fix conflict and fix focus bug in WYSIWYG	2018-04-04 17:51:41 +02:00
Abdón Rodríguez Davila	64a1d69e51	Fix typo: extra spaces	2018-04-03 20:36:56 +02:00
soupette	1cb8de307a	Fix conflict	2018-03-30 18:05:42 +02:00
Jim Laurie	8390106f59	3.0.0-alpha.11.2	2018-03-27 17:59:16 +02:00
Jim Laurie	5d03c350e4	Clean user model	2018-03-27 16:44:25 +02:00
Aurelsicoko	0803b021c2	Improve preview style	2018-03-26 16:28:21 +02:00
cyril lopez	5d5d5d1097	Add fullscreen live preview	2018-03-22 18:19:49 +01:00
cyril lopez	9354b7eeb1	Merge branch 'master' of github.com:strapi/strapi into wysiwyg	2018-03-20 16:13:27 +01:00