Commit Graph

4201 Commits

Author SHA1 Message Date
Jerome Nadaud
d49f29f79d // Remove subtitle from orders view 2013-11-21 11:06:08 +01:00
Jerome Nadaud
0b47dbca21 // Adding footer to customer requiered fields 2013-11-21 09:46:27 +01:00
Jerome Nadaud
2df142eb89 // Align actions button in customner view 2013-11-21 09:35:44 +01:00
Kevin Granger
d4afcec83f Merge pull request #1005 from djfm/css
// adjust markup in AdminTranslationsController
2013-11-20 12:10:22 -08:00
Kevin Granger
104ae93936 // tweak nav sidebar 2013-11-20 19:25:11 +01:00
Jerome Nadaud
a5cc9efa76 // Languages boostraping 2013-11-20 18:20:19 +01:00
fram
5bd2439e43 // css in AdminTranslationsController 2013-11-20 18:07:51 +01:00
Jerome Nadaud
fc5b3b1d29 // Localization bootstraping 2013-11-20 17:52:05 +01:00
Jerome Nadaud
5b6cfa3cdb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 17:29:46 +01:00
Jerome Nadaud
12f3a150a7 // bootraping of import csv view 2013-11-20 17:29:35 +01:00
Kevin Granger
9e2dac8ece //fix css login 2013-11-20 17:24:52 +01:00
Kevin Granger
dc29fae59d // reorganize some css and stuff on backward compatibility 2013-11-20 16:24:01 +01:00
Kevin Granger
c61d1bc309 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 16:20:56 +01:00
Jerome Nadaud
e5d03f4e7c // Csv import fix hide checkbox 2013-11-20 16:11:37 +01:00
Jerome Nadaud
0b3c08acbe // Add language iso code to language select 2013-11-20 15:37:25 +01:00
Vincent Augagneur
8148d5696d [-] BO : fixed bug #PSCSX-25 - carrier wizard summary design and missing infos 2013-11-20 15:20:44 +01:00
Jerome Nadaud
62a149ebe6 [-] BO : FixBug #PSCSX-33 Misplaced save button 2013-11-20 14:50:31 +01:00
Jerome Nadaud
dbf98d3722 // Put suffix after input field 2013-11-20 12:02:15 +01:00
Kevin Granger
896d8ce494 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 11:57:44 +01:00
Jerome Nadaud
7ab256d28f // Small fix in customer order private note 2013-11-20 11:04:39 +01:00
Kevin Granger
369ac0f664 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl
2013-11-18 15:13:04 +01:00
Jerome Nadaud
2ba5dc18fd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
2013-11-18 14:49:27 +01:00
Jerome Nadaud
46dc93fd7e // Adding update button on to page header toolbar on module 2013-11-18 14:41:49 +01:00
Jerome Nadaud
239604b70c // Missing isset on cols and rows 2013-11-18 14:35:15 +01:00
Kevin Granger
73ec191fb0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
	admin-dev/themes/default/template/controllers/modules/configure.tpl
2013-11-18 10:23:23 +01:00
rGaillard
8c3eb9b9a4 // typo 2013-11-15 21:03:17 +01:00
Damien Metzger
b62952accf [*] BO : Added simulation mode to the dashboard 2013-11-15 18:07:23 +01:00
Jerome Nadaud
96def5033f // typo 2013-11-15 17:19:12 +01:00
Jerome Nadaud
8d90578cf7 // Add anchor to list 2013-11-15 16:04:27 +01:00
Jerome Nadaud
9fa2299c6b // Open prestashop.com link in new window 2013-11-15 11:56:23 +01:00
Jerome Nadaud
80957666cf // Hide collapse and expand button when not necessary 2013-11-14 19:21:31 +01:00
Jerome Nadaud
051ed32133 // Add toggle to datepicker button 2013-11-14 16:05:58 +01:00
Jerome Nadaud
4a46960112 // Small bootstrap fix 2013-11-14 16:00:22 +01:00
Jerome Nadaud
18a2e026ef // Adding more buttons to module configuration 2013-11-14 15:49:17 +01:00
Jerome Nadaud
67eeae0fa2 // Set visibility on help button 2013-11-14 14:42:35 +01:00
Kevin Granger
a0f73d20e5 // backward compatibility remix WIP 2013-11-13 20:11:22 +01:00
Jerome Nadaud
aa81e2607f // First boostraping pass on blocklayered module 2013-11-13 15:31:30 +01:00
Rémi Gaillard
4a9383bbcf // small fix 2013-11-13 11:15:48 +01:00
Kevin Granger
4fbc8deaa8 // fix products 2013-11-12 18:21:36 +01:00
Kevin Granger
4e06b1fdd5 // update Bootstrap 3.0.2 + fix tree header 2013-11-12 14:50:19 +01:00
Kevin Granger
4a6346b295 // adjustment on switch 2013-11-12 11:07:30 +01:00
Kevin Granger
2a982e96f1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-12 10:44:08 +01:00
Kevin Granger
5ca23d44a6 // label with tooltip 2013-11-12 10:43:52 +01:00
Jerome Nadaud
3931914203 // Add Modernizr and Modernizr-loads check and loading for unsuported browsers 2013-11-12 09:54:20 +01:00
Kevin Granger
d3100acef2 // fixs on mobile nav 2013-11-08 18:31:07 +01:00
Jerome Nadaud
c5b3d20b96 // Fix empty file list on add 2013-11-08 18:05:56 +01:00
Jerome Nadaud
bdc996d13b // Wrong col size 2013-11-08 17:58:09 +01:00
Jerome Nadaud
217a79eeae // Unify thumb param in files options 2013-11-08 17:49:56 +01:00
Jerome Nadaud
9065a73998 // Remove flags 2013-11-08 17:21:36 +01:00
Kevin Granger
00a72a5f68 // skin uploader button 2013-11-08 16:56:12 +01:00