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

6682 Commits

Author SHA1 Message Date
Jerome Nadaud 7d85b21e92 // Pagination fix 2013-10-14 18:22:55 +02:00
Jerome Nadaud 7e4329a4dc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-14 17:31:50 +02:00
Jerome Nadaud 7e9cdbb163 // Pagination fix 2013-10-14 17:30:56 +02:00
Rémi Gaillard 7742020606 // small fix 2013-10-14 15:59:48 +02:00
Damien Metzger fa6d09a756 // Fixed warning 2013-10-14 15:56:53 +02:00
Vincent Augagneur 4da04275fe //small fix related to 1316bd7e1f 2013-10-14 15:07:50 +02:00
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 833091674c // Adding translations and PHP date format for datepicker 2013-10-14 11:34:04 +02:00
Jerome Nadaud 80c8605264 // Adding RTL to calendar helper 2013-10-14 09:14:18 +02:00
Jérôme Nadaud 892516342e // Fix when date is null 2013-10-13 11:47:29 +02:00
gRoussac f9cfde9a05 [-] MO : Trackingfront, could not load employee stats date 2013-10-12 23:24:32 +02:00
Chris 3f6139be42 BO: added UPC and EAN search 2013-10-11 21:02:01 +03:00
Jerome Nadaud d575ba8273 // Adding compare dates to date range picker 2013-10-11 18:30:05 +02:00
Rémi Gaillard 06c62c1684 [-] WS: Fix #PSCFV-10672 order by ID for non multishop entities 2013-10-11 17:53:15 +02:00
gRoussac a07733fcec [-] BO : Could not insert referrer id_connections_source can not be null 2013-10-11 16:52:53 +02:00
Jerome Nadaud bedcacf0b4 // Starting development of data range picker 2013-10-11 16:12:40 +02:00
Damien Metzger 1849995291 // Code cleaning 2013-10-11 15:35:45 +02:00
Rémi Gaillard 1316bd7e1f // add check stock value for color list if needed 2013-10-11 14:11:12 +02:00
Damien Metzger 809eac6308 // Fix upgrade and dashboard 2013-10-11 14:07:03 +02:00
Jerome Nadaud 1a1f3de775 [-] BO: Fixbug #PSCFV-10671 - Double htmlentities. 2013-10-11 13:33:31 +02:00
Damien Metzger c68101653d // Fixed tabs 2013-10-11 12:10:24 +02:00
Damien Metzger 49cdfb56c6 // Fix class_index generation 2013-10-11 11:15:14 +02:00
Damien Metzger f80b348d86 // Default vertical menu in BO 2013-10-11 11:02:35 +02:00
Gregory Roussac 6c739ee2b3 Merge pull request #833 from djfm/development 
[*] LO : set correct currency format for CHF
 2013-10-11 01:58:10 -07:00
Rémi Gaillard 49a9f0bcaa // unlink class_index tmp file if not rename 2013-10-11 10:58:05 +02:00
gRoussac 36ca7bc508 [-] BO : AdminImport, fix Group searchByName 2013-10-11 10:23:17 +02:00
djfm bb96c8754f [*] LO : set correct currency format for CHF 2013-10-11 07:14:30 +00:00
Damien Metzger 77551c03f5 // Fixed potential warning 2013-10-10 18:49:27 +02:00
gRoussac 286084c42d Merge branch 'master' of https://github.com/DarkHack/PrestaShop into contrib/master 
Conflicts:
	controllers/admin/AdminImportController.php
 2013-10-10 17:06:13 +02:00
Jerome Nadaud 22dcaf246c // Add icon and specific title to list 2013-10-10 15:36:50 +02:00
Jerome Nadaud 789911184b [-] BO : FixBug - Remove second email in recipient 2013-10-10 15:04:32 +02:00
Rémi Gaillard 278dc32482 [*] BO: Add an option to autologout to the backoffice after 15 minutes 2013-10-10 12:20:10 +02:00
Jerome Nadaud 067c78f868 // Fix notifications 2013-10-10 11:02:33 +02:00
François Gaillard 8d1bca5542 Merge pull request #768 from enumag/patch-4 
[-] Classes : Hook - Display payment method & custommer currency bug fix
 2013-10-09 13:52:09 -07:00
Damien Metzger 079534f039 // Fix header/footer override in admincontroller 2013-10-09 18:51:31 +02:00
Jerome Nadaud f6bbb6e241 // Fix duplicate invoice delivery number 2013-10-09 17:43:43 +02:00
Jerome Nadaud 68d84892c7 // remove self:: 2013-10-09 16:40:09 +02:00
Jerome Nadaud 2feb5dd8d2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-09 16:31:09 +02:00
Jerome Nadaud d0a4636966 [-] BO : FixBug #PSCFV-9957 - Duplicate order invoice number 2013-10-09 16:29:15 +02:00
Damien Metzger 1870dd4dd2 // Added order state color in order::getHistory() 2013-10-09 15:33:46 +02:00
Jerome Nadaud c8347cbc59 // Restore save button on header toolbar 2013-10-09 15:24:19 +02:00
Damien Metzger c982d08b68 // Removed useless link to the current page in the breadcrumb 2013-10-09 11:12:33 +02:00
Rémi Gaillard 3b677092bf [*] FO: You can now choose the anchor separator for attributes 2013-10-09 11:01:18 +02:00
Damien Metzger 623b8c7960 // Added expense management to profitability KPI 2013-10-09 10:55:12 +02:00
Sylvain Gougouzian 7a6dea4964 [~] BO : Export DeliverySlip 
The dates range wasn't using the correct sql fields.
 2013-10-09 10:39:24 +02:00
gRoussac fcc2930693 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop 2013-10-09 09:19:22 +02:00
Damien Metzger d9b40b8f35 // Added Modules KPIs 2013-10-08 19:39:52 +02:00
Jerome Nadaud b9cfc24922 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-08 18:42:19 +02:00
Jerome Nadaud d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
gRoussac 85946bacbe // small cast 2013-10-08 18:35:56 +02:00