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

57 Commits

Author SHA1 Message Date
rGaillard
be91ec02f2 // fix modules filter after category change 2013-12-04 12:03:12 +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
gRoussac
19da345531 [-] BO : Could not check all modules after ajax call 2013-11-10 21:51:14 +01:00
Rémi Gaillard
ecf45d0475 // small fix 2013-10-30 18:28:55 +01:00
Vincent Augagneur
2f34af4646 //remove debug 2013-10-17 09:26:47 +02:00
Vincent Augagneur
c684fa13cb //module anchor now use instant search to filter module list 2013-10-16 16:09:44 +02:00
Rémi Gaillard
2e65214c39 // manually merge of modules search 2013-10-16 11:36:40 +02:00
Rémi Gaillard
1b8526cd05 // fix ajax on module list 2013-10-15 18:35:04 +02:00
Jerome Nadaud
a1f5455d07 // Fix Mark as favorite not updated 2013-10-07 11:03:03 +02:00
vAugagneur
7c626218df Merged Pull request #302 - Thanks to @kpodemski 2013-04-16 11:48:17 +02:00
vAugagneur
e271524cc4 Merged Pull request #302 - Thanks to @kpodemski 2013-04-16 11:48:17 +02:00
Damien Metzger
7ec0f0e391 // Fixed modules list icons retrieval 2013-03-08 11:53:25 +01:00
Damien Metzger
6d98b9a6ac // Fixed modules list icons retrieval 2013-03-08 11:53:25 +01:00
vAugagneur
bc203bfc3a [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
vAugagneur
ab3226d9d2 [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
Damien Metzger
2bf6b3a82e // Cleaned modules call 2012-12-13 13:35:33 +01:00
Damien Metzger
b391fc176a // Cleaned modules call 2012-12-13 13:35:33 +01:00
vAugagneur
049caca3b7 [-] CORE : fixed some bad include of jquery plugin 2012-11-23 16:35:57 +01:00
vAugagneur
0e0ca2a473 [-] CORE : fixed some bad include of jquery plugin 2012-11-23 16:35:57 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
dMetzger
2a297990a0 // W3C 2012-08-20 08:48:53 +00:00
dMetzger
c4d3116607 // W3C 2012-08-20 08:48:53 +00:00
vSchoener
f3726fe359 [-] BO : Update assign value 2012-05-23 08:19:32 +00:00
vSchoener
db30395203 [-] BO : Update assign value 2012-05-23 08:19:32 +00:00
fSerny
811eccd624 [-] BO : Fix scroll when errors occurred on modules 2012-05-17 00:07:03 +00:00
fSerny
3ea14ea72b [-] BO : Fix scroll when errors occurred on modules 2012-05-17 00:07:03 +00:00
vSchoener
773a36de29 // Commit linked to my last one (ws call for module). 2012-05-16 14:10:02 +00:00
vSchoener
1b59f31ba4 // Commit linked to my last one (ws call for module). 2012-05-16 14:10:02 +00:00
tDidierjean
67a68c0688 // small js fixes 2012-05-11 13:39:08 +00:00
tDidierjean
cd54f3f8df // small js fixes 2012-05-11 13:39:08 +00:00
fSerny
5395728ab9 // Small fix on AdminModules filters 2012-02-29 15:21:26 +00:00
fSerny
31f0df21fb // Small fix on AdminModules filters 2012-02-29 15:21:26 +00:00
fSerny
cb1235fb6a [*] BO : Filters are highlighted when used in AdminModules 2012-02-29 14:25:29 +00:00
fSerny
549dc54e10 [*] BO : Filters are highlighted when used in AdminModules 2012-02-29 14:25:29 +00:00
fSerny
0a09da7cda [*] BO : Adding filter for modules bought on Addons 2012-02-29 10:44:48 +00:00
fSerny
675268a167 [*] BO : Adding filter for modules bought on Addons 2012-02-29 10:44:48 +00:00
fSerny
717e00b109 [-] BO : AdminModule shows when connected to Addons and have a logout button 2012-02-29 10:29:12 +00:00
fSerny
7e55893c42 [-] BO : AdminModule shows when connected to Addons and have a logout button 2012-02-29 10:29:12 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
1c288bf01d // Welcome 2012 2012-02-22 09:28:22 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
fSerny
19ed5c3f33 // Small fix 2012-02-02 21:18:32 +00:00
fSerny
0d507eb9d1 // Small fix 2012-02-02 21:18:32 +00:00
François Gaillard
180634f2d0 [-] BO : #PSFV-393 : BugFix jquery.fancybox.js was not found 2012-02-01 09:10:37 +00:00