3192 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aurelsicoko	dc75b51d6f	[WIP] Polymorphic associations with Bookshelf	2018-02-20 19:59:05 +01:00
Aurelsicoko	128a3a67e6	Merge branch 'master' of github.com:strapi/strapi into relations/polymorphic	2018-02-13 15:13:06 +01:00
Jim LAURIE	520c0bfcc8	Merge pull request #620 from strapi/fix-filter-doc ... Fix filter documentation	2018-02-13 13:21:39 +01:00
Jim LAURIE	df48e85ff5	Merge branch 'master' into fix-filter-doc	2018-02-13 11:28:24 +01:00
Jim LAURIE	63f2c83a64	Merge pull request #628 from strapi/configs-databases ... Handle configuration in database	2018-02-13 11:28:11 +01:00
Jim LAURIE	4ab9907bd7	Merge branch 'master' into configs-databases	2018-02-13 11:10:05 +01:00
Jim LAURIE	039efc0b42	Merge pull request #632 from lucaperret/feat/tmp-connection ... Feat/tmp connection	2018-02-13 11:09:53 +01:00
Luca	a3f300e34a	Merge branch 'master' into feat/tmp-connection	2018-02-12 19:30:18 +01:00
Luca Perret	3eb09a54d5	use tmp path for temporal connectivity check	2018-02-12 19:14:36 +01:00
Luca Perret	9f6a57245b	allowing docker volume on node_modules	2018-02-12 19:08:37 +01:00
Aurelsicoko	134fa960cd	Limit populate object where model is equal	2018-02-12 19:04:36 +01:00
Aurelsicoko	46ff89e404	Make polymorphic associations possible	2018-02-12 18:54:34 +01:00
Jim LAURIE	5f3bbb0b44	Merge pull request #627 from strapi/enhancement/tutorials-doc ... Enhancement/tutorials doc	2018-02-12 18:12:47 +01:00
Jim LAURIE	a1e8eb5467	Merge branch 'master' into enhancement/tutorials-doc	2018-02-12 17:45:01 +01:00
Jim Laurie	1a7e3b70f6	Add store data documentation	2018-02-12 17:43:16 +01:00
Jim LAURIE	0af9b111e2	Merge pull request #629 from strapi/enhancement/README.md ... Move Heroku button in README.md	2018-02-12 16:52:24 +01:00
Jim Laurie	b74dd97bec	Fix get null config bookshelf	2018-02-12 15:16:23 +01:00
Jim Laurie	f155736012	Fix mask for admin routes	2018-02-12 14:38:54 +01:00
Pierre Burgy	d5470f0d07	Move Heroku button in README.md	2018-02-12 14:35:53 +01:00
Jim Laurie	7607d20310	Fix PR feedback	2018-02-12 14:10:20 +01:00
Jim Laurie	5bf1e51422	Fix conflicts	2018-02-12 13:25:43 +01:00
Pierre Burgy	54e0dd1d84	Add tutorials in doc	2018-02-12 12:07:36 +01:00
Jim LAURIE	6207a67da2	Merge pull request #626 from strapi/enhancement/README.md ... Add Heroku deploy button in README.md	2018-02-12 11:59:27 +01:00
Pierre Burgy	859a96df3a	Add Heroku deploy button in documentation README.md	2018-02-12 11:48:29 +01:00
Pierre Burgy	7ef60701fe	Change version in README.md documentation	2018-02-12 11:43:55 +01:00
Pierre Burgy	ae6d88bca4	Add Heroku deploy button in README.md	2018-02-12 11:39:31 +01:00
Jim LAURIE	bde677735b	Merge branch 'master' into fix-filter-doc	2018-02-09 20:25:32 +01:00
Jim LAURIE	589679ce9b	Merge pull request #618 from strapi/design/icons ... Update icons and logo	2018-02-09 18:35:27 +01:00
Jim LAURIE	36f9f27d0c	Merge branch 'master' into design/icons	2018-02-09 18:19:21 +01:00
Aurelsicoko	21893dc8e6	Optimize SVG icons	2018-02-09 17:22:18 +01:00
Aurelsicoko	7c2317cba2	Update plugins list icon	2018-02-09 17:17:48 +01:00
Jim LAURIE	6dcad2537a	Merge pull request #617 from strapi/fix/boot ... Update default hook timeout to 3000 milliseconds	2018-02-09 17:17:16 +01:00
Aurelsicoko	60821dca69	Update naming and default links icon	2018-02-09 17:16:30 +01:00
Aurelsicoko	36d650effa	Update marketplace icon style	2018-02-09 17:09:35 +01:00
Aurelsicoko	b2d85c0b8e	Update icon container style	2018-02-09 17:07:10 +01:00
Jim LAURIE	08d74e1515	Merge branch 'master' into fix/boot	2018-02-09 17:02:18 +01:00
Jim LAURIE	2ecd3bf89c	Merge pull request #613 from strapi/enhancement/mask ... Enhancement/mask	2018-02-09 17:02:02 +01:00
Aurelsicoko	5cbfc6f050	Update logo	2018-02-09 17:01:04 +01:00
Jim LAURIE	6cbff0007c	Merge branch 'master' into enhancement/mask	2018-02-09 16:48:30 +01:00
Jim LAURIE	832883a91b	Merge pull request #612 from strapi/fix-fetch-error-mongoose ... Fix fetch error mongoose	2018-02-09 16:47:44 +01:00
Aurelsicoko	46a64b449f	Update default hook timeout to 3000 milliseconds	2018-02-09 16:36:23 +01:00
Jim LAURIE	09ee225029	Merge branch 'master' into fix-fetch-error-mongoose	2018-02-09 16:33:48 +01:00
Jim LAURIE	4520eef567	Merge pull request #611 from strapi/jwt-info-auth ... Update user info in JWT	2018-02-09 16:33:35 +01:00
Jim LAURIE	d1736a9732	Merge branch 'master' into jwt-info-auth	2018-02-09 15:57:58 +01:00
Jim LAURIE	21441e41d2	Merge pull request #610 from strapi/fix-db-args ... Fix strapi new without db args	2018-02-09 15:57:45 +01:00
Jim LAURIE	0cb9f05f9c	Merge branch 'master' into fix-db-args	2018-02-09 13:00:48 +01:00
Jim LAURIE	a173859a45	Merge pull request #606 from strapi/add/inputs-to-ctb ... Use the new input library in content type builder	2018-02-09 13:00:37 +01:00
Jim LAURIE	82b8361229	Merge branch 'master' into add/inputs-to-ctb	2018-02-09 12:18:11 +01:00
Jim LAURIE	f831be27e1	Merge pull request #593 from oad-earth/master ... Generating | Model name	2018-02-09 12:17:55 +01:00
Jim LAURIE	8510e5852f	Merge branch 'master' into master	2018-02-09 11:23:13 +01:00