dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,212 Commits 9 Branches 19 Tags
44f89053e41ced93ff3385d46fbf395da7c78f62
Commit Graph

76 Commits

Author SHA1 Message Date
Kevin Granger 67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
 2013-10-14 12:21:29 +02:00
Jerome Nadaud f9373e6178 // Fix toolbar button and toolbar title for invoices 2013-10-09 08:53:36 +02:00
Jerome Nadaud d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Francois Gaillard 77b2b4b6ca // Manual merge PS 1.5.6.0 2013-10-07 18:22:55 +02:00
djfm 172986a461 // changed help text 2013-10-01 15:06:33 +00:00
Rémi Gaillard 9ad046677c [*] BO: Allow to breakdown the taxes when they are computed 2013-10-01 11:55:56 +02:00
Kevin Granger 8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Jerome Nadaud 6449ecfb32 [-] BO : Force invoice footer text to 1 ligne 2013-09-27 14:41:50 +02:00
Kevin Granger 7d4c0ad36e // fix col-offset and btn-primary 2013-08-29 17:04:10 +02:00
Jérôme Nadaud 06834e404d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-07-26 19:00:00 +02:00
Jérôme Nadaud 52ff61719b [+] BO : Remove invoices button toolbar 2013-07-26 18:59:39 +02:00
Kevin Granger 94de4d3d2f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
# By Jérôme Nadaud
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop:
  [-] BO : Order template misplaced empty form
  [+] BO : Handler invoice date generation button
 2013-07-26 18:55:18 +02:00
Kevin Granger 9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
Jérôme Nadaud f3ca8ec15b [+] BO : Handler invoice date generation button 2013-07-26 17:23:15 +02:00
Kevin Granger 1a2b78b00f [+] BO Invoices 2013-07-26 15:34:11 +02:00
sLorenzini 66f64c1baa // update order tab 2013-07-15 17:58:23 +02:00
fram ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram 77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39: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
Rémi Gaillard 301dc491b4 [-] BO: Fix #PSCFV-6415 php notice 2013-01-02 16:21:54 +01:00
Rémi Gaillard 1900700f1b [-] BO: Fix #PSCFV-6415 php notice 2013-01-02 16:21:54 +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
lLefevre 779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre 6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre 046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre 398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
tDidierjean 60ad46c3d1 // Renaming options to fields_options 2012-03-29 16:14:14 +00:00
tDidierjean e0664df6f8 // Renaming options to fields_options 2012-03-29 16:14:14 +00:00
fBrignoli a20e175495 // PDF override 2012-03-28 15:28:29 +00:00
fBrignoli 49f72de495 // PDF override 2012-03-28 15:28:29 +00:00
rMalie a6e87b2020 // Fix problems with display of PDF with multishop #PSFV-643 admin/pdf.php is now deprecated 2012-03-26 16:00:05 +00:00
rMalie 6cf9ef197d // Fix problems with display of PDF with multishop #PSFV-643 admin/pdf.php is now deprecated 2012-03-26 16:00:05 +00:00
lLefevre 6301922ab9 // Fix replace //" by " in english keys and change french keys 2012-03-14 17:25:41 +00:00
lLefevre 74cd81a66c // Fix replace //" by " in english keys and change french keys 2012-03-14 17:25:41 +00:00
lLefevre 9f4e2698ee // revert to revision 14160 2012-03-14 15:05:13 +00:00
lLefevre 05c2b696ce // revert to revision 14160 2012-03-14 15:05:13 +00:00
lLefevre 7d71d0316c // Fix replace \\" by " in english keys 2012-03-14 14:58:48 +00:00
lLefevre 6608328a2a // Fix replace \\" by " in english keys 2012-03-14 14:58:48 +00:00
lLefevre 1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
lLefevre c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
rMalie 84807f52d8 // Remove AdminPdf controller and move its configuration in AdminInvoices controller 2012-02-29 12:41:05 +00:00
rMalie 67b5b28880 // Remove AdminPdf controller and move its configuration in AdminInvoices controller 2012-02-29 12:41:05 +00:00
rMalie 20f2f2de7d // Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID() 2012-02-27 09:49:19 +00:00
rMalie 394c493efc // Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID() 2012-02-27 09:49:19 +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