dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph
20949 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jerome Nadaud 616cc91eb2 // Fix bug JQuery on handler 2013-11-06 15:49:44 +01:00
Jerome Nadaud 56230a1f53 // Live is deprecated in jquery 1.9 2013-11-06 15:34:46 +01:00
Jerome Nadaud 7895f8643e // Fix missing page header in combinations generator 2013-11-06 14:42:56 +01:00
jeckyl d321b9a5bc Update cart-summary.js 
Just add this space to separate this classes. It's to display or not carrier option when we select one or another carrier during order finalisation.
 2013-11-06 14:42:00 +01:00
PhpMadman d95885caae [*] FO : Added posibilty to display new price instead of quantity discount 2013-11-06 14:41:42 +01:00
TMMeilleur 211c36c7a3 improved scss variables 2013-11-06 15:41:00 +02:00
Jerome Nadaud fcb225ac5a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-06 12:19:15 +01:00
Jerome Nadaud 0c1b77b3da // Fix Combinations list actions button problem 2013-11-06 12:18:52 +01:00
Kevin Granger 05c71145c2 // dashboard 2013-11-06 12:14:49 +01:00
fchellypresta 71139df65f Merge pull request #796 from PhpMadman/patch-1 
[*] BO: #PNM-1472 Changed label and transparency range check to 1
 2013-11-06 03:06:47 -08:00
gRoussac 1fb8ef823d [-] BO : Fix bug #PSCFV-10937, bad escaping for var product_prices in prices.tpl 2013-11-06 11:50:52 +01:00
Jérôme Nadaud 29001b3392 Merge pull request #930 from PhpMadman/patch-3 
[-] BO : Cart was not using order reference
 2013-11-06 02:30:57 -08:00
PhpMadman eac7fbb694 [-] BO : Cart was not using order reference, corrected syntax 2013-11-06 11:06:46 +01:00
Vincent Augagneur a890410a64 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-06 10:57:02 +01:00
Vincent Augagneur c16c239953 //typo 2013-11-06 10:56:56 +01:00
Rémi Gaillard 9fa4296a06 Merge pull request #929 from djfm/bootstrap 
// updated English emails: now responsive
 2013-11-06 01:38:44 -08:00
Jérôme Nadaud 54db0b705c Merge pull request #923 from PrestaEdit/1.6.x-fancybox 
//remove unnecessary addCSS (fancybox)
 2013-11-06 00:31:57 -08:00
Jérôme Nadaud fa4b5e0b7d Merge pull request #927 from djfm/loc 
[*] LO : Added states to Spanish localization pack
 2013-11-06 00:31:46 -08:00
Jérôme Nadaud d30830f6fe Merge pull request #932 from prestalab/patch-1 
// FIX: tags with UTF-8 chars
 2013-11-05 23:49:43 -08:00
PrestaLab b2e5c6090d Fixed tags with UTF-8 chars 
Fixed error Tag->Name is not valid if tag in non latin chars
 2013-11-05 23:33:44 -08:00
PhpMadman 2556a7bb68 [-] MO : Mailalert was not using order reference 2013-11-05 20:46:10 +01:00
PhpMadman 7226f33f90 [-] BO : Cart was not using order reference 2013-11-05 20:42:57 +01:00
Rémi Gaillard 1dd919addf // no need mobile version with responsive :) 2013-11-05 19:15:24 +01:00
djfm f742e817da // updated English emails: now responsive 2013-11-05 18:10:31 +00:00
Rémi Gaillard 3edaee1313 // themeconfigurator 2013-11-05 19:07:42 +01:00
Rémi Gaillard 65a41a9f7a // theme configurator 2013-11-05 18:49:21 +01:00
Kevin Granger 5ec5215919 // UI modules fixs 2013-11-05 18:17:39 +01:00
Vincent Augagneur 37e0556c36 //fixed carrier logo upload 2013-11-05 18:12:53 +01:00
Vincent Augagneur 871ebe77b6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 18:08:22 +01:00
Vincent Augagneur d27fe93daa //modules added ->bootstrap = true; 2013-11-05 18:08:01 +01:00
Damien Metzger a31dbeb68e // Fixed bootstrap mode for modules 2013-11-05 17:29:51 +01:00
Kevin Granger b68d8c5d4a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 17:15:51 +01:00
Kevin Granger 332101614a // moved nv.d3.css to vendor directory 2013-11-05 17:15:36 +01:00
Vincent Augagneur 657c8f415a //small css fix 2013-11-05 17:01:38 +01:00
Vincent Augagneur 3f3a4ef342 //revert 2013-11-05 16:58:26 +01:00
Vincent Augagneur 217a9124d4 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 16:56:08 +01:00
Vincent Augagneur 1dccee0036 //remove back button in header toolbar on carrier wizard 2013-11-05 16:56:03 +01:00
Damien Metzger ad7dfca9e1 // RSS date on the dashboard 2013-11-05 16:55:55 +01:00
Kevin Granger 2581acd505 // fix tooltip carrier wizard 2013-11-05 16:52:41 +01:00
Kevin Granger eb02711042 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 16:42:24 +01:00
Kevin Granger e702af6a67 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-11-05 16:42:09 +01:00
Damien Metzger 9f1911eeca // Fixed shopping cart line reduction 2013-11-05 16:41:50 +01:00
Kevin Granger 533ebc0f6d // backward CSS 2013-11-05 16:40:21 +01:00
Jerome Nadaud 3f3dc0feb9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-05 16:39:12 +01:00
Rémi Gaillard 4a6cb5075e Merge pull request #924 from TMMeilleur/bootstrap 
// Update default theme
 2013-11-05 07:36:14 -08:00
Damien Metzger ec528fff93 // one more groups improvement 2013-11-05 16:34:03 +01:00
Vincent Augagneur f0e1b9b2b8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-05 16:32:12 +01:00
Vincent Augagneur 7e872aa581 //small fix 2013-11-05 16:32:05 +01:00
Damien Metzger 161c701ecf // Groups review 2013-11-05 16:30:34 +01:00
TMMeilleur 0ffa6ab059 update 5.11.13 2013-11-05 17:27:57 +02:00