6761 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	b998238c41	Merge branch 'master' into patch-graphql-enum	2018-06-12 14:04:36 +02:00
Aurélien GEORGET	cc23051e01	Update after.js	2018-06-12 14:03:32 +02:00
Jim LAURIE	eef86d1bd6	Merge pull request #1348 from ekamgit/patch-1 ... Update hooks structure requirements	2018-06-12 14:01:40 +02:00
Jim LAURIE	54569b164e	Merge branch 'master' into patch-1	2018-06-12 13:40:29 +02:00
Jim Laurie	dc61f680eb	Remove plugin analytics on app creation	2018-06-12 13:32:59 +02:00
Jim LAURIE	3856ffad2d	Merge pull request #1328 from strapi/bulk-actions ... Add bulk actions in content-manager	2018-06-12 11:57:10 +02:00
soupette	b899bed52f	Merge branch	2018-06-12 11:53:30 +02:00
soupette	4a1d9bea1c	Change params q to _q	2018-06-12 11:43:41 +02:00
Aurelsicoko	7d6e7b9d0a	Handle boolean and numbers in search bar (bookshelf)	2018-06-12 11:32:13 +02:00
Jim LAURIE	5a77a67338	Merge branch 'master' into bulk-actions	2018-06-12 11:32:01 +02:00
Jim LAURIE	62d62e99b3	Merge pull request #1350 from strapi/fix/tests ... Get right global root path	2018-06-12 11:30:26 +02:00
Jim Laurie	b5f05e20a4	Fix morph relation	2018-06-12 11:26:40 +02:00
Jim LAURIE	b1bc94dd2b	Merge branch 'master' into fix/tests	2018-06-11 22:39:44 +02:00
Jim LAURIE	c419d7f430	Update deps position	2018-06-11 22:39:31 +02:00
Jim LAURIE	1510774eaf	Merge pull request #1354 from zhuang17/fix-language-load ... Fix language loading, first try load full user language code	2018-06-11 22:33:57 +02:00
Jim LAURIE	841c91d681	Merge branch 'master' into fix-language-load	2018-06-11 22:18:52 +02:00
Jim LAURIE	d063d12c7c	Merge pull request #1360 from strapi/fix-provider-role ... Set default Role to authenticated when using a custom provider	2018-06-11 19:59:21 +02:00
Jim LAURIE	a3f6a32865	Merge branch 'master' into fix-provider-role	2018-06-11 19:39:10 +02:00
Jim LAURIE	414cb9dc4a	Merge pull request #1346 from strapi/fix-filters ... Remove unappropriate filters according to field type	2018-06-11 19:30:11 +02:00
Jim LAURIE	98f9c0f61e	Merge branch 'master' into fix-filters	2018-06-11 19:06:43 +02:00
Jim LAURIE	fb9ba64462	Merge pull request #1313 from johannpinson/patch-builder-enum ... Add Enumeration type to content type builder	2018-06-11 19:03:28 +02:00
soupette	10cc2f813e	Handle nav with keyboard in popup choose relation	2018-06-11 19:01:01 +02:00
Jim LAURIE	0a759bc3f2	Merge branch 'master' into patch-builder-enum	2018-06-11 18:26:12 +02:00
Jim LAURIE	e62c7c2a11	Merge pull request #1342 from strapi/fix-1269 ... Fix bug when deleting a relation that has the same field on both sides	2018-06-11 17:59:35 +02:00
Aurelsicoko	ddc1258429	Merge branch 'ctm-search' of github.com:strapi/strapi into ctm-search	2018-06-11 17:58:56 +02:00
Aurelsicoko	3dd2615c98	Remove unnecessary padding on List container	2018-06-11 17:56:39 +02:00
Aurelsicoko	be87950148	Add new icon and update CSS to follow the original design	2018-06-11 17:52:40 +02:00
Jim LAURIE	9dc8670740	Merge branch 'master' into fix-count	2018-06-11 17:39:15 +02:00
Jim LAURIE	d588a54729	Merge branch 'master' into fix-1269	2018-06-11 17:19:45 +02:00
soupette	47d6e2c743	Add minus to bulk actions	2018-06-11 17:04:20 +02:00
Jim Laurie	6b7f4c23a9	Remove useless code from upload plugin	2018-06-11 16:55:04 +02:00
Jim LAURIE	6ca62ee492	Merge pull request #1336 from DanielRuf/chore/test-against-nodejs-8-10 ... chore: test against Node.js 9 and 10	2018-06-11 16:30:57 +02:00
soupette	ae51f39c62	Fix default role when login with custom providers	2018-06-11 16:08:43 +02:00
Jim LAURIE	5838d19f81	Merge branch 'master' into chore/test-against-nodejs-8-10	2018-06-11 15:39:20 +02:00
KuongKnight	4f03d10b53	Update from upstream	2018-06-11 20:16:17 +07:00
Daan De Deckere	732038593f	Use type ID for primary key instead of String. ... Fixes #1356.	2018-06-09 22:03:53 +02:00
Daniel Ruf	24750caea2	chore: only test Node.js 9 and 10	2018-06-09 21:27:31 +02:00
Jim Laurie	892f4e3626	Fix setup links	2018-06-09 13:51:48 +02:00
Jim LAURIE	ee772c013e	Merge branch 'master' into master	2018-06-09 13:50:22 +02:00
Zhuang	66f273d673	fix language loading, first try load user language config, and then try load short user language code	2018-06-09 19:20:25 +08:00
Jim Laurie	e773d5d0d0	Fix route count	2018-06-08 22:52:41 +02:00
Jim LAURIE	92a3c453b7	Merge pull request #1338 from strapi/change-stm-link ... Move settings-manager to configuration section	2018-06-08 21:01:22 +02:00
Kamal Bennani	4920c1fa76	Set the entry type only when the value is defined	2018-06-08 20:27:45 +02:00
Jim LAURIE	fd69eff50c	Merge branch 'master' into change-stm-link	2018-06-08 20:20:41 +02:00
Johann Pinson	e215c70bbc	Merge branch 'master' into patch-graphql-enum	2018-06-08 19:43:29 +02:00
Johann Pinson	ac49805641	refactor(graphql): improve codebase array function + remove useless string template	2018-06-08 19:43:10 +02:00
Jim LAURIE	88b95bbeed	Merge pull request #1295 from strapi/fix-1262 ... Use suggested content type names when setting relations	2018-06-08 19:05:58 +02:00
Jim LAURIE	7e60299e43	Merge branch 'master' into fix-1262	2018-06-08 17:33:28 +02:00
Jim LAURIE	7236623359	Merge pull request #1309 from nurikabe/patch-2 ... Left-align form labels in Edge	2018-06-08 17:33:15 +02:00
Jim LAURIE	6af48e7622	Merge branch 'master' into patch-2	2018-06-08 17:15:17 +02:00