378 Commits

Author	SHA1	Message	Date
Alberto Maturano	6f35b53d3c	Add execute bit to server.js file ... Without this, #1967 makes no sense.	2018-09-27 12:54:49 -05:00
Jim LAURIE	46c9b0f966	3.0.0-alpha.14.2	2018-09-26 11:08:10 +02:00
Jim LAURIE	beeb826981	Merge branch 'master' into patch-1	2018-09-25 11:40:56 +02:00
Alberto Maturano	154fc28a57	Normalize to standar file permissions ... As a result of taking a look on PR #1967 I realized there is 819 executable files in this repository. It is obvious this is an error.	2018-09-24 12:33:09 -05:00
Nick Bolles	a739f67a17	Merge branch 'master' into njb/fix-strapi-new	2018-09-18 23:32:21 -05:00
Thomas Hunter II	c3f156da62	Merge branch 'master' into patch-1	2018-09-18 16:23:05 -07:00
Thomas Hunter II	803d691ef8	Add shebang to server.js ... * The execute bit is already enabled on server.js * However, executing it via `./server.js` fails * Adding the shebang allows the server to start	2018-09-17 11:27:15 -07:00
DMehaffy	dbbedb269f	Add config options to each environment.	2018-09-17 04:14:05 -07:00
Jim LAURIE	54cf16b5f1	Merge branch 'master' into njb/fix-strapi-new	2018-09-14 15:21:18 +02:00
Jim LAURIE	4d8ace2db7	3.0.0-alpha.14.1.1	2018-09-13 18:39:37 +02:00
NickBolles	bedc441e15	Don't call success after catching an error	2018-09-12 22:03:54 -05:00
Jim LAURIE	f10335d717	3.0.0-alpha.14.1	2018-09-12 12:41:11 +02:00
soupette	b2d55b13a3	Fix pinput file	2018-09-07 12:47:45 +02:00
Jim LAURIE	d843d747dd	Merge branch 'master' into set-default-auth-db	2018-09-04 09:38:43 +02:00
sundaycrafts	2e049da8ca	tweak new command message	2018-09-02 03:28:22 +09:00
Jim LAURIE	d80647c3c6	Merge branch 'master' into strapi-support-srv-uri	2018-09-01 17:35:49 +02:00
sundaycrafts	71beb1beba	fix the message when generating new app	2018-08-31 19:07:15 +09:00
sundaycrafts	74e47c0e60	add hint to strapi generate new	2018-08-31 10:44:49 +09:00
sundaycrafts	9b02ccfead	Revert "improve user experience when generating new app" ... This reverts commit 99eb07fecdee9e90b90667e35590a0abbd5577b2.	2018-08-31 10:38:48 +09:00
sundaycrafts	99eb07fecd	improve user experience when generating new app	2018-08-31 01:08:45 +09:00
sundaycrafts	b9a9e7a829	tweak to consistent with other code	2018-08-31 00:47:45 +09:00
DMehaffy	8160b730b4	Merge branch 'master' into fix1551	2018-08-27 08:23:33 -07:00
Jim LAURIE	cecef7385f	3.0.0-alpha.14	2018-08-27 16:30:16 +02:00
DMehaffy	617324abee	Basic global proxy support	2018-08-27 06:27:42 -07:00
Jim LAURIE	0ac7c132fc	Fix srv	2018-08-27 14:01:56 +02:00
Jim LAURIE	33ad03548f	Merge branch 'master' into new-command-srv-support	2018-08-23 17:20:08 +02:00
soupette	8003982b08	Fix conflicts	2018-08-22 14:17:09 +02:00
Jim LAURIE	6ebc8b1d0e	Merge branch 'master' into improvement/database-name	2018-08-21 08:59:36 +02:00
Jim LAURIE	f44ed33aa8	Merge branch 'master' into update-new-logs	2018-08-21 08:56:50 +02:00
sundaycrafts	6d006c4794	"new" command supports mongo +srv prefix uri	2018-08-13 05:43:42 +09:00
soupette	688defca70	Fix conflict	2018-08-10 12:52:11 +02:00
Jim LAURIE	b4d97fb9db	3.0.0-alpha.13.1	2018-08-09 13:39:34 +02:00
Pierre Burgy	0a3b81fef6	Change default database name	2018-08-08 11:50:31 +02:00
Jim LAURIE	0e61914ce2	Add upper first strapi new logs action	2018-08-08 11:44:27 +02:00
Jim LAURIE	1fc9513d80	Change lodash version	2018-08-06 16:03:09 +02:00
Jim LAURIE	ba99e0f24d	Merge branch 'master' into feature/spanishTranslation	2018-07-31 13:38:18 +02:00
soupette	be73140600	Use toggle and fix editPage render loop	2018-07-27 16:15:26 +02:00
Jim LAURIE	09a2a4b73d	3.0.0-alpha.13.0.1	2018-07-26 16:12:17 +02:00
Alberto Maturano	1cf5dac2a6	Improve spanish translation ... - Fix minor errors and improve translation after review it in context (comments from PR #1566) - Missing ES translations (issue #1621) - Normalize tone using a formal style	2018-07-25 12:18:58 -05:00
Jim LAURIE	927a900f5b	3.0.0-alpha.13	2018-07-25 17:31:16 +02:00
Leon Kyneur	92b045f647	Include yarn.lock in packages .gitignore	2018-07-22 09:26:48 +08:00
Jim LAURIE	db8a47a016	Merge branch 'master' of github.com:strapi/strapi into rename-hook-middleware	2018-07-17 08:53:36 +02:00
Jim LAURIE	74a52e57f1	Merge branch 'master' into add-ssl-auth-db-CLI-options	2018-07-16 12:31:15 +02:00
Jim LAURIE	9bf04f5fef	Fix conflict	2018-07-13 15:42:14 +02:00
Vasilis Kortsimelidis	c2d7d8f21d	Made new options optional - Merged them to the answers object	2018-07-12 15:50:05 +01:00
Alberto Maturano	beeaa55bd5	Fix temp directory reference for Yarn ... Also: fix logic detecting installation with Yarn and fix minor linter errors. related #1548 & #1463	2018-07-11 22:44:04 -05:00
Jim LAURIE	cf8184e223	Use hook prefix and rename	2018-07-11 16:23:14 +02:00
Jim LAURIE	fa94d12e4f	3.0.0-alpha.12.7.1	2018-07-10 18:10:42 +02:00
Jim LAURIE	a6d48caad9	3.0.0-alpha.12.7	2018-07-10 15:37:47 +02:00
Aurélien GEORGET	d4a874c8ee	Update package.json.js	2018-07-10 11:26:35 +02:00