dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

4313 Commits

Author SHA1 Message Date
Kevin Granger
8848ff08d8 // test git 
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Conflicts:
	controllers/admin/AdminImportController.php
 2013-11-28 14:29:34 +01:00
Kevin Granger
6729d97534 // import WIP 2013-11-28 12:22:39 +01:00
Vincent Augagneur
dde8540a86 //carrier wizard logo location fixed 2013-11-28 11:27:34 +01:00
gRoussac
8370c18fe8 [-] CORE : Remove notices on ob clean 2013-11-28 11:11:49 +01:00
Vincent Augagneur
ddf00b3e98 //small fix #PSCSX-50 2013-11-28 11:06:46 +01:00
Jerome Nadaud
510b71054a // Add Drag and Drop to uploader helper 2013-11-28 09:55:22 +01:00
Kevin Granger
cc3a1379d1 // Import WIP (still broken for first upload) 2013-11-27 19:33:36 +01:00
Jerome Nadaud
b58e8b6bb7 // One step csv uploader 2013-11-27 16:35:58 +01:00
Kevin Granger
8f51fee67a // load jquery-timeago.js 2013-11-27 15:15:30 +01:00
Kevin Granger
e1ae484c10 // add jquery.timeago.js + jquery. validatio,.js 2013-11-27 14:39:09 +01:00
Kevin Granger
66f8b55fc2 // import WIP (broken for now) 2013-11-27 14:35:47 +01:00
Kevin Granger
dd36a9e8b7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-27 11:35:41 +01:00
gRoussac
b8012952f7 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/852 2013-11-26 22:32:57 +01:00
Kevin Granger
37d4d4bd5f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-26 19:03:27 +01:00
Kevin Granger
32af46e42c // Import WIP 2013-11-26 19:03:15 +01:00
PhpMadman
0a5216e35b show all messages link linked to tab 2013-11-26 15:56:21 +01:00
Jerome Nadaud
dc90bb6227 // Force clearstatcache on product image upload 2013-11-26 15:46:21 +01:00
Kevin Granger
926286eaf9 // fix switch 2013-11-26 10:33:35 +01:00
Jerome Nadaud
0d6bc850de // Update datepicker button with period buttons select 2013-11-25 18:24:06 +01:00
Jerome Nadaud
a81ee41374 // Fix missing saving button in products 2013-11-25 18:01:01 +01:00
Kevin Granger
4c8c48f441 // admin import 2013-11-25 17:55:59 +01:00
Kevin Granger
0e3504f3b3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:17:15 +01:00
Kevin Granger
fae1fd58a9 // tweak on switch + admin import 2013-11-25 17:16:59 +01:00
Jerome Nadaud
a98002083f // Now you can click on folder icon to expand or collapse 2013-11-25 16:45:26 +01:00
Jerome Nadaud
b2cee0426a // Default category was not selected 2013-11-25 16:05:18 +01:00
Jerome Nadaud
d30e376354 // Remove "no name" error on new product 2013-11-25 14:42:21 +01:00
Jerome Nadaud
611cfd90a0 [-] BO : FixBug #PSCSX-40 categories unchanged after select a new home category 2013-11-25 12:08:34 +01:00
Damien Metzger
dec1555b32 // Fixed dashboard simulation mode switch 2013-11-25 11:30:30 +01:00
Kevin Granger
4044ba853e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-22 18:57:15 +01:00
Kevin Granger
0572fc09e8 // tweaks list + customers 2013-11-22 18:56:52 +01:00
Jérôme Nadaud
1337407131 Merge pull request #1019 from djfm/translations 
Translations
 2013-11-22 09:12:55 -08:00
rGaillard
b29a30f033 // small fix 2013-11-22 17:59:32 +01:00
djfm
a147806382 // Improved texts and UI in AdminImport 2013-11-22 15:44:49 +00:00
Jerome Nadaud
3fe6608a62 // Include datetime picker for all admin controllers 2013-11-22 16:41:52 +01:00
djfm
af4b258201 // js=1, not '1' 2013-11-22 14:22:26 +00:00
Damien Metzger
c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +01:00
Kevin Granger
f7ad627b4d // fix pagination Tax Rules Group 2013-11-21 18:28:25 +01:00
Damien Metzger
d89db6de45 // Fixed warning 2013-11-21 17:46:29 +01:00
Kevin Granger
9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
 2013-11-21 17:43:51 +01:00
Kevin Granger
6431f559d7 // tree header improvement WIP 2013-11-21 15:01:54 +01:00
Damien Metzger
9f1c39a7d6 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 1] 2013-11-21 12:32:51 +01:00
Jerome Nadaud
794f729c5d // Show more info content if <= 4 2013-11-21 12:23:54 +01:00
Kevin Granger
b10d50ef09 // fixs on horizontal nav + add icon on footer links 2013-11-21 12:15:21 +01:00
Jerome Nadaud
9229d6cb52 // Features and attributes title and buttons 2013-11-21 12:10:15 +01:00
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