1151 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	83f0bb012a	Merge branch 'master' into fix/ctm-edit-view-main-field	2019-02-11 15:28:13 +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
soupette	b11e099cd8	Merge branch 'master' of github.com:strapi/strapi into fix/front-generators	2019-02-06 12:09:00 +01:00
Jim LAURIE	5f2d9c9543	Merge branch 'master' of github.com:strapi/strapi into 3.0.0-alpha.22	2019-02-05 12:26:51 +01:00
Jim LAURIE	f015d7bb2a	Fix condition with int instead of string	2019-02-05 12:17:27 +01:00
Jim LAURIE	cd729ec0da	Fix ternary condition	2019-02-05 11:59:06 +01:00
Jim LAURIE	7555cc5952	3.0.0-alpha.22	2019-02-04 18:21:48 +01:00
soupette	da424a4ca7	Fix displayed field on remove	2019-02-04 17:03:51 +01:00
Sajjad Shirazy	2090ae761e	Missing trailing comma comma-dangle	2019-02-03 15:30:01 +03:30
Sajjad Shirazy	a9606b6eae	Supporintg IN and NOT IN as a filter type	2019-02-03 15:08:36 +03:30
Jim LAURIE	f7e25c34e8	Merge branch 'master' into ui/minor-updates	2019-01-31 18:08:15 +01:00
Jim LAURIE	3db3b93fdb	Merge branch 'master' into sqlite-support	2019-01-31 11:15:19 +01:00
Jim LAURIE	0684628985	Merge branch 'master' into split-ctm-settings-view	2019-01-30 18:24:47 +01:00
Jim LAURIE	2199fa3943	Merge branch 'master' into fix/#1960	2019-01-30 17:39:35 +01:00
Jim LAURIE	02a0a3dba3	Fix date format	2019-01-30 17:38:54 +01:00
soupette	807ca3bce8	Fix front generators	2019-01-30 17:08:41 +01:00
soupette	8b602c6273	Fix links HomePage and remove letter-spacing in ctm table	2019-01-30 15:21:31 +01:00
soupette	92693dd5da	Fix PluginHeader length	2019-01-25 10:06:23 +01:00
soupette	037228c56b	Allow to modify the entry title in the edit view	2019-01-24 19:14:02 +01:00
soupette	e4ffd70b90	Split view	2019-01-24 18:30:51 +01:00
Jim LAURIE	412fcbb298	Merge branch 'master' into sqlite-support	2019-01-24 15:00:19 +01:00
Jim LAURIE	ce7acb24db	Merge branch 'master' into removeWarningLogs	2019-01-24 12:16:11 +01:00
Aurélien Georget	199ed431a8	Destructure where condition to make code more readable	2019-01-24 12:05:33 +01:00
Aurélien Georget	2a62b9d962	Convert where parameters instead of adding complexity in SQL query	2019-01-24 11:52:53 +01:00
soupette	018d801057	Change trads	2019-01-24 11:50:46 +01:00
Aurélien Georget	8e2169f005	Fix SQL query where oneWay relationship is null	2019-01-24 11:09:45 +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
Jim LAURIE	5df95ad3b3	Merge branch 'master' into fix-timestamp	2019-01-23 15:50:30 +01:00
Aurélien Georget	5f8b4ae667	Complete funnel	2019-01-23 15:33:30 +01:00
Jim LAURIE	0238257eec	Fix get timestamp in the admin	2019-01-23 15:19:34 +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
soupette	9b6440e952	Improve date formatting	2019-01-22 12:28:55 +01:00
soupette	c1e2964a1a	Fix remove selected item	2019-01-21 15:53:40 +01:00
soupette	4a160b04fd	Fixes #1960	2019-01-20 14:21:38 +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
Jim LAURIE	c3c24ca7ad	3.0.0-alpha.19	2019-01-16 11:49:16 +01:00
Jim LAURIE	712e997c54	Merge branch 'master' into admin-russian-locale-fixes	2019-01-15 20:29:21 +01:00
Aurélien Georget	410d4ba747	Remove blank space	2019-01-14 19:54:46 +01:00
invader	80e80c9788	Admin: "Типы Данных" -> "Типы Контента" in content-manager plugin Russian translations	2019-01-11 23:05:25 +03:00
invader	3a79e40080	Update Russian translations in the Content Manager plugin	2019-01-10 22:52:41 +03:00
invader	34f98dd851	plugin-content-manager: fix typo in Russian locale	2019-01-10 21:19:45 +03:00
Jim LAURIE	6a3d2daac1	Merge branch 'master' into feature/998	2019-01-06 15:27:11 +01:00
Aurélien Georget	b501e8bb1b	Resolve conflicts	2019-01-05 20:33:47 +01:00