Commit Graph

65 Commits

Author SHA1 Message Date
fGaillard
7bf4922120 // Fix JS log
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14043 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-12 14:52:09 +00:00
fSerny
b542939c9f [-] BO : Bug fix #PSTEST-1014 #PSTEST-966 - Wrong call of smarty translation function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14041 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-12 14:50:14 +00:00
mDeflotte
ec1671e226 [-] BO : #PSFV-646 - Fix problem with button save & preview
// Replace some "else if" by "elseif"

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14030 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-12 10:32:07 +00:00
tDidierjean
60a6855ec8 // Fix some BO access check on actions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13965 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-08 13:30:09 +00:00
tDidierjean
aa50294a44 [-] BO : fix bug #PSFV-529 - AdminGeolocalisation : isCleanHtml control on checkbox
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13961 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-08 10:39:15 +00:00
rMalie
088a86df3c // Fix minor bug on shop urls #PSTEST-911
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13906 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-06 16:40:07 +00:00
rMalie
c5d04bb467 // Fix minor bug on shop urls #PSTEST-911
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13905 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-06 16:39:02 +00:00
nPellicari
1181d38cf4 // PrestaShop normalisation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13869 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-06 09:11:11 +00:00
nPellicari
7f0df4f1c7 // PrestaShop normalisation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13868 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-06 09:09:47 +00:00
nPellicari
b3f030f81e [*] FO : Add mobile detection and mobile theme dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13866 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-06 09:00:25 +00:00
rMalie
0c40a13560 // Remove $noTabLink in AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13830 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-05 10:00:17 +00:00
rMalie
0f865fd2d6 [*] BO : reorganization of admin tabs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13820 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-02 14:44:07 +00:00
mDeflotte
fac7db1502 [-] BO : #PSFV-600 - Fix bug with Controller::addJqueryUI
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13805 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-01 17:05:49 +00:00
tDidierjean
eae3bc2d84 // rename $toolbar_fix to $toolbar_scroll part1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13711 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 17:38:42 +00:00
tDidierjean
3d402f6b4f // fix AdminMeta options form and toolbar
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13709 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 17:28:35 +00:00
rMalie
e5b646b0f8 // Fix multishop context in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13648 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 17:14:33 +00:00
mDeflotte
9b0b2c4aa3 [-] FO : #PSFV-553 - Fix bugs with pager and ordering with some controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13642 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 16:34:32 +00:00
dMetzger
f6b91055d5 [+] BO : added a new option for the products : do they appear in the catalog, in the search, both or neither
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13638 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 15:55:40 +00:00
rMalie
e422445e65 // Display of payment modules per shop #PSTEST-833
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13625 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 15:18:51 +00:00
rMalie
c2cef61a5a // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 12:15:30 +00:00
rMalie
1c2f174bdb // Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13615 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 09:49:19 +00:00
mDeflotte
7e5c73c277 [-] FO : #PSFV-569 - Fix bug with instant search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13593 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 09:52:37 +00:00
rGaillard
2408b4ac5f [+] Core : products and carriers tax rules are associated to shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13586 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 09:26:18 +00:00
rMalie
2454cd7863 // Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 16:33:10 +00:00
rMalie
b24dcffc9c // Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 15:39:44 +00:00
dMetzger
5339d45d07 [+] BO : BO width can now be fixed or flexible (you can set it up in your employee account)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13560 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 14:42:23 +00:00
vSchoener
2a760a56b4 [+] CORE : Module properly upgraded with message even if no file upgrade file exist, add 'upgrade' button
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13551 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 11:02:35 +00:00
tDidierjean
4944752edd [-] BO : fix bug #PSFV-534 - Button toolbar disappear after save if errors
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13549 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 10:34:56 +00:00
bMancone
4233289528 // Fixed AdminController : existence of default_value was not accurate
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13536 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 16:01:18 +00:00
mDeflotte
a53e9c5e60 // Removing attribute 'preselect_country' and use 'default_value' instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13531 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 14:27:32 +00:00
rMalie
4e6628cbfd // Remove $display_multishop_toolbar and add instead $multishop_context to manage shop context per admin controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13530 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 14:25:28 +00:00
mDeflotte
ee8111c803 [-] FO : #PSCFI-4733 - Pagination creates pages that should not exist (and duplicate content)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13521 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 09:33:03 +00:00
rMalie
92bcf0c8a3 // Fix theme retrocompatibility (contact-form + displayHeader)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13509 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-21 15:29:05 +00:00
rMalie
798c5e8644 // Report $content_dir fix on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13501 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-21 14:08:01 +00:00
mDeflotte
49450cdf05 [-] Project : #PSCFI-4737 - Add no-cache to header when there are 301 to avoid caching
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13487 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-21 09:16:27 +00:00
tDidierjean
52d9b4c277 // fix redirection on edit page if errors are present
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13463 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-20 14:14:39 +00:00
rGaillard
49f8d51561 // Improve and debug backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13457 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-20 13:25:55 +00:00
dMetzger
2c7720ab08 // You shall not DIE!
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13448 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-20 09:14:01 +00:00
mDeflotte
c9bcaec32b [-] BO : BugFix : #PSTEST-807 : stay on the form when an error occured
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13423 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 12:00:12 +00:00
rMalie
5cce9a9d22 // Fix "you edit field for" multishop #PSTEST-796
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13422 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 10:32:45 +00:00
rMalie
748f3647ee // Fix group shop filter association in getList() and improve assoshop with Group: text
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13421 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 10:06:00 +00:00
rMalie
b0d24b3ae4 // Fix shop association in admin on attributes page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13412 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-16 17:11:49 +00:00
rMalie
97c7e11df0 // Improve multishop ergonomy (new toolbar)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13333 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-15 10:04:05 +00:00
tDidierjean
8897f81335 // Fix bulk deletion of attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13327 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 17:34:08 +00:00
tDidierjean
2e0d20d9f1 [-] BO : fix bug #PSFV-421 - bug with redirection after login
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13317 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 16:29:21 +00:00
aFolletete
3f5d7edf0b // fixed bug #PSTEST-552
// Clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13312 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 15:08:40 +00:00
tDidierjean
3311fd7d25 // AdminController refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13300 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-14 10:47:40 +00:00
rMalie
e15452ce61 // Fix quick link access for multishop #PSFV-478 #PSTEST-687
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13272 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 17:22:12 +00:00
rMalie
7682d57803 // Refacto of lang functions (all code moved in Translate class)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13262 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 15:20:25 +00:00
rMalie
a5d5173438 // Fix $useSSL retro-compatibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13239 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-13 09:19:10 +00:00