7150 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jim LAURIE	279cbc68e2	Merge branch 'master' into migration-jwt	2019-01-06 14:04:43 +01:00
Jim LAURIE	2b3af8300c	Add migration of jwt.json file	2019-01-06 14:00:04 +01:00
Aurélien Georget	b501e8bb1b	Resolve conflicts	2019-01-05 20:33:47 +01:00
Aurélien Georget	2df5ecae79	Reset loaders on every request to avoid wrong results coming from cache	2019-01-05 18:14:00 +01:00
Jim LAURIE	5a54581b34	Merge pull request #2583 from strapi/logo/documentation ... Add logo to documentation plugin	2019-01-05 16:54:53 +01:00
Aurélien Georget	d142b02f61	Add logo to documentation plugin	2019-01-05 16:53:05 +01:00
Paolo Ragone	e1079ce362	Added comment so linting doesn't go crazy on generated service files	2019-01-05 09:51:06 +13:00
Paolo Ragone	2a1cb510b9	Merge branch 'master' into patch-1	2019-01-05 09:40:58 +13:00
Patrick Black	e0c8243259	More friendly / grammar updates	2019-01-04 13:31:11 -06:00
Patrick Black	c025bc87cb	Grammar improvements	2019-01-04 11:20:43 -06:00
Abdón Rodríguez Davila	3f73964f59	Merge branch 'master' into fix-gae-deploy	2019-01-04 13:17:43 +01:00
Jim LAURIE	b140287af6	Merge pull request #2574 from strapi/3.0.0-alpha.18 ... 3.0.0 alpha.18	2019-01-04 11:56:39 +01:00
Jim LAURIE	df2a2e6548	Fail index version	2019-01-04 11:56:06 +01:00
Jim LAURIE	fab0f401cb	Fix migration guide version	2019-01-04 11:54:55 +01:00
Jim LAURIE	09530e9cd9	3.0.0-alpha.18 v3.0.0-alpha.18	2019-01-04 11:23:15 +01:00
Jim LAURIE	02867b2e65	Add migration guide alpha.17 to alpha.18	2019-01-04 11:21:18 +01:00
Chaitanya Choudhary	febd868fee	Updated documentation for timestamp values.	2019-01-04 15:40:47 +05:30
Chaitanya Choudhary	dd4d869e01	Fixed mongo updated timestamp issue.	2019-01-04 15:22:07 +05:30
codarrior	ed16bdb305	Update deployment guide with helpful hint ... Deployment guide enhanced for helpful hint for production environment setup.	2019-01-04 17:13:04 +11:00
Pierre Burgy	b1f063abe0	Add JSON support for SQLite	2019-01-03 23:29:30 +01:00
Pierre Burgy	7b6558884e	Fix lint error	2019-01-03 22:52:39 +01:00
Pierre Burgy	191377173a	Fix options error	2019-01-03 22:42:25 +01:00
soupette	2ab9be48ee	Fixes #2555	2019-01-03 17:24:06 +01:00
Jim LAURIE	d435e23969	Merge pull request #2534 from chaitanyya/feature/2432 ... Add force option when database not empty with bookshelf	2019-01-03 15:08:56 +01:00
Jim LAURIE	3998194532	Merge branch 'master' into feature/2432	2019-01-03 14:23:05 +01:00
Jim LAURIE	23b76b7c99	Merge pull request #2504 from greatwitenorth/patch-1 ... Add note for fish shell users	2019-01-03 14:09:22 +01:00
Jim LAURIE	3736c669fd	Merge branch 'master' into patch-1	2019-01-03 14:09:13 +01:00
Jim LAURIE	2f8e5bcdb2	Merge pull request #2557 from strapi/improve-strapi-new ... Improve strapi new	2019-01-03 14:09:03 +01:00
Jim LAURIE	56a749d826	Merge branch 'master' into improve-strapi-new	2019-01-03 14:08:55 +01:00
Jim LAURIE	d5fd488547	Merge pull request #2540 from strapi/add-example-relations-documentation ... Add JS query example in relation documentation	2019-01-03 13:19:30 +01:00
Jim LAURIE	67adca02bb	Merge branch 'master' into add-example-relations-documentation	2019-01-03 13:19:18 +01:00
Abdón Rodríguez Davila	23ee3c924c	Merge branch 'master' into fix-gae-deploy	2019-01-03 11:35:07 +01:00
Jim LAURIE	95007e8552	Fix single quote and const	2019-01-03 10:33:11 +01:00
Chaitanya Choudhary	f3de1e5934	Updated documentation on dbforce.	2019-01-03 12:46:47 +05:30
Paolo Ragone	5bdfb078ac	Merge branch 'master' into patch-1	2019-01-03 11:18:43 +13:00
Jim LAURIE	8f7bf31bed	Merge pull request #2523 from AminZibayi/quick-start-documentation ... Update quick start documentation	2019-01-02 18:42:15 +01:00
Jim LAURIE	16c3cab7cf	Merge branch 'master' into quick-start-documentation	2019-01-02 18:42:04 +01:00
Abdón Rodríguez Davila	8d62ff81d5	Merge branch 'master' into fix-gae-deploy	2019-01-02 11:00:46 +01:00
Jim LAURIE	60803dccfb	Merge pull request #2569 from strapi/2019 ... Update to 2019	2019-01-02 09:45:08 +01:00
Jim LAURIE	45bcaf770b	Update to 2019	2019-01-02 09:41:53 +01:00
Justin Greene	9755836c5d	Update inquirer to fix windows hang	2018-12-30 18:17:58 -06:00
Justin Greene	3950503acf	Update inquirer to fix windows console freezing	2018-12-30 18:17:05 -06:00
Pierre Burgy	fddf391e84	Add SQLite support	2018-12-29 21:35:07 +01:00
Paolo Ragone	8a7aea1ce3	Merge branch 'master' into patch-1	2018-12-29 19:42:01 +13:00
Jim LAURIE	31626ae14e	Add documentation	2018-12-28 17:05:16 +01:00
Jim LAURIE	6de05cbdad	Add debug option on strapi new	2018-12-28 16:51:02 +01:00
Jim LAURIE	080fd1721b	In dev mode use local connectivity script	2018-12-28 14:59:45 +01:00
Chaitanya Choudhary	1c4aafae5b	Fixed conditional statement for hasTimestamps	2018-12-28 19:24:24 +05:30
Chaitanya Choudhary	6835fdf426	Handle different types of timestamp values	2018-12-28 17:04:36 +05:30
Abdón Rodríguez Davila	042bc15c30	Merge branch 'master' into fix-gae-deploy	2018-12-28 11:17:24 +01:00