6761 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aurelsicoko	96934a23da	Improve retrieving of relationships with GraphQL	2018-04-17 17:29:24 +02:00
Aurelsicoko	2d1d642c32	Fix setup	2018-04-17 16:26:34 +02:00
Aurelsicoko	53bedf277b	Fix version number in left menu	2018-04-17 16:05:10 +02:00
Aurelsicoko	79e3b56a1e	Remove unnecessary admin and add GraphQL logo	2018-04-17 15:24:17 +02:00
Aurelsicoko	ad46c6b40a	Merge branch 'master' of github.com:strapi/strapi into graphql	2018-04-17 15:10:30 +02:00
Jim Laurie	fd55859c4b	Add missing dependency	2018-04-17 15:03:28 +02:00
cyril lopez	f0eca93f93	Merge branch 'master' into reduce-setup-monorepo	2018-04-17 12:04:55 +02:00
Jim LAURIE	2d337df7a0	Merge pull request #950 from strapi/add-articles-to-dashboard ... Add latest articles to HomePage	2018-04-17 11:54:26 +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
soupette	58dd77acb9	Allow async build	2018-04-17 11:43:47 +02:00
Jim Laurie	4364c33afe	Remove prepublish admin build	2018-04-17 11:20:13 +02:00
Jim LAURIE	67e4f37c03	Merge branch 'master' into graphql	2018-04-17 11:18:28 +02:00
Aurelsicoko	aa6fdb2c93	Resolve conflicts	2018-04-17 11:12:41 +02:00
Aurelsicoko	d96192025b	Add link on blog articles	2018-04-17 11:10:23 +02:00
soupette	6f64fc83fe	Allow setup without building plugins	2018-04-17 10:30:30 +02:00
Jim LAURIE	afac8b5582	Merge pull request #948 from strapi/doc-upload ... Add upload provider documentation	2018-04-17 10:23:03 +02:00
soupette	d620053799	Add username to welcome block	2018-04-16 18:57:08 +02:00
soupette	f13ace8599	Add latest articles to HomePage	2018-04-16 18:13:36 +02:00
Jim LAURIE	c0ea8fa807	Merge branch 'master' into graphql	2018-04-16 16:39:50 +02:00
soupette	0f2ebfa997	Allow plugins without admin && fix babel polyfill error	2018-04-16 16:19:28 +02:00
Jim Laurie	3da6115fac	Add upload provider documentation	2018-04-16 14:17:21 +02:00
Aurelsicoko	588363dcd7	Add strapi-helper-plugin in setup GraphQL plugin	2018-04-16 12:08:53 +02:00
Jim LAURIE	80e2cb2609	Merge pull request #947 from cece95/master ... Fix SQL database UTF-8 email template	2018-04-16 10:49:00 +02:00
Aurelsicoko	03949457a3	Update setup to fix babel-polyfill issues on GraphQL	2018-04-16 10:00:12 +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
Jim LAURIE	8531e9f8be	Merge pull request #945 from Makeyko/master ... Russian language pack update	2018-04-16 09:47:27 +02:00
cesare grigoletto	ea284ae96e	Merge branch 'master' into master	2018-04-16 08:53:00 +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
Administrator	147f614c09	Russian language for Upload plugin	2018-04-15 20:13:23 +03:00
Administrator	5a60baa454	Russian language for Mail and Settings Manager plugins	2018-04-15 18:58:56 +03:00
Administrator	31a0393c52	Russian language pack for content type builder	2018-04-15 18:16:09 +03:00
Administrator	d030dc06ba	Russian language pack update. Admin translations fixes + Content manager translations added.	2018-04-15 13:30:31 +03:00
Jim LAURIE	cd43705203	Merge pull request #944 from Makeyko/master ... Add Russian language in admin	2018-04-15 10:09:24 +02:00
Administrator	8941d8683d	russian language	2018-04-14 23:54:21 +03:00
Aurelsicoko	87b07c8eeb	Resolve conflicts	2018-04-13 18:04:03 +02:00
Aurelsicoko	058c84d61e	Fix float & decimal number on Mongoose	2018-04-13 18:02:37 +02:00
Jim LAURIE	8897aa599b	Merge pull request #941 from strapi/fix/welcome-dashboard ... Change link	2018-04-13 17:09:05 +02:00
Jim LAURIE	4a8ab72a55	Merge branch 'master' into fix/welcome-dashboard	2018-04-13 16:36:03 +02:00
Jim LAURIE	215e801071	Merge pull request #940 from strapi/fix/upload-cout ... Fix upload count page	2018-04-13 16:35:50 +02:00
Jim LAURIE	42d3009638	Merge branch 'master' into fix/upload-cout	2018-04-13 16:13:21 +02:00
Jim LAURIE	031a0d9b0d	Merge pull request #938 from strapi/allow-new-input ... Allow to pass custom input type and components to the lib	2018-04-13 16:13:03 +02:00
Aurélien GEORGET	8da3c8c66f	Change link	2018-04-13 16:08:37 +02:00
Jim LAURIE	06555cf4d4	Merge branch 'master' into allow-new-input	2018-04-13 15:44:06 +02:00
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