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

41 Commits

Author SHA1 Message Date
Jerome Nadaud
f60fe74336 [+] BO : Tracking page header toolbar 2013-08-27 18:22:54 +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
jeromenadaud
b81c021144 [-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist 2013-08-05 16:11:48 +02:00
Kevin Granger
e4878ba393 // I'm not sure as I've never had a look at how that works before ;) 2013-07-31 21:17:03 +02:00
Kevin Granger
9d16eb1d1b // BO fix + work on helpers + compass/codekit config 2013-07-22 16:43:16 +02:00
Damien Metzger
12e13e275f [-] BO : fixed ajax in permissions tab #PSCFV-7442 2013-06-14 11:20:38 +02:00
Damien Metzger
cd6f415dc1 [-] BO : fixed link in AdminTracking #PSCFV-7409 2013-06-13 18:38:00 +02:00
djfm
714a5e08cc //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
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
1415f86566 //fix for 1.5.2.0 2012-10-22 12:41:28 +00:00
lLefevre
6588f9514c // 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
rGaillard
aaee849da2 // small fix 2012-10-04 13:19:44 +00:00
rGaillard
bfb5f6058c // Fix #PSCFV-4512 2012-10-04 13:05:43 +00:00
vChabot
ba980731a2 [-] BO : BugFix : #PSCFV-3142 : Admin Tracking displaying categories from other shops 2012-08-02 15:49:55 +00:00
vAugagneur
1bf8c422eb [-] BO : fixed bug #PSCFV-3142 2012-07-26 14:18:01 +00:00
vChabot
23fe93e76a [-] BO : BugFix : #PSCFV-2133 : AdminTracking bug in multishop context (ambigus active field in SQL query) 2012-05-02 08:41:13 +00:00
tDidierjean
ad1d630fd6 // Rename fieldsDisplay to fields_list part3 (timeout) 2012-03-29 16:31:01 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
mDeflotte
1eddc6dce8 [-] BO : #PSFV-610 - AdminTracking lists don't take care of PS_STOCK_MANAGEMENT value 2012-03-02 15:57:12 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
vChabot
a2722e6587 [-] BO : BugFix : #PSFV-497 : Root category in AdminTracking removed 2012-02-14 08:42:47 +00:00
mDeflotte
d92db7153e // Reverse modification 2012-02-06 09:02:29 +00:00
mDeflotte
56234dd9d2 [-] BO : #PSTEST-627 - Fix bug with bad order by 2012-02-03 14:13:14 +00:00
aFolletete
5072195fbc // fixed little bug on AdminTracking 
// fixed undefined error
 2012-02-02 13:30:51 +00:00
vChabot
a566cb3c1f [-] BO : BugFix : PSTEST-608 Removing the possibility to edit or remove Root category in AdminTrackingController 2012-01-30 17:28:33 +00:00
vChabot
a87643acba // little fix 2012-01-11 16:25:46 +00:00
rMalie
5361b1f68d // Fix missing Core suffix for some classes / controllers 2011-12-05 16:49:05 +00:00
dSevere
98492b6a36 // Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix 2011-12-02 17:31:16 +00:00
tDidierjean
885701b27a // Rename AdminController methods initForm() initList() etc. to renderForm() renderList() 2011-11-30 11:06:38 +00:00
dSevere
78e540cd94 // AdminController and stock management : some debug and updates 2011-11-23 13:15:40 +00:00
lLefevre
b1a3a48db2 // delete link of list in AdminTrackingController 2011-11-21 17:21:31 +00:00
lLefevre
0c0a9e9f20 // fix bug in AdminTrackingController 2011-11-21 17:09:51 +00:00
mMarinetti
872d0c3468 // fix tracking 2011-11-21 15:46:07 +00:00
mMarinetti
f595782562 // added fixed toolbar, norms 2011-11-04 17:32:46 +00:00
mMarinetti
1927cbfaa3 // bugfix admin products, adminattributesgroups, admincategories 
// helper list and form improved
 2011-11-03 17:04:33 +00:00
rMalie
e6f45e54a6 // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction() 2011-10-17 09:46:08 +00:00
rMalie
9510337b1d // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names 2011-10-10 12:18:56 +00:00
mMarinetti
f1077ea9c0 // fix links in main menu, 
// + moved tab AdminTracking.php to AdminTrackingController.php
 2011-09-29 16:13:34 +00:00