dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,010 Commits 9 Branches 19 Tags
e2f60aa6f60a17d43191f4eaf68bd01002c3b74f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Granger e2f60aa6f6 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-11 17:46:43 +01:00
Kevin Granger 569c75f111 // add upload and download process icons 2013-12-11 17:46:29 +01:00
Kevin Granger bbf2899311 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-11 17:18:35 +01:00
Kevin Granger e607abf2a6 // fix compilation for some scss (to be continued) 2013-12-11 17:18:20 +01:00
Kevin Granger b93a9cb7a3 // fix typo in filename 2013-12-11 17:00:32 +01:00
Kevin Granger b9db5d5023 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-11 16:56:12 +01:00
Kevin Granger 36968d76b6 // header markup retake 2013-12-11 16:55:53 +01:00
Kevin Granger f8b7e02396 // shouldn’t change .container behavior 2013-12-11 12:25:28 +01:00
Kevin Granger 8f71f36be9 // css fixs 2013-12-11 12:18:18 +01:00
Kevin Granger 78df7f52f4 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 19:08:58 +01:00
Kevin Granger 7e7e2986b2 // start css refactor + optimisation 2013-12-10 19:08:42 +01:00
Kevin Granger ffc7c2f19d Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 15:28:30 +01:00
Kevin Granger 4a22abc2d1 // fix dual pagination id duplicate 2013-12-10 15:28:17 +01:00
Kevin Granger 1d808f89b5 // fix functionnal-buttons 2013-12-10 15:06:51 +01:00
Kevin Granger 167a5c7921 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-10 14:25:18 +01:00
Kevin Granger cfa606b12c // convert global to sass - 100% (can be compiled) 2013-12-10 14:25:06 +01:00
Kevin Granger a94666c4fb // convert global to sass - WIP 75% 2013-12-10 10:40:14 +01:00
Kevin Granger 6d669cb5f1 // global rewrited in sass - WIP 50% (won’t compile yet) 2013-12-09 19:16:27 +01:00
Kevin Granger 24cd0bbdb0 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-09 16:48:55 +01:00
Kevin Granger 79652b1704 // removed « add to compare» from the homepage 2013-12-09 16:48:37 +01:00
Kevin Granger 8700f15c61 // closed an attribute left behind 2013-12-09 16:39:33 +01:00
Kevin Granger 91c3bf48b1 // w3C product 2013-12-09 14:26:17 +01:00
Kevin Granger ea450edc4c // more W3C 2013-12-09 10:15:53 +01:00
Kevin Granger c46159ccce Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 19:09:48 +01:00
Kevin Granger 5fb2081054 // order-carrier preparation to be W3C validated! 2013-12-06 19:09:36 +01:00
Kevin Granger 95d5e9d819 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-06 17:25:23 +01:00
Kevin Granger 71ac20c819 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 
Conflicts:
	themes/default-bootstrap/js/products-comparison.js
 2013-12-06 17:24:00 +01:00
Kevin Granger db37e42b21 // checkout W3C valid - wip 2013-12-06 17:19:47 +01:00
Kevin Granger ed5496479d // removed console.log() 2013-12-06 17:18:20 +01:00
Kevin Granger 9f106d06ef // valid W3C checkout - WIP 2013-12-06 15:43:12 +01:00
Kevin Granger d4f73213cb // checkout - shopping cart W3C valid 2013-12-06 12:12:21 +01:00
Kevin Granger 0067eff263 // working on W3C validation 2013-12-05 18:50:50 +01:00
Kevin Granger 9dd82367f3 // Product compare almost W3C valid -> #availability_value must be change with a class 2013-12-05 16:27:10 +01:00
Kevin Granger 02b6e24ca4 // category page almost W3C valid 2013-12-05 15:27:40 +01:00
Kevin Granger c0e8794947 // make product.tpl human readable ;) 2013-12-05 14:42:22 +01:00
Kevin Granger 5e9db96f61 // home is valid W3C! 2013-12-05 10:38:59 +01:00
Kevin Granger 04d2ff59ee // fix product list + facebook block HTML5 version WIP 2013-12-04 19:31:02 +01:00
Kevin Granger 33b5327b4d // data-id-product instead of using rel tag 2013-12-04 16:58:34 +01:00
Kevin Granger b450a9fa80 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 
Conflicts:
	themes/default-bootstrap/products-comparison.tpl
 2013-12-04 15:48:16 +01:00
Kevin Granger ad6ed3dcf1 // data-id-product instead of using rel tag 2013-12-04 15:46:42 +01:00
Kevin Granger 68edf085d4 // fix «enter» on retrieve password panel 2013-12-04 11:29:21 +01:00
Kevin Granger 97dabf5b74 // upadate banner 2013-12-04 10:00:40 +01:00
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 0d7a48095c // tweak product tabs 2013-12-02 15:27:21 +01:00
Kevin Granger bf3c27e864 // fix dropdown menu 2013-12-02 14:13:41 +01:00
Kevin Granger 2ef8333e6a // tweak import 2013-12-02 14:12:02 +01:00
Kevin Granger 79b1b07cce // tweak on login form : it’s a trap! 2013-12-02 11:35:21 +01:00
Kevin Granger 909983bcbf Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-12-02 11:11:29 +01:00
Kevin Granger bca9048a6b // fix filter by category 2013-12-02 11:11:16 +01:00
Kevin Granger c8f130670f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 17:19:04 +01:00
Kevin Granger 6a84f586af // add compass config.rb for theme default-bootstrap 2013-11-29 17:18:50 +01:00
Kevin Granger 85f445b7cc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-29 11:53:52 +01:00
Kevin Granger cc80e82431 // import (todo: add the link delete/view on items loaded with js) 2013-11-29 11:53:43 +01:00
Kevin Granger 1d2f6c9b9d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-28 19:22:03 +01:00
Kevin Granger 0f74646524 // import 2013-11-28 19:21:55 +01:00
Kevin Granger 18059a24a3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-28 14:35:41 +01:00
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
Kevin Granger cc3a1379d1 // Import WIP (still broken for first upload) 2013-11-27 19:33:36 +01:00
Kevin Granger 8f51fee67a // load jquery-timeago.js 2013-11-27 15:15:30 +01:00
Kevin Granger 6d9f71a8db Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-27 14:39:41 +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
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
Kevin Granger 926286eaf9 // fix switch 2013-11-26 10:33:35 +01:00
Kevin Granger d9e53486a0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-25 17:56:11 +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
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
Kevin Granger f7ad627b4d // fix pagination Tax Rules Group 2013-11-21 18:28:25 +01:00
Kevin Granger 5976a471a7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-21 17:43:59 +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
Kevin Granger b10d50ef09 // fixs on horizontal nav + add icon on footer links 2013-11-21 12:15:21 +01:00
Kevin Granger a6e1309a33 Merge pull request #1008 from djfm/cleanup 
// removed superfluous mail files
 2013-11-21 01:41:15 -08: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
Kevin Granger 9e2dac8ece //fix css login 2013-11-20 17:24:52 +01:00
Kevin Granger 8eb5f76df9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 16:24:15 +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
Kevin Granger 896d8ce494 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-20 11:57:44 +01:00
Kevin Granger 3580dc016a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 23:46:48 +01:00
Kevin Granger 4f7f8535b5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 15:13:11 +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
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
Kevin Granger a0f73d20e5 // backward compatibility remix WIP 2013-11-13 20:11:22 +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 3f83edc7e1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-12 11:07:44 +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
Kevin Granger d3100acef2 // fixs on mobile nav 2013-11-08 18:31:07 +01:00