29765 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim Laurie	3b7de09362	Fix upload count page	2018-04-13 15:42:45 +02:00
soupette	795993a9b6	Empty ctm layout.json	2018-04-13 15:14:11 +02:00
Jim LAURIE	80d1849093	Merge pull request #937 from strapi/add-version-to-admin ... Add strapi version on left menu	2018-04-13 15:11:21 +02:00
soupette	f7cbfbf1db	Merge branch 'graphql' of github.com:strapi/strapi into graphql	2018-04-13 14:44:25 +02:00
Jim LAURIE	a508dcf7d7	Merge branch 'master' into add-version-to-admin	2018-04-13 14:43:25 +02:00
Jim LAURIE	42572f6409	Merge pull request #935 from declantyson/patch-1 ... Update Getting Started docs to show correct sort parameter	2018-04-13 14:43:11 +02:00
soupette	a66ca698ee	Fix hook bug and remove useless admin containers	2018-04-13 14:37:46 +02:00
Aurelsicoko	aaac5ba391	Clean code	2018-04-13 14:27:50 +02:00
Jim LAURIE	6ba1e667c0	Merge branch 'master' into patch-1	2018-04-13 14:02:55 +02:00
Jim LAURIE	59f3146db3	Merge pull request #934 from strapi/fix-setup ... Fix project npm run setup	2018-04-13 14:02:31 +02:00
soupette	eae1ae1d7f	Fix PR feedback	2018-04-13 13:50:05 +02:00
Jim LAURIE	a65e0c5f56	Merge branch 'master' into fix-setup	2018-04-13 13:34:15 +02:00
soupette	24b0ca8259	Update doc	2018-04-13 10:17:45 +02:00
Jim LAURIE	bae40c837d	Merge pull request #933 from strapi/poly-cm ... Handle polymorphic in content manager	2018-04-13 10:14:23 +02:00
soupette	d9291ae394	Allow to pass custom input type and components to the lib	2018-04-13 09:57:17 +02:00
soupette	87b5832a51	Fixes #810	2018-04-12 23:45:17 +02:00
Declan Tyson	ca7cd5e97a	Change order filter to sort to reflect parameter	2018-04-12 17:55:02 +01:00
Jim LAURIE	950122dbdb	Merge branch 'master' into poly-cm	2018-04-12 17:58:51 +02:00
cyril lopez	936bdf7949	Merge branch 'master' into fix-setup	2018-04-12 17:30:50 +02:00
soupette	3176f02a25	Fixes #858	2018-04-12 17:28:13 +02:00
Aurelsicoko	0ac7c435f3	Merge branch 'master' of github.com:strapi/strapi into graphql	2018-04-12 16:37:23 +02:00
Aurelsicoko	b4191d755e	Improve GraphQL documentation	2018-04-12 16:35:21 +02:00
Aurelsicoko	e5785ac2ca	Improve GraphQL documentation	2018-04-12 16:14:47 +02:00
Aurelsicoko	78e69cebd5	Add description to explain specificities of the roles query	2018-04-12 15:57:25 +02:00
Jim LAURIE	d3a82618b3	Merge pull request #928 from Froelund/patch-2 ... Fixed issue for connection settings and ssl prop	2018-04-12 15:48:21 +02:00
Aurelsicoko	73764d6ae0	Add containss in Bookshelf filters	2018-04-12 15:44:04 +02:00
Jim LAURIE	1cf906547f	Merge branch 'master' into patch-2	2018-04-12 15:30:03 +02:00
Jim LAURIE	f896d94424	Merge pull request #831 from strapi/wysiwyg-preview-fullscreen ... Wysiwyg	2018-04-12 15:27:07 +02:00
Jørgensen	f5a0bce148	Update index.js ... Updated according to comments.	2018-04-12 15:23:03 +02:00
Jim LAURIE	6e843dad3e	Merge branch 'master' into wysiwyg-preview-fullscreen	2018-04-12 15:02:13 +02:00
Aurelsicoko	815f896ba8	Remove logs and clean code	2018-04-12 14:42:31 +02:00
Jim Laurie	bb114a592d	Clean model	2018-04-12 14:19:22 +02:00
Jim LAURIE	be2162eaa4	Merge pull request #929 from Jan10/master ... Update german translations	2018-04-12 12:02:29 +02:00
soupette	37c976d495	WYSIWYG is ready	2018-04-12 09:49:29 +02:00
soupette	57e34cf994	Allow to add <a><img /><a>	2018-04-11 22:39:30 +02:00
soupette	54fc51592b	Need to identify add ul bug	2018-04-11 22:13:43 +02:00
Jan Brachhold	d986055fb8	Update german translations	2018-04-11 21:19:31 +02:00
Jim LAURIE	c15d166685	Merge pull request #892 from TheWebsDoor/ISSUE-825 ... Losing OneToOne relation in the content manager	2018-04-11 19:56:35 +02:00
soupette	cdc92607d6	Handle img links!!!!!!!!	2018-04-11 19:36:08 +02:00
Jim LAURIE	80922afd79	Merge branch 'master' into ISSUE-825	2018-04-11 18:52:27 +02:00
Adrien Lepoutre	2496611fca	Code cleaning	2018-04-11 10:09:53 -04:00
Aurelsicoko	534a1099ac	Update CSS WYSIWYG	2018-04-11 15:08:20 +02:00
Jørgensen	b64ad9524f	Fixed issue for connection settings and ssl prop	2018-04-11 14:40:05 +02:00
Aurelsicoko	17c46b331d	Make GraphQL polymorphic relationships working with Bookshelf	2018-04-11 12:53:07 +02:00
soupette	d31d82ab1f	Fix conflicts	2018-04-11 12:45:21 +02:00
soupette	9c0cde3489	Add comments	2018-04-11 12:40:29 +02:00
Jim LAURIE	9fa9eb42ed	Merge pull request #903 from strapi/new-dashboard ... New dashboard	2018-04-11 12:28:21 +02:00
Jim LAURIE	eed50f0c70	Merge branch 'master' into new-dashboard	2018-04-11 11:23:53 +02:00
Jim LAURIE	3f2a76d771	Merge pull request #906 from strapi/update-mkt ... Update installpluginpage design	2018-04-11 11:22:37 +02:00
Aurelsicoko	c59ad9d958	Support findOne request	2018-04-10 19:02:21 +02:00