293 Commits

Author	SHA1	Message	Date
Jim Laurie	8f5443db17	3.0.0-alpha.12.1.3	2018-05-07 10:46:43 +02:00
Jim Laurie	c491c61a97	3.0.0-alpha.12.2	2018-05-03 14:15:21 +02:00
Aurelsicoko	120e10ef65	Add strapi-knex in generated project dependencies	2018-05-03 12:35:32 +02:00
Jim Laurie	8d2a46cd0c	Fix conflict timestamp	2018-04-25 11:06:12 +02:00
Aurelsicoko	7a456da974	Move authentication and ssl in database options	2018-04-24 16:38:19 +02:00
Jim LAURIE	36393b9594	Merge branch 'master' into reduce-setup-monorepo	2018-04-23 12:32:01 +02:00
Jim Laurie	96b32fbea4	Remove sqlite and redis on strapi start and remove sqlite support	2018-04-20 17:59:47 +02:00
Jim LAURIE	4deb87078c	Merge branch 'master' into enhance/sql-dev	2018-04-20 17:41:25 +02:00
Aurelsicoko	0e5eb549bc	Only install at the root of the node_modules folder in developer mode	2018-04-20 17:38:06 +02:00
Jim LAURIE	1fbc87adba	Merge branch 'master' into fix/782	2018-04-20 16:29:30 +02:00
Aurélien GEORGET	575814730d	Allow Origin header on production configuration as well	2018-04-20 15:50:18 +02:00
Aurelsicoko	d6180d4148	Easily use MySQL project in development mode	2018-04-20 15:31:57 +02:00
Aurelsicoko	5416cd60a0	Disable CSRF in production & harmonize allowed headers	2018-04-20 13:55:41 +02:00
Aurelsicoko	302f95873e	Fix symlinks during project generation	2018-04-20 12:12:34 +02:00
Jim LAURIE	2f09e58c2c	Merge branch 'master' into patch-1	2018-04-18 16:41:20 +02:00
Abdón Rodríguez Davila	c6519cc4b0	Staging config as production config	2018-04-18 14:36:06 +02:00
soupette	21e45890db	Fixes #964	2018-04-18 14:25:56 +02:00
Jim Laurie	ebd144fddb	3.0.0-alpha.12	2018-04-18 12:03:16 +02:00
Jim LAURIE	c0ea8fa807	Merge branch 'master' into graphql	2018-04-16 16:39:50 +02:00
Administrator	d030dc06ba	Russian language pack update. Admin translations fixes + Content manager translations added.	2018-04-15 13:30:31 +03:00
Aurelsicoko	73764d6ae0	Add containss in Bookshelf filters	2018-04-12 15:44:04 +02:00
Jim Laurie	ee12536e84	3.0.0-alpha.11.3	2018-04-05 14:13:50 +02:00
Aurelsicoko	6c2399715a	Link bookshelf on setup & advanced load order on hook	2018-04-02 18:33:12 +02:00
Jim Laurie	5e41edc3b1	Replace server host by localhost ... fix #726	2018-03-28 18:11:57 +02:00
Jim Laurie	8390106f59	3.0.0-alpha.11.2	2018-03-27 17:59:16 +02:00
Jim Laurie	bc39200cce	Limit ssl options to mongoDB connection	2018-03-27 17:02:23 +02:00
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