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

357 Commits

Author SHA1 Message Date
Kevin Granger
5a5c754dab // clean css 2013-12-03 17:43:49 +01:00
Kevin Granger
3f2ce54efd // gamification + multishop wip 2013-12-03 15:21:13 +01:00
Kevin Granger
a88b2b6ab5 // fix footer actions 2013-12-02 16:27:24 +01:00
Kevin Granger
bf3c27e864 // fix dropdown menu 2013-12-02 14:13:41 +01:00
Kevin Granger
79b1b07cce // tweak on login form : it’s a trap! 2013-12-02 11:35:21 +01:00
Kevin Granger
0f74646524 // import 2013-11-28 19:21:55 +01:00
Kevin Granger
cc3a1379d1 // Import WIP (still broken for first upload) 2013-11-27 19:33:36 +01:00
Kevin Granger
32af46e42c // Import WIP 2013-11-26 19:03:15 +01:00
Kevin Granger
4c8c48f441 // admin import 2013-11-25 17:55:59 +01:00
Kevin Granger
fae1fd58a9 // tweak on switch + admin import 2013-11-25 17:16:59 +01:00
Kevin Granger
0572fc09e8 // tweaks list + customers 2013-11-22 18:56:52 +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
b10d50ef09 // fixs on horizontal nav + add icon on footer links 2013-11-21 12:15:21 +01:00
Kevin Granger
104ae93936 // tweak nav sidebar 2013-11-20 19:25:11 +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
a0f73d20e5 // backward compatibility remix WIP 2013-11-13 20:11:22 +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
5ca23d44a6 // label with tooltip 2013-11-12 10:43:52 +01:00
Kevin Granger
d3100acef2 // fixs on mobile nav 2013-11-08 18:31:07 +01:00
Kevin Granger
b214ea68ff // mobile nav 2013-11-08 16:18:28 +01:00
gRoussac
ebc3dfee62 [-] BO : Fix css bug #PSCFV-10899, fixed fix-toolbar z-index 2013-11-08 15:54:13 +01:00
Kevin Granger
9c4ee27f20 // mobile nav WIP 2013-11-07 21:48:55 +01:00
Kevin Granger
866e7f831b // fixs highlight search 2013-11-06 19:26:22 +01:00
Kevin Granger
93717e910b // Repairs sake of performance on tables with many lines. 2013-11-06 18:15:17 +01:00
Kevin Granger
5ec5215919 // UI modules fixs 2013-11-05 18:17:39 +01:00
Kevin Granger
332101614a // moved nv.d3.css to vendor directory 2013-11-05 17:15:36 +01:00
Kevin Granger
2581acd505 // fix tooltip carrier wizard 2013-11-05 16:52:41 +01:00
Kevin Granger
533ebc0f6d // backward CSS 2013-11-05 16:40:21 +01:00
Kevin Granger
eb383e580e // Organize css/sass + backward compatibility WIP 2013-11-05 12:32:41 +01:00
Kevin Granger
fbc93e5632 // moved admin css and backward compatibility css to admin theme css directory 2013-11-04 19:48:53 +01:00
Kevin Granger
8aedd4eb04 // Cleaned CSS files 2013-11-04 18:31:59 +01:00
Kevin Granger
1bcb8d5c82 // sass-bootstrap 3.0.1 update 2013-11-01 16:44:55 +01:00
Kevin Granger
bf781ed267 // horizontal nav 2013-11-01 15:50:33 +01:00
Kevin Granger
64598535bd // Avatar + Vertical Nav WIP 2013-10-31 19:13:34 +01:00
Kevin Granger
df80e6ec8b // btn-group-action adjustments 2013-10-29 18:55:33 +01:00
Kevin Granger
aee725839e // fixs btn-group 2013-10-29 18:10:07 +01:00
Kevin Granger
5fa36abcaf // fixs UI 2013-10-29 17:32:57 +01:00
Kevin Granger
b3d7b8754b // fixs date range picker Wip 2013-10-29 10:40:33 +01:00
Kevin Granger
d523d739e7 // dashboard date range picker wip 2013-10-28 16:18:43 +01:00
Kevin Granger
7126397bfe // fix scroll vertical nav 2013-10-28 10:13:35 +01:00
Kevin Granger
8353bc5ac2 // fix attributes-color-container 2013-10-28 09:32:46 +01:00
Damien Metzger
aa322e4777 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-10-25 15:22:01 +02:00
Damien Metzger
e8d5dc8a62 [*] BO : search results improvements (no unaccessible tabs, better display, better information) 2013-10-25 15:19:03 +02:00
Kevin Granger
339f428c23 // fix login - (tabindex, loading, ellipsis) 2013-10-25 14:58:10 +02:00
Kevin Granger
ddf65f3b97 // toolbar nav fixs 2013-10-25 10:33:45 +02:00
Kevin Granger
acfc3bc266 // fixe buttons group wrap 2013-10-24 19:34:25 +02:00
Damien Metzger
cd5fa81025 // Fixed boulette 2013-10-24 19:29:22 +02:00
Damien Metzger
5ff406cdb8 // css 2013-10-24 18:09:11 +02:00