dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,390 Commits 9 Branches 19 Tags
4da04275fe8cbb7e2e98bf0ceb2a6384d52c4c40
Commit Graph
19390 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Augagneur 4da04275fe //small fix related to 1316bd7e1f 2013-10-14 15:07:50 +02:00
Vincent Augagneur b9c6b0e8af //dateofdelivery now use bootstrap design 2013-10-14 14:55:56 +02:00
Kevin Granger 6d3a15ef5b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
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 14:18:06 +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
Kevin Granger 59435fa2ee // login flip WIP 2013-10-14 09:57:02 +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
gRoussac ee29f4365e [-] FO : Copuld not load datepicker in trackingfront stats.php 2013-10-12 17:54:26 +02:00
Gregory Roussac 418155cf2b Merge pull request #838 from pelTek/patch-1 
BO: added UPC and EAN search
 2013-10-11 11:52:22 -07:00
Chris 3f6139be42 BO: added UPC and EAN search 2013-10-11 21:02:01 +03:00
Jerome Nadaud e47f0a7c68 // Adding stats compare date to employee table 2013-10-11 18:34:20 +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
Gregory Roussac 0dbaa59985 Merge pull request #836 from mkdgs/patch-1 
[*] MO : blocktopmenu adding clear cache of AddAfter hook for Cms, Supplier, Manufaturer and Product
 2013-10-11 09:05:15 -07:00
Rémi Gaillard 06c62c1684 [-] WS: Fix #PSCFV-10672 order by ID for non multishop entities 2013-10-11 17:53:15 +02:00
Jerome Nadaud 0f9c81a683 [-] BO : FixBug #PSCFV-10671 - remove htmlentities on customer message 2013-10-11 17:29:44 +02:00
Kevin Granger cfa4d72eab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 17:22:06 +02:00
Kevin Granger 41f5d9f1f1 // fix datepicker 2013-10-11 17:21:45 +02:00
Jerome Nadaud 18690e4b9a // Adding update for customer message 2013-10-11 17:17:58 +02:00
gRoussac a07733fcec [-] BO : Could not insert referrer id_connections_source can not be null 2013-10-11 16:52:53 +02:00
Mickael Desgranges 1786f8e907 Update blocktopmenu.php 
Fix: block top menu is not updated when content is added in CMS

adding support of AddAfter hook for Cms, Supplier, Manufaturer and Product
 2013-10-11 16:42:21 +02:00
Fabio Chelly 9fc9df6ba4 Merge remote-tracking branch 'origin/development' into development 2013-10-11 16:38:09 +02:00
Fabio Chelly 9e3b82e8ed [*] BO Module productcomments: JS variables are correctly escaped. Padding in error message has also been pushed to theme tpl 2013-10-11 16:37:26 +02:00
Damien Metzger eff292731f // Fixed typo 2013-10-11 16:35:49 +02:00
gRoussac 8cfe9a2065 [-] Bo : Could not update mailalert 2.5 with id_lang missing 2013-10-11 16:19:54 +02:00
Damien Metzger d2ecdfb93d // fix dashboard modules upgrade 2013-10-11 16:18:53 +02:00
Damien Metzger 0e91352520 // Dashboard update 2013-10-11 16:18:52 +02:00
Jerome Nadaud 0f28393c8f // Fix data range picker 2013-10-11 16:16:03 +02:00
Jerome Nadaud bedcacf0b4 // Starting development of data range picker 2013-10-11 16:12:40 +02:00
gRoussac 45e9040606 [-] Bo : Could not update mailarler 2.5 with id_mlang 2013-10-11 15:51:02 +02:00
Damien Metzger 1849995291 // Code cleaning 2013-10-11 15:35:45 +02:00
Kevin Granger dcf7e48f6e // datepicker stylesheet 2013-10-11 15:04:14 +02:00
Vincent Augagneur 5bcacf9b48 //statsdata now use boostrap design 2013-10-11 14:38:18 +02:00
Vincent Augagneur 38a7e90eff //referralprogram now use boostrap design 2013-10-11 14:29:56 +02:00
Rémi Gaillard 6b52ada195 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 14:11:28 +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 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
Kevin Granger cd5a308ad7 // login : tabindex + ux 2013-10-11 12:28:01 +02:00
Damien Metzger c68101653d // Fixed tabs 2013-10-11 12:10:24 +02:00
Kevin Granger b61528057a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/js/admin-theme.js
 2013-10-11 11:28:44 +02:00
Kevin Granger 40d4da04bb // cleaned admin-theme.js - added date range picker 2013-10-11 11:18:27 +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
Rémi Gaillard bb81e892a0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-11 10:58:23 +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