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
Damien Metzger 36baadad1a // Set to new fixtures 2013-11-18 18:51:11 +01:00
Jerome Nadaud e02b5d5c11 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	admin-dev/themes/default/template/helpers/list/list_header.tpl
 2013-11-18 18:39:25 +01:00
Lucas CERDAN c78252f64b Fixtures images 2013-11-18 18:38:24 +01:00
Jerome Nadaud 6be883217e [-] BO : FixBug #PNM-1594 - Double selected option value 2013-11-18 18:36:30 +01:00
Lucas CERDAN 5ca7f683ac // Fixture (en): add description to categories 2013-11-18 18:09:40 +01:00
rGaillard 7755cd8d3e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 17:46:20 +01:00
rGaillard 5c1f8871fc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 17:46:05 +01:00
Jerome Nadaud 57b329ca74 // Remove other fonts 2013-11-18 17:46:05 +01:00
rGaillard 9197498c3c // delete useless module 2013-11-18 17:45:53 +01:00
Jerome Nadaud 339fb86f4b // oops 2013-11-18 17:42:26 +01:00
Jerome Nadaud 04bc320080 // Small fix 2013-11-18 17:41:16 +01:00
Lucas CERDAN 09a558485a New fixtures (en) 
(my first commit, yay! :) )
 2013-11-18 17:24:06 +01:00
Jerome Nadaud c14b9e619d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
 2013-11-18 17:21:41 +01:00
Jerome Nadaud 938ef4fe39 // small fix 2013-11-18 17:12:35 +01:00
Damien Metzger 43a54b10bf // Reverted revert 2013-11-18 17:00:23 +01:00
rGaillard 5d0b188eed // small fix 2013-11-18 16:19:02 +01:00
Rémi Gaillard 10e0205cb8 Merge pull request #992 from djfm/development 
// fixed typo in Russian installer
 2013-11-18 06:40:31 -08:00
Rémi Gaillard a1d34e4ad2 Merge pull request #993 from djfm/bootstrap 
// fixed typo in Russian installer
 2013-11-18 06:40:02 -08:00
Damien Metzger 1f71090b86 // Timeout increased for translation download #PSCFV-11046 2013-11-18 15:37:34 +01:00
Jerome Nadaud 522e95223f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 15:35:17 +01:00
Jerome Nadaud 89c9f182b3 // Small fix in live configurator toolbox 2013-11-18 15:35:03 +01:00
fram 1dd0064cb2 // fixed typo in Russian installer 2013-11-18 15:34:46 +01:00
Rémi Gaillard 4cba2623e5 Merge pull request #926 from djfm/loc_ui 
//Localization
 2013-11-18 06:32:34 -08:00
Rémi Gaillard 618aa24f74 Merge pull request #945 from Javsmile/patch-2 
// Update productcomments.php
 2013-11-18 06:30:59 -08:00
fram 0889ab4eec // fixed typo in Russian installer 2013-11-18 15:30:05 +01:00
Rémi Gaillard f4194bedd9 Merge pull request #978 from StanProg/bootstrap 
// FO : Removed unused local variable, tabs added, phpdoc tags
 2013-11-18 06:27:46 -08:00
Rémi Gaillard 4c51570b34 Merge pull request #991 from TMMeilleur/bootstrap 
// fixed add to wishlist/compare buttons and added product review
 2013-11-18 06:22:43 -08: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
gRoussac 6633efd27d [-] BO : Fix bug #PNM-1594, selected value error in helper list 2013-11-18 15:11:49 +01:00
Jerome Nadaud c4dab5f5a6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 15:04:44 +01:00
Jerome Nadaud 40204ba458 // Live configurator toolbox part 2 2013-11-18 15:04:10 +01:00
gRoussac 8d627aa522 [-] MO : Referralprogram Prevent Exception when badly configured 2013-11-18 14:58:17 +01:00
Damien Metzger adcc4f2c74 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 14:54:47 +01:00
Damien Metzger b4385c346f [+] Installer : new demo products (part 1) 2013-11-18 14:53:39 +01:00
TMMeilleur 95b9710eda fixed add to wishlist/compare buttons and added product review 2013-11-18 15:52:39 +02:00
Jerome Nadaud 2ba5dc18fd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	modules/themeconfigurator/themeconfigurator.php
 2013-11-18 14:49:27 +01:00
Jerome NadaudandgRoussac bcc851c98c // Update image fix 2013-11-18 14:44:23 +01:00
Jerome Nadaud 46dc93fd7e // Adding update button on to page header toolbar on module 2013-11-18 14:41:49 +01:00
Jerome Nadaud 867eef79cc // Add live configurator toolbox - Part 1 2013-11-18 14:39:46 +01:00
gRoussac dbc08d779c // typo, sorry about this 2013-11-18 14:35:39 +01:00
Jerome Nadaud 239604b70c // Missing isset on cols and rows 2013-11-18 14:35:15 +01:00
gRoussac 22a9548f83 [-] FO : Fix bug #PSCFV-11043, bad cache id from module template 2013-11-18 14:32:34 +01:00
Jerome Nadaud ebad56a800 // Fix small error 2013-11-18 14:29:32 +01:00
gRoussac 4771746959 [-) FO : Fix bug #PSCFV-10926, trailing question mark in pagination url 2013-11-18 12:26:08 +01:00
Damien Metzger 89c65536d7 // Added missing configuration vars in the installer 2013-11-18 12:23:50 +01:00
Damien Metzger 5ef4b8eddc // Installer optimization 2013-11-18 12:12:14 +01:00
rGaillard bd241a9c48 [-] BO: product price was changed on changing to advanced stock management #PSCFV-10996 2013-11-18 12:04:09 +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
Jérôme Nadaud 8166bb662c Merge pull request #984 from soware/development 
Update form.tpl
 2013-11-18 01:01:00 -08:00