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

84 Commits

Author SHA1 Message Date
rMalie
91ac5e0685 // Fix minor bug on shop urls #PSTEST-911 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13897 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-06 15:17:05 +00:00
rGaillard
27d177bd9c // Fix carriers and product tax rules group import on shop creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13876 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-06 10:38:31 +00:00
rGaillard
2da79de4b7 // Fix stock on shop import 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13734 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-29 10:45:22 +00:00
bMancone
63281c1f61 // Fixed #PSTEST-804 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13699 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 15:35:37 +00:00
rMalie
07c674da0a // Add support of UTF-8 in multishop virtual uri 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13688 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 14:26:19 +00:00
vAugagneur
47c42de03f [-] BO : fixed Duplicate entry for key 'full_shop_url' when added new shop url 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13687 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 14:19:31 +00:00
rMalie
ac890a4fb1 // Fix auth issues for multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13647 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 17:03:58 +00:00
rMalie
4ee2698992 // Replace shop->addSqlAssociation() by static call 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13620 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 13:07: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
rMalie
69e2cf95d6 // Restore shop context in shop list and can filter shop pages per group shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13579 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 08:58:21 +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
rMalie
c8e9f1f029 // Change RIGHT to LEFT join in shop association 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13543 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 08:34:46 +00:00
fGaillard
f4e9c87cc6 [-] BO : #PSFV-492 : BugFix CMS pages & categories 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13540 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-22 16:57:51 +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
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
rMalie
3c79768737 [*] Classes : table prefix is no longer required in Db::getInstance()->delete() method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13396 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:54:52 +00:00
rMalie
b2ad614fd9 // Remove shop url when a shop is deleted #PSTEST-747 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13304 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 13:50:04 +00:00
rMalie
cecc3721d4 // Improve multishop ergonomy with a link to missing url on shop list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13303 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 13:20:17 +00:00
rGaillard
d16b4bcf1e // Debug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13135 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 14:55:47 +00:00
rGaillard
8a5f37be1b // Fix operator priority bug on class Shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13130 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 14:26:14 +00:00
mDeflotte
cca93f2c6d // Fix Bug with function ShopUrl::getMainShopDomainSSL 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12925 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-02 10:40:20 +00:00
vChabot
781e4ec0e5 // norm fix 
// rename Shop::has_dependency() in Shop::hasDependency()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12864 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:28:43 +00:00
vChabot
34d6f4b9cb // norm fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12859 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:15:01 +00:00
vChabot
8c45f904a0 [*] BO : you can set positions to categories using multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12856 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:11:27 +00:00
rMalie
2159489ad2 // Add more informations on deprecated data 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12716 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 14:10:31 +00:00
rMalie
a03464ada9 // Fix multishop when an URL is not found in shop_url 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12632 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-24 09:12:19 +00:00
rMalie
a4d97911b1 [*] Classes : Db::autoExecute() call are now replaced by Db::insert() or Db::update() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12624 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-23 17:41:02 +00:00
rMalie
6887541bdd [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-19 10:14:10 +00:00
rMalie
1739b144c0 // Fix #PSFV-279 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12291 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 17:52:58 +00:00
vChabot
a9b4c401bb // little fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12277 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 16:03:58 +00:00
vChabot
0de351e25d // little fix about multishop categories 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12275 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 16:01:03 +00:00
vChabot
87fd511314 [*] BO : Adding category management with multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12270 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-09 15:13:46 +00:00
rMalie
76bc20a9ab // Can access to administration without the good shop url #PSTEST-152 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12185 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-05 13:34:57 +00:00
mBertholino
184a0a8d68 //improvement of the code to verify the group name 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12140 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-04 15:05:18 +00:00
rMalie
494205d52e // Fix PrestaShopException typo 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12128 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-04 13:53:19 +00:00
mMarinetti
9ac97aac36 // better message for Theme edition + french translation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11982 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 10:56:44 +00:00
fGaillard
9ff33d65cf [-] Classes : #PSTEST-214 : BugFix : TopMenu for shops and groups 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11973 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 10:15:49 +00:00
mBertholino
28f7d8b664 [-] BO : #PSTEST-241 : We can delete group shops only if the group doesn't have any shops 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11964 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-02 09:31:07 +00:00
rGaillard
288e84cc64 // Improve backoffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11890 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-29 14:35:03 +00:00
rMalie
b335cb196f // Fix deprecated method Shop::getCurrentShop() #PSFV-279 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11878 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-29 08:49:09 +00:00
vChabot
97722fd0d4 // BugFix : Adding an error when you try to update a shop_url already existing in another shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11857 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 15:24:47 +00:00
mMarinetti
0051788824 // add theme add/remove function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11831 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-28 11:39:14 +00:00
vChabot
a089131884 // removing categories assocation with shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11509 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 16:18:24 +00:00
mMarinetti
b74c003c39 // class Shop optimization in sql request 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11443 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 22:39:11 +00:00
vChabot
6ef2e2cc50 [*] BO : New category management with multi shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11437 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 17:36:08 +00:00
bMancone
8af781e449 // Webservice: Stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11390 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 18:34:31 +00:00
rMalie
1d2f9e44c4 // Improve collections : where() method reworked (prototype changed) + validation of fields 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11383 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 16:57:28 +00:00
mMarinetti
1346ca3e46 // when upgrade process (INSTALL_VERSION defined), initialize return now an empty shop object (+ die2Exception) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11287 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 17:42:24 +00:00