29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	786048edab	Merge pull request #897 from strapi/hotfix/filters ... Hotfix params bookshelf filters	2018-04-03 17:05:41 +02:00
Jim Laurie	cd8fd85f12	Hotfix params bookshelf filters	2018-04-03 17:04:10 +02:00
Jim LAURIE	e70613bc0e	Merge pull request #896 from Jan10/master ... Improve german translation	2018-04-03 16:52:18 +02:00
Jan Brachhold	7dfd46b8d2	Improve german translation	2018-04-03 15:02:41 +02:00
Jim LAURIE	95fc5ad0aa	Merge pull request #895 from strapi/fix/863 ... Review bookshelf filters	2018-04-03 14:09:26 +02:00
Jim Laurie	5948e9fa5c	Update content manager filter	2018-04-03 13:03:41 +02:00
Jim Laurie	e8181a397f	Review bookshelf filters ... fix #863	2018-04-03 12:38:33 +02:00
Aurelsicoko	32eeb4063e	Be able to add description and deprecated reason on query	2018-04-03 12:14:34 +02:00
Jim LAURIE	d1081dabc6	Merge pull request #889 from nurikabe/patch-1 ... Update customize-admin.md	2018-04-03 11:59:31 +02:00
Aurelsicoko	66b75801c7	Add contains query and be able to disabled specific query	2018-04-03 11:30:39 +02:00
Jim LAURIE	cab84eb68a	Merge branch 'master' into patch-1	2018-04-03 10:45:09 +02:00
Jim LAURIE	f1fe8a5e86	Merge pull request #890 from nurikabe/patch-2 ... Center logo	2018-04-03 10:44:54 +02:00
Adrien Lepoutre	0b0ea75402	ISSUE 825 - Losing OneToOne relation in the content manager - Fixes #825	2018-04-02 17:50:03 -04:00
Evan Owens	63d8512cb7	Center logo ... `center center` logo background position so that we don't have to use logos with a specific height and width.	2018-04-02 15:34:08 -04:00
Evan Owens	6ad71e4302	Update customize-admin.md	2018-04-02 15:18:38 -04:00
Aurelsicoko	e917c61b02	Optimize GraphQL query with Bookshelf	2018-04-02 19:24:36 +02:00
Aurelsicoko	6c2399715a	Link bookshelf on setup & advanced load order on hook	2018-04-02 18:33:12 +02:00
Aurelsicoko	78792ceff8	Display pretty schema using printSchema native function	2018-04-02 17:56:17 +02:00
Aurelsicoko	d69b272e13	Supported query arguments on nested association query	2018-04-02 17:36:11 +02:00
Aurelsicoko	920ced6ce7	Resolve conflicts	2018-04-02 16:40:40 +02:00
Aurelsicoko	b6fec35d39	Handle limit, skip, start and where parameters into the GraphQL query	2018-04-02 16:31:27 +02:00
Jim LAURIE	0c912153a9	Merge pull request #887 from strapi/fix-wysiwig-design ... Fix wysiwig design	2018-04-02 13:34:35 +02:00
Jim LAURIE	5796d96ecc	Merge pull request #879 from strapi/improve-wys-upload ... Improve file upload in WYSIWYG	2018-04-02 13:29:46 +02:00
soupette	b0c93135a4	Merge branch 'wysiwyg-preview-fullscreen' of github.com:strapi/strapi into improve-wys-upload	2018-04-02 12:06:51 +02:00
soupette	9e96a68d90	Fix code block	2018-04-02 11:57:50 +02:00
Jim LAURIE	839b6069bb	Merge pull request #848 from strapi/ctb-default-value ... Allow default values in ctb	2018-04-02 11:54:04 +02:00
soupette	6e4cc37321	Add spacing for lists	2018-04-02 11:44:11 +02:00
Jim LAURIE	45681235fa	Merge branch 'master' into wysiwyg-preview-fullscreen	2018-04-02 11:43:48 +02:00
soupette	ee26d8fcd8	Fix fullscreen preview	2018-04-02 11:34:37 +02:00
Jim LAURIE	b9eea87885	Merge branch 'master' into ctb-default-value	2018-04-02 11:27:56 +02:00
Jim LAURIE	bbcba48c4e	Merge pull request #854 from lucaperret/feat/upload-cloudinary ... Upload feature: add Cloudinary	2018-04-02 11:19:48 +02:00
soupette	7d718c9627	Add react-loadable and fix wysiwyg css	2018-04-02 11:18:05 +02:00
Jim LAURIE	d06e490280	Merge branch 'master' into feat/upload-cloudinary	2018-04-02 11:01:52 +02:00
soupette	86bc73e9d1	Fix conflict	2018-04-02 09:50:58 +02:00
Jim LAURIE	b2378630b5	Merge pull request #869 from strapi/fix/726 ... Replace server host by localhost	2018-04-01 14:31:31 +02:00
Aurelsicoko	74ad7ffa0c	Handle relationship in GraphQL query	2018-03-31 18:55:08 +02:00
Jim LAURIE	6a8045c4a3	Merge branch 'master' into fix/726	2018-03-31 18:32:35 +02:00
Jim LAURIE	7775fd128a	Merge pull request #881 from oad-earth/master ... polish language | update	2018-03-31 18:31:25 +02:00
Jim LAURIE	6e93e95d73	Merge branch 'master' into master	2018-03-31 15:11:59 +02:00
Jim LAURIE	a347f19686	Merge pull request #882 from strapi/fix-css-ctb ... Fixes #880	2018-03-31 15:10:54 +02:00
soupette	31b8e7cb34	Fixes #880	2018-03-30 20:27:37 +02:00
Inder Redni	1e914be7b7	polish language | update	2018-03-30 19:00:06 +02:00
soupette	49d657b203	Merge branch 'wysiwyg-preview-fullscreen' of github.com:strapi/strapi into improve-wys-upload	2018-03-30 18:15:53 +02:00
soupette	1cb8de307a	Fix conflict	2018-03-30 18:05:42 +02:00
soupette	a6e9526171	Fix BottomInlineControls	2018-03-30 18:01:46 +02:00
Aurelsicoko	641289664b	Auto-generate plugin schema when shadowCRUD is enabled	2018-03-30 17:33:04 +02:00
Aurelsicoko	dd61fc8262	Add description and execute policies before the resolver	2018-03-30 17:05:24 +02:00
soupette	0c8769138c	Fix conflict	2018-03-30 13:00:03 +02:00
soupette	93497ec8c9	Fix strategies	2018-03-30 12:54:53 +02:00
Jim LAURIE	d1bcd5a637	Merge branch 'master' into fix/726	2018-03-30 12:28:43 +02:00