dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph
20949 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger eed6b65914 // Added Addons block in the dashboard 2013-10-15 14:18:50 +02:00
Damien Metzger 7759bfaa66 // Typo 2013-10-15 14:00:37 +02:00
Damien Metzger 7b307094b6 // Added comparison to the dashboard 2013-10-15 13:52:12 +02:00
Kevin Granger d19b0ed8e0 // icon for error notice 2013-10-15 12:31:17 +02:00
Kevin Granger d23714e9e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-15 12:11:15 +02:00
Kevin Granger d1bc5eb6e0 // calendar WIP 2013-10-15 12:10:05 +02:00
Damien Metzger 55fad19954 // Updated dashactivity 2013-10-15 11:18:30 +02:00
Rémi Gaillard 837ca34e7e [-] Core: Product::getPriceStatic called with 1 quantity return the specific price for 1 qty if called with id_cart = 0 2013-10-15 10:30:48 +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
Vincent Augagneur bd95d03e37 //blockwishlist now use boostrap design 2013-10-15 09:30:26 +02:00
djfm b4e18954f9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-15 07:22:03 +00:00
Francois Gaillard fd2dc4ff64 [-] Classes : Modules listing and case insensitive 2013-10-15 09:14:49 +02:00
indesign47 f25a418785 Update Alias.php 2013-10-14 19:20:38 +02:00
Rémi Gaillard 6f4b85430c // Fix listings and sort 2013-10-14 18:52:48 +02:00
Jerome Nadaud 7d85b21e92 // Pagination fix 2013-10-14 18:22:55 +02:00
Kevin Granger 2bc927c810 // login css 2013-10-14 18:08:33 +02: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 7e9cdbb163 // Pagination fix 2013-10-14 17:30:56 +02:00
Jerome Nadaud 07073afa1f // Fix CMS filter, reset and sort 2013-10-14 17:28:21 +02:00
Gregory Roussac f3755e2d0a Merge pull request #843 from ldecoker/patch-10 
[-] BO : AdminMeta - make sure module and controller name are in lowercase
 2013-10-14 07:46:56 -07:00
Gregory Roussac bce6e8f09f Merge pull request #837 from axometeam/patch-21 
[-] BO : bad query when filtering on status + sorting by quantity in the AdminProducts getList
 2013-10-14 07:45:52 -07:00
Kevin Granger 3eeac7f2bb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-14 16:35:01 +02:00
Kevin Granger 3f22a6b6c9 // login flip 2013-10-14 16:34:02 +02:00
gRoussac cc8ec4fd45 [-] CORE : Fix bug #PSCFV-10687 bad conversion for accentuated Y and W, thanks @mike15 2013-10-14 16:03:50 +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
Damien Metzger 8f10e42b60 // Small fixes 2013-10-14 15:49:57 +02:00
gRoussac 80f6f4e223 [-] FO : Fix bug #PSCFV-10688, bad priceDisplay in order-carrier 2013-10-14 15:34:47 +02:00
Vincent Augagneur 4da04275fe //small fix related to 1316bd7e1f 2013-10-14 15:07:50 +02:00
Jerome Nadaud f4118c4f9d // Fix some table header column title 2013-10-14 15:06:09 +02:00
Vincent Augagneur b9c6b0e8af //dateofdelivery now use bootstrap design 2013-10-14 14:55:56 +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 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
gRoussac f8edca8ac8 [-] IN : Fix bug #PSCFV-10539 duplicate "address" url rewrite in meta.xml for Russian 2013-10-14 13:59:19 +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
gRoussac 1adfa1584c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-14 11:37:51 +02:00
gRoussac 1358c696cd [-] BO : Fix #PSCFV-10678 warning in chrome 2013-10-14 11:37:15 +02:00
Jerome Nadaud 833091674c // Adding translations and PHP date format for datepicker 2013-10-14 11:34:04 +02:00
djfm 5e407db21e [*] LO : Fixed a few bugs with currency formats in Back-Office orders 2013-10-14 09:30:45 +00:00
Jerome Nadaud 3282bd19e4 // Small fix 2013-10-14 10:59:20 +02: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
gRoussac af9182dad5 [-] CORE , follow up https://github.com/kiropowered/PrestaShop/commit/b87e934a66a15d4f68e573f5afa9494505a60e28 and https://github.com/kiropowered/PrestaShop/commit/a10dcab6e74d138a2f3a3f558ec7d66b1e9d9e10 2013-10-14 10:51:17 +02:00
Gregory Roussac 3539eb3697 Merge pull request #842 from kiropowered/patch-1 
[-] CORE : StockMvt Fix bug if product have attribute
 2013-10-14 01:30:30 -07:00
Kevin Granger 59435fa2ee // login flip WIP 2013-10-14 09:57:02 +02:00
ldecoker a377ecd571 Update Meta.php 
Use strtolower from Tools class.
 2013-10-14 09:53:50 +02:00
ldecoker 8d7e96176c SEO - make sure module and controller name are in lowercase 
For module controller, make sure that the name of the controller and the module are saved in lowercase. Otherwise the route will not be found in getModuleLink.
 2013-10-14 09:38:04 +02:00