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

71 Commits

Author SHA1 Message Date
Vincent Augagneur
f2a760c245 //small fix 2013-10-01 12:31:07 +02:00
Kevin Granger
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	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/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Jerome Nadaud
479662aa10 // Fix missing table id for shop asso in helper 2013-09-24 16:19:38 +02:00
Jerome Nadaud
f312a055b1 // Multistore bootstrap design 2013-09-20 15:04:43 +02:00
gRoussac
27f14b9a31 [-] BO : Fix proces and save buttons for Modules and AdminControllers 2013-09-18 17:23:08 +02:00
gRoussac
93aae26269 [-] Bo : Modules 'save' button not active 2013-09-18 15:41:30 +02:00
Jerome Nadaud
7e8d119213 // Textarea autosize 2013-09-16 14:25:49 +02:00
Jerome Nadaud
74237ff694 // Some fix 2013-09-13 17:11:12 +02:00
Jerome Nadaud
29db737c10 // Add autosize to textarea 2013-09-12 16:52:55 +02:00
Jerome Nadaud
c105486fa3 // Tree bugs 2013-09-12 15:22:47 +02:00
Jerome Nadaud
873eee8ad0 // Tree list bug 2013-09-12 14:55:45 +02:00
Jerome Nadaud
e63ce0a86d // Tree 2013-09-12 14:47:47 +02:00
Jerome Nadaud
e9dbadcabf // Tree 2013-09-11 20:41:14 +02:00
Jerome Nadaud
49c9afec40 // Categories tree 2013-09-11 15:08:24 +02:00
Jerome Nadaud
00e1b7c0eb [-] BO : FixBug language in label for 2013-08-20 09:36:00 +02:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
6588f9514c // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
rGaillard
3672b02c66 // Fix some bug on advanced stock management 2012-07-11 15:46:39 +00:00
rGaillard
78bfe42a87 // Fix some bug on advanced stock management 2012-07-11 15:46:39 +00:00
rMalie
7a6b54268e // Fix lot of multishop bugs (updateAssoShop reworked, remove multishop property for country / zone / currency / carrier, getList()) 2012-05-18 14:54:37 +00:00
rMalie
bc48e8e0c1 // Fix lot of multishop bugs (updateAssoShop reworked, remove multishop property for country / zone / currency / carrier, getList()) 2012-05-18 14:54:37 +00:00
rMalie
f5618698de // Rename treeview to treeview-categories 2012-05-03 08:10:10 +00:00
rMalie
39be1925b1 // Rename treeview to treeview-categories 2012-05-03 08:10:10 +00:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
rMalie
009e190263 // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
lLefevre
2832118e23 [-] BO : #PSFV-855 : Fix bug in BlockCMS AND set submit_action to NULL 2012-04-13 14:15:45 +00:00
lLefevre
ca5684e517 [-] BO : #PSFV-855 : Fix bug in BlockCMS AND set submit_action to NULL 2012-04-13 14:15:45 +00:00
lLefevre
bc310b252d [-] Bo : Fixed #PSTEST-1055 & #PSFV-768 : update call identifier 2012-04-06 14:07:08 +00:00
lLefevre
0542781b1e [-] Bo : Fixed #PSTEST-1055 & #PSFV-768 : update call identifier 2012-04-06 14:07:08 +00:00
tDidierjean
c305cbc118 // rename $toolbar_fix to $toolbar_scroll part1 2012-02-28 17:38:42 +00:00
tDidierjean
d29e810d8d // rename $toolbar_fix to $toolbar_scroll part1 2012-02-28 17:38:42 +00:00
rMalie
8f21aaf4d5 // Fix shop association in helper form for group shops #PSTEST-865 2012-02-28 10:10:07 +00:00
rMalie
8fea45b782 // Fix shop association in helper form for group shops #PSTEST-865 2012-02-28 10:10:07 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
91aae3e665 // Improve multishop API 2012-02-23 15:39:44 +00:00
rMalie
bfd3e8deb1 // Improve multishop API 2012-02-23 15:39:44 +00:00
mDeflotte
07ebf2e2e5 // Removing attribute 'preselect_country' and use 'default_value' instead 2012-02-22 14:27:32 +00:00
mDeflotte
47aed25464 // Removing attribute 'preselect_country' and use 'default_value' instead 2012-02-22 14:27:32 +00:00
mDeflotte
d4436719d1 // [-] BO : #PSTEST-769 - Use context instead of the Configuration::get() 2012-02-16 14:23:07 +00:00
mDeflotte
dc1b554aec // [-] BO : #PSTEST-769 - Use context instead of the Configuration::get() 2012-02-16 14:23:07 +00:00
mDeflotte
0088f5d245 [-] BO : #PSTEST-769 - The default country must be pre-selected on address list 2012-02-16 14:13:04 +00:00
mDeflotte
a52f8c38ee [-] BO : #PSTEST-769 - The default country must be pre-selected on address list 2012-02-16 14:13:04 +00:00
rMalie
c02982a8f8 // Fix default shop associations in helper shop #PSTEST-770 2012-02-16 14:10:30 +00:00