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

5531 Commits

Author SHA1 Message Date
Jerome Nadaud
96766a311e // Unify form fields for image preferences 2013-10-22 10:10:15 +02:00
Kevin Granger
eb82297f45 // small fixs 2013-10-22 10:04:45 +02:00
Jerome Nadaud
f336cc599b // Btn-primary replacement 2013-10-21 18:56:41 +02:00
Damien Metzger
58aa64fab7 // Code cleaning 2013-10-21 18:18:48 +02:00
Kevin Granger
2e13013657 // search field WIP 2013-10-21 18:03:00 +02:00
gRoussac
d25b41ef97 [-] BO : wrong csv files name 2013-10-21 14:34:59 +02:00
Jerome Nadaud
6275e7bcad // Remove translations on icon class 2013-10-21 09:57:13 +02:00
Jerome Nadaud
cdab5ed6c9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
 2013-10-18 18:47:42 +02:00
Jerome Nadaud
7e176b157b // Fix save and preview button 2013-10-18 18:44:13 +02:00
Kevin Granger
04b4e548f3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-18 18:38:17 +02:00
Kevin Granger
5f52a9e171 // fix products 2013-10-18 18:38:02 +02:00
Damien Metzger
d1a2c33322 Merge pull request #849 from djfm/bootstrap 
// Translations fix
 2013-10-18 09:35:20 -07:00
Jerome Nadaud
1c1fb5fb5c // Update image fix 2013-10-18 17:59:45 +02:00
Jerome Nadaud
1bee0087c0 // Update image fix 2013-10-18 17:50:36 +02:00
Jerome Nadaud
964f546b0b // Update image when updated 2013-10-18 17:41:36 +02:00
Jerome Nadaud
0599d4f056 // Fix Localization page header title 2013-10-18 17:41:10 +02:00
djfm
b5b18b9d2b // use sprintf 2013-10-18 13:55:30 +00:00
Rémi Gaillard
8a682081de // typo 2013-10-18 12:17:51 +02:00
Jerome Nadaud
088d23f8f9 // Add edit button to customer groups view list 2013-10-17 18:27:00 +02:00
Jerome Nadaud
08525e5af4 // Fix missing commits !!!! 2013-10-17 15:59:46 +02:00
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
gRoussac
9c861642a5 [-] BO : AdminImport, wrong default separators 2013-10-15 10:09:16 +02:00
Gregory Roussac
dec9ef40a8 Merge pull request #841 from indesign47/patch-10 
[+] BO : AdminImport add entity Alias
 2013-10-15 01:03:33 -07:00
Gregory Roussac
2a28e47650 Merge pull request #799 from Lupul/development 
[-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency
 2013-10-14 08:37:28 -07: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
gRoussac
50002ec714 [-] FO : Fix #PSCFV-10690 again, change just on directories 2013-10-14 14:23:26 +02:00
gRoussac
c6e3e28894 [-] FO : Fix bug #PSCFV-10690 could not index a category beacause of robot.txt 2013-10-14 14:20:11 +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
gRoussac
2a54296b96 [-] BO : Fix bug #PSCFV-10692, AdminImport bad utf8 cars for subst 2013-10-14 12:11:47 +02:00
djfm
5e407db21e [*] LO : Fixed a few bugs with currency formats in Back-Office orders 2013-10-14 09:30:45 +00:00
Rémi Gaillard
3bc02bbe10 // fields are already correctly formated when they are in a object coming from the database 2013-10-14 10:56:38 +02:00
indesign47
85c6e799c3 [+] BO : AdminImport add entity Alias 2013-10-12 11:33:36 +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