gRoussac
c9d2cf8ed2
Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate
...
Conflicts:
admin-dev/header.inc.php
2013-07-17 16:31:49 +02:00
PrestaEdit
6ae0dbb4ca
[*] BO: use Translate::getAdminTranslation instead of translate()
2013-06-01 00:21:28 +02:00
François Gaillard
a236224da0
[-] AdminTab header updated
2013-02-20 15:24:58 +01:00
François Gaillard
064ba453e6
// 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
lLefevre
779cf350af
// 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
vAugagneur
73d647361a
//small fix for retro compat on adminTab
2012-10-10 08:36:51 +00:00
lLefevre
213b7fa96e
[*] TR : #PSCFV-3999 : change string "multishop" by "multistore" in BO
2012-09-11 12:36:15 +00:00
rGaillard
5bd8345d81
// Fix product stocks on multishop
2012-05-18 14:32:29 +00:00
fBrignoli
d5c0d7a80d
[*] Project : Jquery 1.7.2
2012-04-20 15:45:43 +00:00
tDidierjean
ecb9a3b5da
// Fix multishop display for AdminTab retrocompatibility
2012-03-15 15:00:30 +00:00
rMalie
62dda6b105
// Refacto generateShopList()
2012-03-15 09:33:23 +00:00
tDidierjean
285f854df3
// remove $noTabLink from compatibility tabs
2012-03-05 13:25:30 +00:00
rMalie
14e6929565
// Welcome 2012²
2012-02-23 16:33:10 +00:00
rMalie
91aae3e665
// Improve multishop API
2012-02-23 15:39:44 +00:00
mMarinetti
1c288bf01d
// Welcome 2012
2012-02-22 09:28:22 +00:00
tDidierjean
5ef27d9508
// Fix AdminTab display
2012-01-12 09:18:33 +00:00
rMalie
a776684f13
// Rename correctly all hooks
2012-01-02 15:52:40 +00:00
jBreux
072738a68c
[+] Project : Possibility to enable or disable tabs
2011-12-22 11:02:55 +00:00
lBrieu
4c90e83f15
[*] Update messages notifications to display customer threads
2011-12-19 15:37:09 +00:00
lLefevre
adda69b5f6
// fix remove button delete for AdminCountriesController
2011-11-29 15:18:10 +00:00
tDidierjean
a07bbfa36f
// AdminTab compatibility: Dispatcher for BO now search tabs in database, not on the disk. AdminTabs now uses the new BO theme.
2011-11-17 18:15:07 +00:00
fSerny
d5e265f75e
[*] PROJECT : New Module API (part 1)
2011-11-02 10:49:01 +00:00
hAitmansour
5b7a6746e0
[*] FO BO MO : rename function isMultiShopActivated by isFeatureActive
2011-10-19 09:36:12 +00:00
mMarinetti
9d319d6c83
// no more media in header.inc
2011-10-06 15:32:11 +00:00
mMarinetti
4012b88f6b
[-] Installer : Fix country_to_timezone in last step
...
[+] BO : now AdminProducts and AdminCategories are separated from AdminCatalog
[+] FO : new method Category::getAllChildren() (the return value is an array, but can evolve to a collection
// Uses of Media:: in header.inc.php
2011-10-06 13:02:24 +00:00
rMalie
5829f12a66
// Improve flexibility of dispatcher + fix controllers access in BO (only admin controllers are loaded by the dispatcher)
2011-09-26 09:57:00 +00:00
mMarinetti
782cca3e78
// fix displaying subtab with old system
2011-09-23 16:25:15 +00:00
mMarinetti
6191e868f1
[+] BO : New AdminController system, including smarty backoffice, thanks to Raphael and Thomas
2011-09-23 15:01:49 +00:00
tDidierjean
299f9ab066
// Creation of AdminController : Admin tabs will now extend this class (see AdminTools.php for example)
2011-09-20 16:04:35 +00:00
lBrieu
e8a72850e7
[*] BO : Shows more details for each notification
2011-09-13 09:05:30 +00:00
lBrieu
fbd186dffa
[*] BO : Shows more details for each notification
2011-09-12 16:46:07 +00:00
lBrieu
beea76b0bd
2011-09-09 13:14:47 +00:00
rMalie
4f139eae54
// Fix getPush() for notifications
2011-09-05 12:09:49 +00:00
lBrieu
7b48c64d02
2011-08-30 14:42:27 +00:00
lBrieu
48beb6df1b
2011-08-30 13:40:31 +00:00
lBrieu
b48b8463b2
[+] Add some JS and integrates notifications in BO
2011-08-30 12:06:17 +00:00
rMalie
e64eb39f48
// Improve multishop ergonomy (you edit this field for) on languages fields
2011-08-22 09:33:16 +00:00
rMalie
dc0acaf026
// Merge -> revision 8123
2011-08-19 14:27:41 +00:00
tDidierjean
3d733ae6e2
// Context part 31
2011-08-17 10:07:12 +00:00
rMalie
72972da94c
// Fix shop selection in BO
2011-08-17 08:59:04 +00:00
rMalie
f99f6ddd6b
// Add a message when a shop is created to indicate that the user should create an URL for this shop + fix some bugs
2011-08-16 15:53:33 +00:00
rMalie
aa37be28db
// Merge -> revision 8059
2011-08-16 09:10:40 +00:00
rMalie
792ce71cd4
// Merge -> revision 7979
2011-08-10 08:36:17 +00:00
rMalie
e2c8d89e41
// Merge with revision 7841
2011-08-02 11:43:58 +00:00
rMalie
3c8c85b1cd
// Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script
2011-08-02 09:54:23 +00:00
rGaillard
8fc7f11014
2011-07-06 10:54:11 +00:00
rGaillard
d1a13007b9
2011-07-06 10:10:43 +00:00
aFolletete
05a58f53e6
// 1.5 branche creation
2011-04-12 18:24:40 +00:00
