Commit Graph
100 Commits
Author SHA1 Message Date
rMalie dd9257d008 // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9466 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 14:58:33 +00:00
rMalie 8b4f3d0cf6 [+] Classes: Db::autoExecute() can now use SQL functions as values (use array('type' => 'sql', 'value' => 'SQL_FCT()')
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9463 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 14:35:05 +00:00
rMalie 42564ca3d0 // Merge -> revision 9435
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9438 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 08:14:42 +00:00
rMalie 39f37e465f // Fix little bug on preactivation (property_exists)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9411 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 09:59:49 +00:00
rMalie 30835cb4c8 [*] Classes: Tools::property_exists() is deprecated, since PrestaShop now requires 5.1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9408 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-18 09:02:57 +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 5ef98d7b47 // Fix debug in smarty
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9381 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:35:38 +00:00
rMalie de6dc071fb // Fix ID language from context in preactivation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9363 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 12:59:03 +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 552e264c95 [+] Classes: add PDO support if extension is activated
[*] Classes: add engine check (innodb)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9317 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:00:08 +00:00
rMalie 543c42430c [*] Smarty: move tools/smarty/compile/ and tools/smarty/cache/ folders to cache/smarty/compile/ and cache/smarty/cache/ folders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9300 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 08:14:03 +00:00
rMalie 798de9aaea // Merge -> revision 9288
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9289 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-12 16:04:28 +00:00
rMalie 17aa43a4e5 // Norme ConfigurationTest
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9287 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-12 15:49:03 +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 c340b46f7d // Fix main flag for shop_url when a shop_url is updated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9233 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 13:32:18 +00:00
rMalie de69396a04 // Merge -> revision 9221
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9226 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 12:45:12 +00:00
rMalie ca010e3a20 [-] MO: fix blocktopmenu install
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9220 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 11:28:31 +00:00
rMalie 48d8dc379f [+] Classes: add support of APC cache
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9217 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 10:04:55 +00:00
rMalie 4d91a31031 // Add exceptions in db classes + normalize some files + split defines.inc file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9216 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 10:04:23 +00:00
rMalie ce914bd435 [*] Classes: refactoring of cache classes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9191 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 14:45:27 +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 de7107b58c // MCached renamed in CacheMemcache + CacheFS renamed in CacheFs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9136 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:49:15 +00:00
rMalie 581e212a66 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9134 b9a71923-0436-4b27-9f14-aed3839534dd 2011-10-07 12:40:41 +00:00
rMalie 64dca3508e // Move cache classes in classes/cache/
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9133 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:40:00 +00:00
rMalie 14542fea44 // Merge -> revision 9124
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9125 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:54:43 +00:00
rMalie 3d0e96b313 // context->controller now work for adminController too
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9090 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 09:55:28 +00:00
rMalie f407514c7e // Remove counties in db_settings_lite.sql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9075 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:51:29 +00:00
rMalie b4d436ca21 // Merge -> revision 9061
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:21:55 +00:00
rMalie 66db4c486d // Small fix on exceptions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9064 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 14:43:25 +00:00
rMalie 0e33114d4d // Improve exception display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9051 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 12:05:40 +00:00
rMalie 2a764cfd14 // Fix downloadable files in admin
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9031 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 16:10:05 +00:00
rMalie d2a0cf76ee // Normalize adminRequestController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9006 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 08:08:43 +00:00
rMalie ae5fc92bf7 // Merge -> revision 8984
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8988 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:48:07 +00:00
rMalie ef17d0b7da // Merge -> revision 8952
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8957 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:14:01 +00:00
rMalie 9ca40220be // Optimisation ObjectModel + hydrateCollection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8942 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 16:04:33 +00:00
rMalie 2068aaaf2a // Norm on controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8930 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 13:50:55 +00:00
rMalie 3e1c4e426f // _frontController now work again
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8921 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 09:51:35 +00:00
rMalie 3620f0837f // Merge -> 8910
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 08:17:25 +00:00
rMalie 227e13680b // Refacto of CategoryController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8898 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:31:32 +00:00
rMalie 8b59a8dd04 // Fix authentification gender
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8895 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:13:50 +00:00
rMalie 41138b45c0 // Fix addressesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8878 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 13:43:59 +00:00
rMalie 42c5603cc3 [+] Classes: Add ObjectModel::hydrateCollection() in order to transform arrays from sql queries return in list of objects
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8877 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 13:23:54 +00:00
rMalie 36088f9e6c // Refacto AttachementController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8857 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:19:50 +00:00
rMalie 2b96479279 // Refacto AddressesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8856 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:16:20 +00:00
rMalie be8d2136be // Merge -> revision 8851
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:03:30 +00:00
rMalie ccd0383e88 // Refacto of cartController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8853 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 15:40:28 +00:00
rMalie 7281de8839 // Add Link->getAdminLink()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8839 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 09:53:30 +00:00
rMalie a1a1c8340e // AddressController : refacto done
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8820 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 16:21:25 +00:00
rMalie a1854047e9 // Fix dispatcher with rewriting in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8816 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 15:52:59 +00:00
rMalie 8a4660a378 // Fix bugs on frontControllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8815 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 15:28:41 +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 98b1103e2e // Remove debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8803 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 13:27:11 +00:00
rMalie 6a1ea62d13 // Refacto of controllers PART 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8802 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 13:04:24 +00:00
rMalie 80e750c4c9 [+] Classes: Add PHP exceptions support + handler
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8797 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 12:10:47 +00:00
rMalie 7c32b171cd // Fix lcfirst use !
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8796 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 12:08:14 +00:00
rMalie 45eb3a52ad // Fix admin dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8774 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 14:36:18 +00:00
rMalie 6a39d24f05 // Improve flexibility of dispatcher + fix controllers access in BO (only admin controllers are loaded by the dispatcher)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8764 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 09:57:00 +00:00
rMalie 4d34ca86b7 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8762 b9a71923-0436-4b27-9f14-aed3839534dd 2011-09-26 08:52:32 +00:00
rMalie ff51f77bba // Fix token on adminHome
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8758 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 08:24:38 +00:00
rMalie 01d99a4d58 // Improve dispatcher for administration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8749 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 15:37:16 +00:00
rMalie af81bc3e23 // Add 2 missing files in override
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8746 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 15:10:00 +00:00
rMalie 4e717fe190 // Add moduleController file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8745 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 15:08:43 +00:00
rMalie 1437dec72f [*] MO: module cheque use the new moduleController system
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8741 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 14:34:18 +00:00
rMalie 7c85e104de // Merge -> revision 8734
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8740 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 14:06:47 +00:00
rMalie 4181a8ea5b // Rename Module->smartyAssign to Module->templateAssign
[+] Front: Add module controller + url dispatch for modules

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8738 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 13:50:33 +00:00
rMalie d8b6693264 // Fix strict standard on controllers + modules header / footer include
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8727 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 08:05:31 +00:00
rMalie 4f2a090e24 // Merge -> revision 8720
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-22 15:45:10 +00:00
rMalie 69db63f26c [*] Front: move front controllers in controllers/front/ directory
// Refactoring of front controllers part 1

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8721 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-22 15:19:42 +00:00
rMalie 2dbea99b61 [+] MO: Add Module->smartyAssign method, in order to assign variables with module name as prefix in module's templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8718 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-22 12:05:49 +00:00
rMalie 1d6a3e90c8 // Remove Tools::buildQuery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8698 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 15:36:23 +00:00
rMalie fd45c7bb4d // Fix validation of emails preferences
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8685 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 12:55:57 +00:00
rMalie 526a94a0e6 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8682 b9a71923-0436-4b27-9f14-aed3839534dd 2011-09-21 09:52:19 +00:00
rMalie 734a615464 // Improve DbQuery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8676 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 08:12:47 +00:00
rMalie a3881668f0 // Fix install with Db
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8675 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 07:46:12 +00:00
rMalie 7eef9391af // Improve DbQuery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8670 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 16:49:22 +00:00
rMalie 95233f9df5 [+] Classes: add DbQuery class in order to build queries (usefull when working with chunks of queries)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8668 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 16:14:19 +00:00
rMalie 031c450293 // Fix class Gender (add static keyword)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8642 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-19 13:30:11 +00:00
rMalie 40e0f3dca5 // Fix class Gender (add static keyword)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8637 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-19 12:43:25 +00:00
rMalie 42d996ec94 // Merge -> revision 8624
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8626 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-16 15:02:29 +00:00
rMalie e5e12bdf90 [+] Add abstract controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8625 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-16 14:49:47 +00:00
rMalie 52da3c8bb8 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8622 b9a71923-0436-4b27-9f14-aed3839534dd 2011-09-16 10:19:34 +00:00
rMalie abbcb7892d // Fix controllers file names + add missing files in override/ + ControllerFactory class is now deprecated, use Controller instead + fix NoticationCore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8621 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-16 10:09:26 +00:00
rMalie 781d92ccd4 // Move shop classes in classes/shop/ directory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8616 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-16 08:49:50 +00:00
rMalie 394549b805 // norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8615 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-16 08:40:26 +00:00
rMalie 1977f1d851 // Merge -> revision 8608
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8612 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-15 16:10:59 +00:00
rMalie 8d9309ba23 // Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8607 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-15 14:32:37 +00:00
rMalie 224b55c3c2 // Merge -> revision 8589
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8596 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 16:13:24 +00:00
rMalie 23e00a95f8 [+] Project: it's possible to create new genders, "Miss" gender is now added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8579 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 15:20:53 +00:00
rMalie 03eaee9bf4 [+] Project: it's possible to create new genders, "Miss" gender is now added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8578 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 15:15:51 +00:00
rMalie b7cc6cb72d // Fix & - theme is not w3c valid anymore for now
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8560 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 09:23:32 +00:00
rMalie 578d6de4b9 // Fix adminMeta (dispatcher notices) + generateHtaccess
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8555 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 08:53:37 +00:00
rMalie 87df41c9d6 // Merge -> revision 8552
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8554 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 08:29:10 +00:00
rMalie 3df03aa2bb // Merge -> revision 8507
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8514 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 16:20:30 +00:00
rMalie b50c7e4334 // Merge -> revision 8507
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8513 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 16:17:37 +00:00
rMalie 467313e111 // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8509 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 15:49:01 +00:00
rMalie a25f1341ea // Fix discounts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8442 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-09 11:41:02 +00:00
rMalie a886313c61 // Fix discount creation (bad redirection, missing context value)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8439 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-09 09:42:55 +00:00
rMalie eacdc8d624 // Fix UTF-8 on install files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8422 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-08 14:14:37 +00:00
rMalie 24e213cda8 // Merg// Merge -> revision 8395
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8397 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-07 16:23:13 +00:00