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

176 Commits

Author SHA1 Message Date
Damien Metzger 0ca5a24e84 // Added field (bootstrap) size in helper form 2013-10-25 10:16:39 +02:00
Damien Metzger df639337af // Code cleaning and small fixes 2013-10-24 17:04:55 +02:00
Jerome Nadaud 6275e7bcad // Remove translations on icon class 2013-10-21 09:57:13 +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 d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Jerome Nadaud f2849bdb70 // Remove unnecessary function 2013-10-01 17:56:17 +02:00
Jerome Nadaud 68831ffbe9 // Fix attribute group view list 2013-10-01 17:55:20 +02:00
Krystian Podemski 2b55944874 [-] BO: translation mismatch 
Here is a form to edit the values ​​in the group, we do not need here "attribute type".
 2013-10-01 08:38:04 +02:00
Jerome Nadaud f44ecb9fc8 // Products section list adjustment 2013-09-20 16:19:50 +02:00
Jerome Nadaud cd627113b6 // Some fix 2013-09-19 12:13:24 +02:00
Jerome Nadaud c23f01cdc8 // Attributes Groups view 2013-09-19 10:48:16 +02:00
Jerome Nadaud 083eba3431 // Small title fix 2013-08-27 18:25:06 +02:00
Jerome Nadaud 4f022c48f8 [+] BO : Products page header toolbar 2013-08-27 18:23:38 +02:00
Kevin Granger 3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Jerome Nadaud 13c5450ca1 [-] BO : FixBug sort bug on values count column 2013-08-19 09:50:01 +02:00
Jerome Nadaud 95f775daa1 [+] BO : Catalog Bulk actions 2013-08-07 10:52:23 +02:00
gRoussac 055134719d [-] BO : Fix warning in AdminAttributesGroups after https://github.com/PrestaShop/PrestaShop/pull/392 2013-08-02 18:33:53 +02:00
Gregory Roussac 47b7e6aab5 Merge pull request #392 from ldecoker/patch-4 
[-] [BO] : The div for colorAttributeProperties is not closed
 2013-08-02 09:15:51 -07:00
jeromenadaud 3f2da1095f [-] BO: FixBug #PSCFV-10005 Filter on COUNT field 2013-08-01 18:06:14 +02:00
Kevin Granger 488cf0919a // BO attributes 2013-07-25 15:51:41 +02:00
Kevin Granger f7d1743c8a // fix tags in helper 2013-07-24 11:42:47 +02:00
Kevin Granger 9d16eb1d1b // BO fix + work on helpers + compass/codekit config 2013-07-22 16:43:16 +02:00
sLorenzini 8b33ac5aca // quantities product modified + line bootsrap added in order, categories and attributes group controllers 2013-07-10 12:21:22 +02:00
Damien Metzger 80b5855006 [-] BO : fixed potential warning with texture list #PSCFV-9050 2013-05-06 09:27:03 +02:00
ldecoker 34644ee6eb Update AdminAttributesGroupsController.php 2013-04-16 19:17:51 +03:00
fram 77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard 9709339084 // Fix SQL error 2013-02-11 18:45:00 +01:00
Rémi Gaillard 5e5cbb0d65 // Fix SQL error 2013-02-11 18:45:00 +01:00
djfm 714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm 385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
Francois Gaillard 8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
François Gaillard 064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre 6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre 779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre 398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre 046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
dMetzger eee48eb064 [-] BO : attribute values can appear beyond 50 values #PSCFV-2801 #PSCFV-4353 2012-09-25 09:54:35 +00:00
dMetzger 018aa54f7a [-] BO : attribute values can appear beyond 50 values #PSCFV-2801 #PSCFV-4353 2012-09-25 09:54:35 +00:00
dMetzger 841db7a805 // Clean AdminController methods did not return the appropriate value #PSCFV-3645 2012-08-17 07:03:54 +00:00
dMetzger 526a99f8c5 // Clean AdminController methods did not return the appropriate value #PSCFV-3645 2012-08-17 07:03:54 +00:00
vAugagneur 29ec4de975 [-] BO : fixed bug #PSCFV-3466 2012-08-03 14:09:06 +00:00
vAugagneur 2ad34b2c88 [-] BO : fixed bug #PSCFV-3466 2012-08-03 14:09:06 +00:00
rMalie fa71bf8924 // Fix total of attributes values in admin attribute page in multishop context 2012-05-22 14:51:36 +00:00
rMalie a0685ec521 // Fix total of attributes values in admin attribute page in multishop context 2012-05-22 14:51:36 +00:00
mDeflotte a4368658f6 [-] BO : #PSCFV-2473 - Fix bug with attribute value and shop 2012-05-21 15:32:56 +00:00
mDeflotte 21be2b2b1f [-] BO : #PSCFV-2473 - Fix bug with attribute value and shop 2012-05-21 15:32:56 +00:00
rMalie 97a37ff566 // Fix attribute values creation in multishop #PSCFV-2313 2012-05-14 10:22:51 +00:00