33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
cyril lopez	010c3f8072	Design ImgPReview slider and remoive dynamic	2018-02-12 15:12:58 +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
cyril lopez	aaff3e8f87	Init Inputfile component ... Handle preview for both existing files and uploaded ones	2018-02-12 11:23:02 +01:00
Jim LAURIE	bde677735b	Merge branch 'master' into fix-filter-doc	2018-02-09 20:25:32 +01:00
inder redni	87e35d3f95	polish language | strapi-plugin-content-manager	2018-02-09 20:11:40 +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
inder redni	f7f8ce3bdb	polish language | strapi-admin	2018-02-09 18:03:36 +01:00
inder redni	d7eb4b3ad0	Merge branch 'master' of https://github.com/oad-earth/strapi	2018-02-09 18:00:48 +01:00
Jim LAURIE	a5ebf10787	Merge branch 'master' into master	2018-02-09 18:00:13 +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
Jim LAURIE	cc4dc6cd50	Merge pull request #614 from strapi/hide-password-database-cli ... Hide password database cli	2018-02-09 11:13:38 +01:00
Aurelsicoko	200a40d758	Improve attributes example	2018-02-09 11:03:53 +01:00
Aurelsicoko	36501aeeb6	Write validations documentation	2018-02-09 11:02:00 +01:00
Aurelsicoko	5f19c8b3b3	Apply PR feedback	2018-02-09 10:46:37 +01:00
Aurelsicoko	824567de0d	[WIP] Polymorphic assocations	2018-02-09 10:43:09 +01:00
Jim Laurie	0c296abdeb	Fix filter documentation	2018-02-08 17:13:28 +01:00
cyril lopez	26a5d95850	Created ImgPreview and InputFile components ... Init only the structure	2018-02-08 15:50:12 +01:00