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

5245 Commits

Author SHA1 Message Date
Jerome Nadaud 99f66e26d0 // Change datepicker class 2013-10-17 13:24:46 +02:00
Jerome Nadaud 1f93d071c2 // Add transplant module button to page header toolbar 2013-10-17 13:24:01 +02:00
Jerome Nadaud f9b115a2f8 // Date Range picker improvements 2013-10-17 11:39:02 +02:00
Jerome Nadaud 1f50e074f7 // New order button fix 2013-10-17 09:37:19 +02:00
Jerome Nadaud a85b931765 // Adding compare options 2013-10-16 19:07:23 +02:00
Vincent Augagneur c684fa13cb //module anchor now use instant search to filter module list 2013-10-16 16:09:44 +02:00
Kevin Granger bc5b807a7b // graph update 2013-10-16 12:18:27 +02:00
Rémi Gaillard 2e65214c39 // manually merge of modules search 2013-10-16 11:36:40 +02:00
Kevin Granger be2ea4ca77 // login 2013-10-15 20:04:19 +02:00
Damien Metzger 7b307094b6 // Added comparison to the dashboard 2013-10-15 13:52:12 +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 07073afa1f // Fix CMS filter, reset and sort 2013-10-14 17:28:21 +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 0fe3630a05 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 18:30:16 +02:00
Jerome Nadaud d575ba8273 // Adding compare dates to date range picker 2013-10-11 18:30:05 +02:00
Kevin Granger 89251a667b // feedback button 2013-10-11 18:26:12 +02:00
Jerome Nadaud 0f9c81a683 [-] BO : FixBug #PSCFV-10671 - remove htmlentities on customer message 2013-10-11 17:29:44 +02:00
Damien Metzger eff292731f // Fixed typo 2013-10-11 16:35:49 +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
Damien Metzger 7a5187e84e // Fix module active 2013-10-11 14:11:01 +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
Rémi Gaillard bb35a5b004 // multishop 2013-10-11 10:04:10 +02:00
djfm bb96c8754f [*] LO : set correct currency format for CHF 2013-10-11 07:14:30 +00:00
gRoussac dc1632a8b0 [-] BO : Adminimport, id_specific key_price not defined 2013-10-10 22:04:42 +02:00
Gregory Roussac a87bbf84b4 Merge pull request #825 from indesign47/patch-4 
[-] BO : AdminImport add available fields to Products
 2013-10-10 10:22:43 -07:00
Damien Metzger 4505387046 // Try to fix regexp issues with some PHP configurations 2013-10-10 18:41:50 +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
gRoussac 39a543188a [-] BO : Fix bug #PSCFV-10660, could not delete csv file on NT 2013-10-10 14:54:12 +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
Rémi Gaillard 7fdf6e614f // don't display some field when an employee edit it's own profile 2013-10-10 11:35:05 +02:00
Jerome Nadaud 5ec76a759a // Fix Dashboard toolbar 2013-10-09 19:12:20 +02:00
Vincent Augagneur d796d0012e [-] BO : fixed bug #PSCFV-10637 PS_CARRIER_DEFAULT is not updated after edit default carrier 2013-10-09 15:25:02 +02:00
Damien Metzger a2371067bf // CSS fixes 2013-10-09 15:11:04 +02:00
Damien Metzger 9fcb039068 // A few CSS fixes 2013-10-09 14:57:15 +02:00
gRoussac df97566018 [-] BO : AdminImport no default value for separators 2013-10-09 13:57:36 +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
Damien Metzger 38143e1245 // Fixed stats bug (bad id for ajax request) 2013-10-09 10:05:24 +02:00
Jerome Nadaud d448891065 // Add new country button to countries controller 2013-10-09 09:51:25 +02:00
Jerome Nadaud f9373e6178 // Fix toolbar button and toolbar title for invoices 2013-10-09 08:53:36 +02:00
Damien Metzger d9b40b8f35 // Added Modules KPIs 2013-10-08 19:39:52 +02:00
Jerome Nadaud d595cd2f12 // Toolbar modif for products 2013-10-08 18:51:10 +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
Damien Metzger 53748c3119 // Code cleaning 2013-10-08 15:01:46 +02:00
Daniel fa88a0bd93 Update AdminTranslationsController.php 
Fixes issue where path is not printed when error with email template saves occur.
 2013-10-08 20:54:52 +08:00
Rémi Gaillard 2899dfba5e // Fix AdminTranslationsController::addNewTabs() 2013-10-08 14:53:02 +02:00
Damien Metzger a14118863e // Code cleaning 2013-10-08 14:45:21 +02:00