15371 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexandre Bodin	2bf3533c85	Merge branch 'master' into develop	2019-12-06 12:34:26 +01:00
Alexandre Bodin	7008a8aca4	Check table exists for sqlite3 alter datetime	2019-12-06 12:31:53 +01:00
soupette	df0e8951ea	fix component display name	2019-12-06 11:37:58 +01:00
soupette	c001fe1f3d	Remove i tags	2019-12-06 11:09:48 +01:00
soupette	3570ce43e2	Fix source issue	2019-12-06 10:44:27 +01:00
soupette	dc9dd4ccfd	Display layout button in prod mode	2019-12-06 09:17:10 +01:00
soupette	2b85c97c0e	Fix conflicts	2019-12-06 09:08:12 +01:00
soupette	7b6a24c99e	Merge branch 'features/dynamic-zones' of github.com:strapi/strapi into front/dynamic-zones-ctb-listview	2019-12-06 08:59:27 +01:00
Sulakin Vadim	a858c66158	Merge pull request #4 from sulakin/Adding-a-VK-Provider ... add vk	2019-12-06 01:45:26 +03:00
Sulakin Vadim	13af6f1ee0	Merge pull request #3 from strapi/master ... Update from the wizard	2019-12-06 01:42:31 +03:00
Sulakin Vadim	fc6ac8e231	add vk	2019-12-06 01:38:06 +03:00
Virginie Ky	4e51ac5a93	Configure the view button	2019-12-05 19:54:38 +01:00
soupette	5e1b3ddbb0	Update buffet deps	2019-12-05 19:07:35 +01:00
soupette	33952c3a41	Fix conflicts	2019-12-05 19:03:25 +01:00
soupette	113b270344	Fix design plus	2019-12-05 18:54:11 +01:00
Virginie Ky	284b461f56	Delete button for Component in DZ	2019-12-05 18:48:49 +01:00
soupette	28372566cd	Fix attribute order	2019-12-05 18:41:04 +01:00
soupette	6b0d0c2e6e	Fix submit button	2019-12-05 17:52:57 +01:00
soupette	559548ef33	fix conflicts	2019-12-05 17:49:02 +01:00
soupette	24a304e194	Handle add attribute for all data	2019-12-05 17:42:32 +01:00
Jim LAURIE	8e2a4cd1bf	Merge pull request #4651 from iicdii/master ... Update KO translation	2019-12-05 17:30:06 +01:00
Jim LAURIE	7eaeda7974	Merge branch 'master' into master	2019-12-05 17:29:50 +01:00
Virginie Ky	a2998bb578	ListView button ui with translation	2019-12-05 17:17:31 +01:00
soupette	c3d6b206e6	Handle delete compo from dz	2019-12-05 17:16:22 +01:00
Alexandre BODIN	9d571beeac	Merge pull request #4658 from strapi/chore/split-date-types ... Chore/split date types	2019-12-05 16:55:17 +01:00
soupette	71be368684	Fix edit dz	2019-12-05 16:49:29 +01:00
soupette	e6ff857798	Handle edit for components	2019-12-05 16:27:55 +01:00
Alexandre Bodin	c469345f35	Fix test conflicts	2019-12-05 16:03:45 +01:00
Alexandre Bodin	1c229e24d7	Add time precision to allow up to 3 fractional digits	2019-12-05 16:00:39 +01:00
Virginie Ky	5b394e8cbc	leftmenu active state and component zigouigoui icon	2019-12-05 15:44:47 +01:00
Alexandre Bodin	c66fe82c41	Handle time and date in mongo	2019-12-05 15:26:01 +01:00
Pouya Miralayi	d1356a2a50	Update upload.md	2019-12-05 16:47:15 +03:30
soupette	fac79f1785	Set prompt	2019-12-05 14:04:56 +01:00
Alexandre Bodin	f55e1f704b	Do not parse date types	2019-12-05 12:29:24 +01:00
soupette	fb2b28efc7	Fix conflicts	2019-12-05 12:07:30 +01:00
Virginie Ky	95f2edf72c	Merge branch 'front/dynamic-zones-ctb-listview' of github.com:strapi/strapi into front/dynamic-zones-ctb-listview	2019-12-05 12:03:40 +01:00
Virginie Ky	fafeb97485	Modal close button UI	2019-12-05 12:03:16 +01:00
soupette	94bd80b59a	Add production mode to ctb	2019-12-05 11:59:23 +01:00
Alexandre Bodin	dd072c40c3	Refactor column creation to use plain knex schema builder	2019-12-05 11:37:07 +01:00
Nevermoi	87f8f91b52	Update model.template ... Wrong description of beforeSave and afterSave for model, since updating will not trigger these two hooks	2019-12-05 10:48:30 +08:00
Virginie Ky	8b0d32178c	Edit main & add attr & edit attr & add compo in DZ Nav	2019-12-05 00:01:17 +01:00
cyril lopez	36cad7e3d3	Merge branch 'master' into master	2019-12-04 23:08:28 +01:00
soupette	2153368bc5	Fix modal baseline	2019-12-04 23:06:26 +01:00
soupette	f3398146f3	Fix Modal header button	2019-12-04 22:47:19 +01:00
Mickael D	359fd2bb21	Merge branch 'master' into fix/4537	2019-12-04 21:55:35 +01:00
soupette	7b19bfd7cb	Sort compos in select and add backheader	2019-12-04 20:55:05 +01:00
Anand Chowdhary	aa69553246	Change "Mac O/S" to "macOS"	2019-12-04 11:53:44 -08:00
soupette	eb330daf7a	Update trads	2019-12-04 19:07:35 +01:00
soupette	c8d09821c7	Add trad for single value	2019-12-04 18:57:06 +01:00
Alexandre Bodin	909266232f	Add tests on datetime	2019-12-04 18:49:47 +01:00