Commit Graph

36 Commits

Author SHA1 Message Date
rGaillard e00d70b932 // Change urls of prestashop api 2011-11-28 10:22:58 +00:00
rMalie 82c9dead2a // Merge -> 10309 2011-11-21 11:05:10 +00:00
vKham 5eedee4129 // new icon for adminhome, adminmodules and header 2011-11-21 09:21:26 +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 d79fcf00fb // Merge -> revision 9352 2011-10-14 08:20:54 +00:00
rMalie a07c14fafd // Merge -> revision 9288 2011-10-12 16:04:28 +00:00
rMalie eeb5b16112 // Merge -> revision 9221 2011-10-11 12:45:12 +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
rMalie c4780ec67d // Merge -> revision 8984 2011-10-03 15:48:07 +00:00
rMalie 468306a3ca // Merge -> revision 8952 2011-10-03 09:14:01 +00:00
rMalie 0c40fb9a06 // Merge -> 8910 2011-09-30 08:17:25 +00:00
rMalie fe96631b7b // Merge -> revision 8851 2011-09-28 16:03:30 +00:00
rMalie 91083e190c // Merge -> revision 8800 2011-09-27 14:30:06 +00:00
rMalie 2180359342 // Merge -> revision 8720 2011-09-22 15:45:10 +00:00
rMalie 38a61b379a [+] Project: it's possible to create new genders, "Miss" gender is now added 2011-09-14 15:15:51 +00:00
vChabot 95d5d50af4 // changing name "available_date_combi" to "available_date" and some features 2011-09-13 14:52:42 +00:00
rMalie a1bdb7b35e // Merge -> revision 8507 2011-09-12 16:17:37 +00:00
rMalie 714c65de56 // Merg// Merge -> revision 8395 2011-09-07 16:23:13 +00:00
rMalie 3d89058084 // Merge -> revision 8342 2011-09-05 14:56:02 +00:00
tDidierjean a7ad178f28 //// Merge -> revision 8290 2011-09-01 09:53:43 +00:00
rMalie 74843c4060 2011-08-24 15:57:10 +00:00
rMalie ec6489a29b // Fix all category_lang sql restrictions with multishop 2011-08-19 14:21:45 +00:00
rMalie fb55cfcd11 // Fix all product_lang sql restrictions with multishop 2011-08-19 14:01:23 +00:00
tDidierjean c28051ae93 // Context part 32 2011-08-17 13:40:05 +00:00
rMalie cba5631db0 // Merge -> revision 8076 2011-08-17 08:15:38 +00:00
rMalie d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00
rMalie 792ce71cd4 // Merge -> revision 7979 2011-08-10 08:36:17 +00:00
rMalie c61b127f66 // Merge -> revision 7941 2011-08-08 16:01:47 +00:00
rMalie 90fcde2539 // Merge -> revision 7906 2011-08-05 13:26:44 +00:00
rMalie 83734c7bb9 // Merge -> revision 7875 2011-08-03 16:16:49 +00:00
rMalie e2c8d89e41 // Merge with revision 7841 2011-08-02 11:43:58 +00:00
tDidierjean 9213581a03 // Context part 27 2011-07-29 14:29:57 +00:00
rMalie c17e7c236d // MERGE with 1.4 r7770 2011-07-28 09:20:57 +00:00
rMalie 5f6f018885 // REVERT MERGE 2011-07-27 13:35:06 +00:00
rMalie 233c0076b7 // MERGE with trunk revision 7754 2011-07-27 12:48:42 +00:00
rGaillard 8fc7f11014 2011-07-06 10:54:11 +00:00