417 Commits

Author	SHA1	Message	Date
Evan Owens	7e75679094	Merge branch 'master' into master	2018-03-23 13:45:52 -04:00
nurikabe	f701b3e53a	Japanese "welcome" locale file	2018-03-23 13:43:18 -04:00
Abdón Rodríguez Davila	92503f8ad4	Update staging environment config similar as production	2018-03-20 21:46:02 +01:00
Abdón Rodríguez Davila	5c365f46a0	Rename test environment config to staging	2018-03-20 21:45:11 +01:00
Abdón Rodríguez Davila	f50b1670ec	Update production environment config	2018-03-20 21:43:59 +01:00
Abdón Rodríguez Davila	02c136b915	Update default value for auth database	2018-03-13 09:23:25 +00:00
Abdón Rodríguez Davila	23f95f8def	Add missed config	2018-03-13 09:23:25 +00:00
Abdón Rodríguez Davila	1100d79d1c	Merge branch 'master' into mongodb-authsource-ssl	2018-03-12 18:28:35 +00:00
Jim LAURIE	d2672572c0	Merge branch 'master' into master	2018-03-12 17:21:23 +01:00
Jim Laurie	c1d8d33c83	Update grant provider documentation	2018-03-12 17:15:20 +01:00
Jim LAURIE	ecccb1adf9	Merge branch 'master' into master	2018-03-12 16:55:31 +01:00
Abdón Rodríguez Davila	f6acd1d17e	Merge branch 'master' into mongodb-authsource-ssl	2018-03-11 22:04:59 +01:00
Jim Laurie	6cd0ec730e	3.0.0-alpha.11.1	2018-03-11 15:54:56 +01:00
Abdón Rodríguez Davila	d5e70bc81d	Merge branch 'master' into mongodb-authsource-ssl	2018-03-09 13:17:30 +01:00
Jim Laurie	932bf6da23	3.0.0-alpha.11	2018-03-08 17:31:25 +01:00
Abdón Rodríguez Davila	3d1613df2d	Add authenticationDatabase setting	2018-03-08 15:51:03 +01:00
Abdón Rodríguez Davila	ca864ae711	Add environment variable for SSL	2018-03-08 15:34:24 +01:00
Minh Tri Nguyen	a18ba8805e	Add authSource & ssl options to MongoDB connector fix	2018-03-04 23:02:29 +08:00
cyril lopez	3d824bf6c5	Add locales to plugin generators	2018-03-01 13:51:10 +01:00
Jim LAURIE	f0706d474c	Merge branch 'master' into alpha.10.3	2018-02-26 18:15:49 +01:00
Jim Laurie	99559e20ea	3.0.0-alpha.10.3	2018-02-26 17:57:23 +01:00
Jim Laurie	15544528dc	Remove node_modules folder for alpha.10.3	2018-02-26 17:11:31 +01:00
Jim Laurie	543f21cdb1	Fix PR feedback	2018-02-23 14:57:58 +01:00
Jim Laurie	ab93e7113f	Move upload in modules	2018-02-20 15:57:34 +01:00
Jim Laurie	de3da8eaf7	Fix conflicts	2018-02-19 19:56:23 +01:00
Jim Laurie	cf029dac07	Create db entry on upload and get uploads	2018-02-19 15:41:26 +01:00
Jim LAURIE	3fb12f16ba	Merge branch 'master' into 3.0.0-alpha.10.2	2018-02-19 12:28:51 +01:00
Jim Laurie	0a5e80be93	3.0.0-alpha.10.2	2018-02-19 11:38:20 +01:00
Luca Perret	d0457c887a	fix(generate-new): prevent delete the node_modules dir	2018-02-16 19:50:28 +01:00
Jim Laurie	4ff5e26dc1	Fix PR review	2018-02-15 16:47:57 +01:00
cyril lopez	6aaa064822	Update package	2018-02-15 09:47:53 +01:00
cyril lopez	91c3825ad4	fix conflict	2018-02-14 21:19:27 +01:00
Jim Laurie	25d8217986	3.0.0-alpha.10.1	2018-02-14 11:03:00 +01:00
Jim LAURIE	4ab9907bd7	Merge branch 'master' into configs-databases	2018-02-13 11:10:05 +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
Jim Laurie	5bf1e51422	Fix conflicts	2018-02-12 13:25:43 +01:00
Jim LAURIE	08d74e1515	Merge branch 'master' into fix/boot	2018-02-09 17:02:18 +01:00
Aurelsicoko	46a64b449f	Update default hook timeout to 3000 milliseconds	2018-02-09 16:36:23 +01:00
Jim LAURIE	0cb9f05f9c	Merge branch 'master' into fix-db-args	2018-02-09 13:00:48 +01:00
Jim Laurie	945af6e750	Hide password database cli ... close #598	2018-02-08 15:27:15 +01:00
cyril lopez	c76bc81cce	Merge branch 'fix-db-args' of github.com:strapi/strapi into plugin/img-upload-front	2018-02-08 14:07:26 +01:00
cyril lopez	325384220f	Merge branch 'master' of github.com:strapi/strapi into plugin/img-upload	2018-02-08 12:06:17 +01:00
cyril lopez	ecd12c451a	Init plugin upload ... Created the upload plugin and install it by default	2018-02-08 12:01:06 +01:00
Jim Laurie	b1bcc13952	Fix strapi new without db args ... Stop project creation if one of db argument is missing Better detection for using db arguments	2018-02-08 11:53:45 +01:00
Luca Perret	22f12ec0dc	fix(cli): database name init	2018-02-08 00:50:16 +01:00
Luca Perret	3855523557	fix(cli): db connector init with args	2018-02-07 20:37:33 +01:00
Pierre BURGY	b67c5e34a8	Merge branch 'master' into enhancement/database-uri	2018-02-07 15:00:37 +01:00
Pierre Burgy	7f6e5ba5a8	3.0.0-alpha.9.3	2018-02-07 14:22:27 +01:00
Pierre Burgy	5bdf0a731d	Use PORT env variable in production	2018-02-07 12:07:35 +01:00