1007 Commits

Author	SHA1	Message	Date
Aurélien Georget	8170d061c3	Fix conflicts	2019-02-12 17:01:36 +01:00
Aurelsicoko	39c4f558ec	Using cross-env and rimraf as direct devDependencies	2019-02-12 14:40:55 +01:00
Jim LAURIE	92abd536cb	Merge branch 'master' into master	2019-02-10 17:26:18 +01:00
Jim LAURIE	42b4a56c0a	3.0.0-alpha.23.1	2019-02-07 13:08:41 +01:00
Jim LAURIE	ff84a82466	3.0.0-alpha.23	2019-02-07 10:40:33 +01:00
Jim LAURIE	a72c02fd8f	Merge branch 'master' into patch-1	2019-02-07 10:27:43 +01:00
EpicUsaMan	82f83260e9	Fix after pull request review	2019-02-06 21:57:50 +02:00
soupette	b11e099cd8	Merge branch 'master' of github.com:strapi/strapi into fix/front-generators	2019-02-06 12:09:00 +01:00
Jim LAURIE	7555cc5952	3.0.0-alpha.22	2019-02-04 18:21:48 +01:00
Sajjad Shirazy	a9606b6eae	Supporintg IN and NOT IN as a filter type	2019-02-03 15:08:36 +03:30
EpicUsaMan	327f5f9d4e	Cannot send email because options.to is undefined ... Currently user doesn't have property email, but have attributes object with email property inside.	2019-02-03 02:06:30 +02:00
Jim LAURIE	0684628985	Merge branch 'master' into split-ctm-settings-view	2019-01-30 18:24:47 +01:00
soupette	807ca3bce8	Fix front generators	2019-01-30 17:08:41 +01:00
Jim LAURIE	ce7acb24db	Merge branch 'master' into removeWarningLogs	2019-01-24 12:16:11 +01:00
soupette	250adb1332	Merge branch 'master' of github.com:strapi/strapi into split-ctm-settings-view	2019-01-24 10:56:49 +01:00
Aurélien Georget	2115124931	Remove Mongoose warning logs	2019-01-23 16:56:04 +01:00
Jim LAURIE	ee8c94f09f	3.0.0-alpha.21	2019-01-23 16:27:46 +01:00
Aurélien Georget	5f8b4ae667	Complete funnel	2019-01-23 15:33:30 +01:00
Jim LAURIE	c5bd4f9aa7	Merge branch 'master' into fix/2541	2019-01-23 10:56:04 +01:00
Jim LAURIE	25f21fae42	3.0.0-alpha.20	2019-01-22 14:31:49 +01:00
Jim LAURIE	f90255bb75	Merge branch 'master' into issue/2327	2019-01-22 13:52:13 +01:00
Aurélien Georget	4f2928339a	Reset loaders instead of clearing cache	2019-01-22 13:47:44 +01:00
Jim LAURIE	b4968697a0	Fix update user email	2019-01-22 11:41:49 +01:00
soupette	7e79864259	Split content-manager setting view into tabs. ... Allow to change the textarea type so the wysiwyg can be displayed without having to set it back in the content type builder. Fixes #2307	2019-01-20 12:52:08 +01:00
Aurélien Georget	f534340ca2	Add listeners to events	2019-01-18 16:08:15 +01:00
soupette	925438d7b5	Fixes #2541	2019-01-17 17:18:54 +01:00
Jim LAURIE	c3c24ca7ad	3.0.0-alpha.19	2019-01-16 11:49:16 +01:00
David Baxter	c01124388d	Incorrect params variable name in user update	2019-01-16 14:39:24 +11:00
Jim LAURIE	712e997c54	Merge branch 'master' into admin-russian-locale-fixes	2019-01-15 20:29:21 +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	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
invader	7659bdb697	admin: update Russian translations in users and permissions plugin	2019-01-11 02:26:44 +03: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
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
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
soupette	2ab9be48ee	Fixes #2555	2019-01-03 17:24:06 +01:00
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
Abdón Rodríguez Davila	df162c1387	Avoid write actions.json if not development environment	2018-12-19 19:42:10 +01:00
Jim LAURIE	fd3ae96498	3.0.0-alpha.17	2018-12-18 14:37:15 +01:00
Jim LAURIE	f87ebea759	Merge branch 'master' into plugin-documentation	2018-12-17 16:22:03 +01:00
soupette	b888be0b76	Fix JSON override	2018-12-13 18:04:24 +01:00
Jim LAURIE	596d4dd791	Merge branch 'master' into add-cypress	2018-12-12 20:18:57 +01:00
soupette	43966b8416	Fix conflicts	2018-12-12 14:25:44 +01:00