4780 Commits

Author	SHA1	Message	Date
Jim LAURIE	45acd75d1c	Merge branch 'master' into admin-logout-component-intl	2019-01-14 14:33:07 +01:00
Jim LAURIE	071e0e0344	Merge branch 'master' into documentation-link	2019-01-14 09:57:51 +01:00
Jim LAURIE	4bffe2749c	Remove error log ... We will work on a complete logs tag plan in the future.	2019-01-11 10:55:21 +01:00
Paolo Ragone	0ae11d661a	Merge remote-tracking branch 'origin/master' into patch-1	2019-01-11 22:53:55 +13:00
Paolo Ragone	b6fc268297	Fixed bug following recommendation	2019-01-11 22:52:28 +13:00
Paolo Ragone	b3ebf8e736	Merge remote-tracking branch 'origin/master' into patch-1	2019-01-11 22:50:19 +13:00
Jim LAURIE	6bda031376	Merge branch 'master' into fix-boom-duplicate-error	2019-01-10 18:03:35 +01:00
Pierre Burgy	1533657015	Add Strapi in powered by sentence	2019-01-10 16:41:13 +01:00
Pierre Burgy	934d2a3739	Add Documentation and Help links	2019-01-10 16:11:58 +01:00
Jim LAURIE	1090c8f113	Merge branch 'master' into master	2019-01-09 16:20:11 +01:00
Jim LAURIE	5b259487f0	Merge branch 'master' into fix-gae-deploy	2019-01-09 15:55:27 +01:00
Jim LAURIE	e41948de3f	Add setting for production environment	2019-01-09 14:19:39 +01:00
Jim LAURIE	c4a8a4eb4e	Merge branch 'master' into fix/#2555	2019-01-08 14:42:34 +01:00
invader	aba68be9d4	admin: remove defaultMessages in Logout component (now keys defined in all locales)	2019-01-07 02:10:11 +03:00
invader	e34be57d52	admin: AdminPage container - define prop types for getAdminData	2019-01-07 02:10:01 +03:00
invader	8e87f42289	admin: add logout component translation keys to every locale (google translate)	2019-01-07 02:09:50 +03:00
invader	dbd1d68ccc	admin: add intl support in Logout component and add ru translations	2019-01-07 02:09:38 +03:00
Jim LAURIE	6a3d2daac1	Merge branch 'master' into feature/998	2019-01-06 15:27:11 +01:00
Jim LAURIE	a23fe2c307	Remove relations route from bookshelf template	2019-01-06 15:17:59 +01:00
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	d142b02f61	Add logo to documentation plugin	2019-01-05 16:53:05 +01:00
Paolo Ragone	2a1cb510b9	Merge branch 'master' into patch-1	2019-01-05 09:40:58 +13:00
Abdón Rodríguez Davila	3f73964f59	Merge branch 'master' into fix-gae-deploy	2019-01-04 13:17:43 +01:00
Jim LAURIE	09530e9cd9	3.0.0-alpha.18	2019-01-04 11:23:15 +01:00
Chaitanya Choudhary	dd4d869e01	Fixed mongo updated timestamp issue.	2019-01-04 15:22:07 +05:30
soupette	2ab9be48ee	Fixes #2555	2019-01-03 17:24:06 +01:00
Jim LAURIE	3998194532	Merge branch 'master' into feature/2432	2019-01-03 14:23:05 +01:00
Jim LAURIE	56a749d826	Merge branch 'master' into improve-strapi-new	2019-01-03 14:08:55 +01:00
Paolo Ragone	5bdfb078ac	Merge branch 'master' into patch-1	2019-01-03 11:18:43 +13:00
Abdón Rodríguez Davila	8d62ff81d5	Merge branch 'master' into fix-gae-deploy	2019-01-02 11:00:46 +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
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
Chaitanya Choudhary	b04ba69370	Ability to use custom timestamps.	2018-12-28 14:17:12 +05:30
Chaitanya Choudhary	230a8af1f7	Force attribute not required in database object.	2018-12-26 13:50:53 +05:30
Paolo Ragone	947dd2b502	Added missing semicolon	2018-12-26 12:11:12 +13:00
Paolo Ragone	382722b74c	Fix provider query building bug ... Fixes #2536 Does so by fixing the parameters to the query call	2018-12-26 11:10:35 +13:00
Chaitanya Choudhary	cf713b2c58	Add force option when database not empty with bookshelf	2018-12-24 15:39:51 +05:30
Jim LAURIE	7d9cbb75f2	Merge branch 'master' into master	2018-12-23 21:02:44 +01:00
Abdón Rodríguez Davila	7d039644fa	Check if plugins.json exists	2018-12-23 17:02:45 +01:00
Abdón Rodríguez Davila	809ecb6a69	Merge branch 'master' into fix-gae-deploy	2018-12-23 16:42:31 +01:00
Jim LAURIE	da501688cb	Merge branch 'master' into fix/2437	2018-12-21 17:00:33 +01:00
Abdón Rodríguez Davila	df162c1387	Avoid write actions.json if not development environment	2018-12-19 19:42:10 +01:00
Abdón Rodríguez Davila	a5dc07c0a5	Avoid write files if not development environment	2018-12-19 19:25:52 +01:00