aFolletete
|
448fcb90d3
|
// clean debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13952 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-03-07 20:14:19 +00:00 |
|
vChabot
|
f31711fcab
|
[-] MO : BugFix : #PSFV-623 : order by category is now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13929 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-03-07 14:47:01 +00:00 |
|
vChabot
|
7107ea92b0
|
[-] MO : BugFix : max level-depth is now set to 4 (instead of 3 before, as the new root category has come)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13842 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-03-05 14:25:08 +00:00 |
|
vChabot
|
3afaea3283
|
// blockcategories sql improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13692 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-28 14:30:33 +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
|
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
|
2d6fd402c9
|
// French translations (by Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13342 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-15 13:22:27 +00:00 |
|
rMalie
|
7ebff4d7ae
|
// Modules langs files moved to modules/*/translations/ folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12900 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-01 14:42:15 +00:00 |
|
vChabot
|
21bce7a4e4
|
[-] MO : BugFix : PSTEST-185 : categories and customer group permissions fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12884 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-02-01 10:00:28 +00:00 |
|
vChabot
|
ccd7bad05c
|
// categories multishop improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12866 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-31 15:31:32 +00:00 |
|
rMalie
|
9c823e3cdd
|
// Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12719 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-26 14:44:24 +00:00 |
|
bMancone
|
631309d2d2
|
// #PSFV-124 Licenses update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12137 b9a71923-0436-4b27-9f14-aed3839534dd
|
2012-01-04 14:54:25 +00:00 |
|
rMalie
|
58433f1881
|
// Normalize + use $this->smarty instead of $this->context->smarty in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11944 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-30 14:59:57 +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 |
|
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 |
|
sThiebaut
|
085f64c85f
|
// maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11066 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-08 17:07:55 +00:00 |
|
mMarinetti
|
203b5ae6ad
|
// fix new theme / old php in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10878 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 16:41:22 +00:00 |
|
mMarinetti
|
9cc30dc3fe
|
[+] Project : default theme added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10862 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-12-02 15:24:40 +00:00 |
|
rMalie
|
6b61051a16
|
[*] MO: remove all static call of Module::display() method. Use it as a method on a Module instance.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10695 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-28 10:04:41 +00:00 |
|
vKham
|
c441358b40
|
// new icon for adminhome, adminmodules and header
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10318 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-21 09:21:26 +00:00 |
|
rGaillard
|
4cdc2c23db
|
// Fix smarty cache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10274 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-11-18 15:10:23 +00:00 |
|
rMalie
|
336fb68ef4
|
// Merge -> revision 9385
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9386 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-17 09:55:33 +00:00 |
|
rMalie
|
a7bc16dadd
|
// Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9384 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-17 09:46:08 +00:00 |
|
rMalie
|
45645f1f50
|
// Merge -> revision 9352
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-14 08:20:54 +00:00 |
|
rMalie
|
7db309c819
|
[+] Classes: Add Xcache support
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9242 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-11 14:28:21 +00:00 |
|
rMalie
|
577221ff08
|
// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-10 12:18:56 +00:00 |
|
rMalie
|
1b6d0d1be3
|
// Merge -> revision 8800
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-27 14:30:06 +00:00 |
|
rMalie
|
7481712923
|
// Fix display of breadcrumb (dont show categories disabled) + it's now impossible to browse categories outside of root category for shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8089 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-17 12:32:04 +00:00 |
|
rMalie
|
52d1d13891
|
// Merge -> revision 8014
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8021 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-08-11 12:00:05 +00:00 |
|
tDidierjean
|
5d090a25b3
|
// Context part 27
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7812 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-29 14:29:57 +00:00 |
|
rMalie
|
a875fecb20
|
// MERGE with 1.4 r7770
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-28 09:20:57 +00:00 |
|
tDidierjean
|
89213e18e5
|
// Context part 12
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7649 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-19 09:28:11 +00:00 |
|
rMalie
|
8a0a62ae03
|
// Context in modules + Shop::sql* methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7648 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-19 09:23:10 +00:00 |
|
tDidierjean
|
2c493137c3
|
// Context part 11
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7644 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-18 15:50:58 +00:00 |
|
rMalie
|
7b8f139103
|
// Context part 10
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7642 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-18 15:27:32 +00:00 |
|
rMalie
|
10dd3db8d4
|
// Refactoring of shop class with new context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7604 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-12 16:28:20 +00:00 |
|
tDidierjean
|
143022e488
|
// Context - first commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7586 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-11 14:32:05 +00:00 |
|
tDidierjean
|
8bf1b23239
|
// revert previous commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7573 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-08 16:12:27 +00:00 |
|
tDidierjean
|
f085f81d23
|
// cancel commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7572 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-08 15:43:24 +00:00 |
|
rGaillard
|
8a59d0dc41
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 10:54:11 +00:00 |
|
rGaillard
|
69f2f09dc5
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-06 10:10:43 +00:00 |
|
aFolletete
|
10445ad61d
|
// 1.5 branche creation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5881 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-04-12 18:24:40 +00:00 |
|