33691 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
davidkartuzinski	075d5f92cf	WIP: Amazon Docs through EC2 Installation	2019-05-24 14:16:13 +02:00
Jim LAURIE	1c2bbdf35a	Merge pull request #3311 from strapi/fix/beta-fixes ... Fix Add image upload in content type and add image in example app	2019-05-23 12:00:16 +02:00
Alexandre Bodin	51300f4a4f	Fix Add image upload in content type and add image in example app	2019-05-23 10:21:41 +02:00
Alexandre Bodin	87e479173a	Merge branch 'beta' into update/depends	2019-05-23 10:21:22 +02:00
Alexandre Bodin	0b4096a045	Add _q param to GET /users	2019-05-23 10:18:44 +02:00
Alexandre Bodin	ea5cdc78d8	Remove not null on sqlite alter as the table is recreated afterwards	2019-05-23 10:17:03 +02:00
Alexandre Bodin	232afd983e	Merge branch 'beta' into update/depends	2019-05-23 09:35:21 +02:00
Jim LAURIE	ae4728be8c	Merge branch 'master' of github.com:strapi/strapi into beta	2019-05-22 12:03:34 +02:00
Jim LAURIE	08a4f6f514	Merge pull request #3305 from strapi/digital-ocean-docs ... Docs - Install Strapi on a Digital Ocean Droplet/VPS	2019-05-22 11:38:25 +02:00
David Kartuzinski	d4ea5dc63d	Fixed feedback after review	2019-05-22 11:16:15 +02:00
Hoàng Phúc	2a00de34d2	Fix ip filter middleware	2019-05-22 11:35:03 +07:00
davidkartuzinski	42aa73be7d	fully tested docs	2019-05-21 16:36:16 +02:00
Alexandre BODIN	6b07dd3df1	Merge pull request #3300 from strapi/tech/webpack-dev ... Add strapi-admin dev script	2019-05-21 14:02:13 +02:00
Alexandre Bodin	d0df55d163	Update yarn.lock	2019-05-21 11:59:27 +02:00
Alexandre Bodin	06fed3a5e2	Merge branch 'beta' into update/depends	2019-05-21 11:55:44 +02:00
davidkartuzinski	b0d4c4a19e	revisions and QC	2019-05-20 19:18:03 +02:00
Alexandre Bodin	ecde29fa8b	Add yarn dev to strapi-admin for dev workflow	2019-05-20 17:13:14 +02:00
Jim LAURIE	0997ca0801	Merge pull request #3290 from strapi/fix/error-track ... Fix missing history in saga	2019-05-20 11:17:08 +02:00
davidkartuzinski	deb36da5c7	added full steps and tested the instructions. Now working A to Z.	2019-05-17 21:19:37 +02:00
Alexandre Bodin	d07fbe8054	Fix missing history in saga	2019-05-17 18:24:15 +02:00
Jim LAURIE	91fdc44bcc	Merge pull request #3260 from strapi/tech/strapi-new-improvments ... strapi new improvments	2019-05-17 16:55:00 +02:00
Alexandre Bodin	d31f5b92bb	Use yarn if installed on strapi new.	2019-05-17 16:31:48 +02:00
Jim LAURIE	ca0a42362c	Merge pull request #3288 from strapi/tech/clean-example-app ... Cleanup example app	2019-05-17 16:20:16 +02:00
Alexandre Bodin	a1a968c342	Cleanup example app	2019-05-17 16:09:22 +02:00
Jim LAURIE	c15d58c26e	Merge pull request #3287 from strapi/tech/clean-cmds ... Clean up commands	2019-05-17 16:05:35 +02:00
Alexandre Bodin	28558dd96e	wip	2019-05-17 15:12:00 +02:00
Alexandre Bodin	32b2b04e57	Clean up commands	2019-05-17 14:11:13 +02:00
Derrick Mehaffy	594d043895	EJS and middleware views	2019-05-17 03:00:08 -07:00
Derrick Mehaffy	c3a51a02c2	Update providers	2019-05-17 02:58:04 -07:00
Derrick Mehaffy	10b2eb1d2d	Update the generators	2019-05-17 02:49:59 -07:00
Derrick Mehaffy	767ee52dfb	Rebase only backend packages	2019-05-17 02:49:59 -07:00
Jim LAURIE	b439a75162	Merge pull request #3282 from strapi/fix/search ... Fix invalid filter name and cleanup some search query	2019-05-17 10:35:23 +02:00
Alexandre Bodin	cfe28bcfa6	Fix invalid filter name and cleanup some search query	2019-05-17 09:22:51 +02:00
davidkartuzinski	b49752ea28	all basic steps to install on digital ocean complete	2019-05-16 19:13:32 +02:00
Jim LAURIE	f5365179d5	Merge pull request #3278 from strapi/fix/windows-issues ... Fix issues with paths in windows	2019-05-16 16:57:54 +02:00
Alexandre Bodin	773068bb23	Fix issues with paths in windows	2019-05-16 16:34:02 +02:00
Jim LAURIE	d0c747c919	Merge pull request #3277 from strapi/tech/add-api-gitkeep ... Add api and extensions gitkeep	2019-05-16 15:54:55 +02:00
Jim LAURIE	812665c035	Add extension gitkeep	2019-05-16 15:37:03 +02:00
Alexandre Bodin	a7c198ef58	Add gitkeep in api folder	2019-05-16 14:35:47 +02:00
Jim LAURIE	0b9cb217cc	Merge pull request #3273 from strapi/tech/admin-build ... Refactor admin build script for futur updates	2019-05-16 10:40:03 +02:00
Alexandre Bodin	a2d32c4306	Refactor admin build script for futur updates	2019-05-16 10:14:13 +02:00
davidkartuzinski	8b46ad66e8	installation through using git updated	2019-05-15 19:00:34 +02:00
Jim LAURIE	eae09d193e	Merge pull request #3270 from strapi/fix/strapi-generate-plugin ... Clean strapi generate plugin	2019-05-15 18:51:28 +02:00
Alexandre Bodin	1d2449763f	Clean strapi-generate-plugin	2019-05-15 17:59:33 +02:00
Jim LAURIE	ca453c32c7	Merge pull request #3246 from strapi/improve/gh-templates ... Update GH issue and PR template	2019-05-15 17:56:00 +02:00
Jim LAURIE	23bbc7187f	Fix typo	2019-05-15 17:41:15 +02:00
Jim LAURIE	c9a59a6509	Update GH issue and PR template	2019-05-15 17:41:15 +02:00
Jim LAURIE	43d24e7198	Merge pull request #3267 from strapi/tech/admin-build-cleanup ... Admin build cleanup	2019-05-15 17:34:52 +02:00
Alexandre Bodin	e967095475	Minor admin build updates	2019-05-15 16:57:55 +02:00
Jim LAURIE	34d3021784	Merge pull request #3265 from strapi/tech/beta-basic-admin-customization ... Add admin panel basic customization	2019-05-15 16:56:07 +02:00