Commit Graph

Select branches

Hide Pull Requests

main

#1

Mono Color

• 84c97e80ea write in uppercase the resource value used in admin_position_block function. Fix #444 Manuel Raynaud 2014-06-05 10:13:07 +02:00
• 3419aaaaa1 Merge pull request #453 from bibich/issue-452 Julien 2014-06-05 14:46:43 +02:00
• fc15d466b4 Fixed issue when installing Thelia on database with special characters Julien Chanséaume 2014-06-05 14:01:47 +02:00
• 1a3cc6896a Changed "return_to" into "previous" Franck Allimant 2014-06-04 16:14:04 +02:00
• 17f22d920c Merge pull request #451 from lovenunu/master Julien 2014-06-04 14:19:46 +02:00
• 946a671c4d Fix cs modifié: core/lib/Thelia/Core/Event/SessionEvent.php modifié: core/lib/Thelia/Core/EventListener/SessionListener.php modifié: core/lib/Thelia/Core/TheliaKernelEvents.php modifié: core/lib/Thelia/Model/CartItem.php Benjamin Perche 2014-06-04 13:43:03 +02:00
• 4baeb5156d Merge pull request #449 from Yochima/yochima-branch Julien 2014-06-04 10:33:08 +02:00
• 2a7ea88d13 As the customerController, the method performAdditionalUpdateAction is useless as long as we have an <input type="hidden" name="page" /> AND a well configured successUrl :) Guillaume Barral 2014-06-04 09:02:55 +02:00
• a0eb7603ce correction of the method performAdditionalUpdateAction Guillaume Barral 2014-06-04 08:40:17 +02:00
• 3df31f1ecb Merge pull request #450 from driou/master Manuel Raynaud 2014-06-03 15:47:46 +02:00
• 78b0be3126 Update fr_FR.php driou 2014-06-03 15:25:12 +02:00
• eb895bc544 Add pagination to the product list (backOffice) Guillaume Barral 2014-06-03 12:35:52 +02:00
• 413df42941 Added "js" parameter to intl function for a safe usage in JS string, Franck Allimant 2014-05-31 16:27:32 +02:00
• 04b5b5e6b5 PHP-CS fixer Franck Allimant 2014-05-31 15:41:51 +02:00
• 37e2f639d7 Checked coupon type before trying to get the service. Franck Allimant 2014-05-30 20:17:41 +02:00
• a862c59189 Fixed coupon input field name Franck Allimant 2014-05-30 20:12:41 +02:00
• 06307a8c1a Removed no longer useful tests Franck Allimant 2014-05-30 20:12:23 +02:00
• d41bbfc9eb Improved and simplified coupon form management Franck Allimant 2014-05-30 19:58:02 +02:00
• 6137fb8893 Merge pull request #446 from lunika/issues Manuel Raynaud 2014-05-30 17:33:07 +02:00
• d439197133 translate product in car. Fix #416 Manuel Raynaud 2014-05-30 17:07:55 +02:00
• fe620a5a3b force default locale when uploading new document. Fix #403 Manuel Raynaud 2014-05-30 16:43:26 +02:00
• eb13849b79 fix parameter in document loop. Fix #405 Manuel Raynaud 2014-05-30 12:22:22 +02:00
• 8370158f9d fix saves & close action on document and images. Fix #402 Manuel Raynaud 2014-05-30 11:49:03 +02:00
• 08ec1140aa show active menu tab. Fix #262 Manuel Raynaud 2014-05-30 11:26:32 +02:00
• c738361221 Merge pull request #445 from zzuutt/master Manuel Raynaud 2014-05-28 23:42:21 +02:00
• ee6bb052ad Merge pull request #439 from roadster31/coupon-types Manuel Raynaud 2014-05-28 15:58:01 +02:00
• 70ecac55cc Merge pull request #436 from etienneroudeix/master Manuel Raynaud 2014-05-28 15:45:15 +02:00
• 507a52a20f Update 2.0.2.sql etienne roudeix 2014-05-28 14:56:46 +02:00
• 5395c76bf3 Update insert.sql etienne roudeix 2014-05-28 14:56:04 +02:00
• 567fee839c Added RemoveAmountOnCategories coupon type Franck Allimant 2014-05-28 12:02:56 +02:00
• 23ebb88719 Fix #438 Franck Allimant 2014-05-28 12:01:46 +02:00
• 6567e19164 Merge pull request #437 from lunika/admin Manuel Raynaud 2014-05-27 17:12:13 +02:00
• 087fc6e9bf reset modified column after admin connection Manuel Raynaud 2014-05-27 17:09:53 +02:00
• 88a7164e96 add Hong Kong to country list etienne 2014-05-27 15:38:11 +02:00
• 99fb562660 Merge pull request #435 from Yochima/yochima-branch Manuel Raynaud 2014-05-27 08:53:19 +02:00
• 2587f208c6 add argument id to the order_product loop Guillaume Barral 2014-05-27 08:44:49 +02:00
• 30f7eec494 Merge pull request #433 from lunika/asset Manuel Raynaud 2014-05-26 17:01:43 +02:00
• 6eaea72043 don't catch exception when javscript assets are processed Manuel Raynaud 2014-05-26 11:07:02 +02:00
• f9ec2b39b0 Merge pull request #431 from knjeurope/master Manuel Raynaud 2014-05-26 09:16:36 +02:00
• 58b33a8e05 Add code source insert knjeurope 2014-05-26 08:36:42 +02:00
• ad469298bc Merge pull request #428 from roadster31/coupon-types Manuel Raynaud 2014-05-23 00:32:26 +02:00
• e4029c9fdd Temporary fix for #427 Franck Allimant 2014-05-22 23:39:34 +02:00
• f8cf0b5692 Correction issue #425 zzuutt 2014-05-22 11:06:43 +02:00
• 8464a8e861 Merge pull request #420 from lunika/session Manuel Raynaud 2014-05-20 11:36:55 +02:00
• 84e28f1ff2 update changelog with new session process Manuel Raynaud 2014-05-20 11:33:00 +02:00
• 2ace0796e8 session is now initialize using dispatcher Manuel Raynaud 2014-05-20 09:44:04 +02:00
• ec50b30ff6 Merge pull request #417 from Yochima/yochima-branch Manuel Raynaud 2014-05-19 11:12:32 +02:00
• bcd817f9d9 initialize the order in the $event object in the createManual function. We need to initialize it because we have to use the placedOrder instead Guillaume Barral 2014-05-19 11:06:19 +02:00
• c4be881ab8 add the test of a non null order in the $event object in createManual function Guillaume Barral 2014-05-19 11:01:19 +02:00
• 1a08cabd6e Merge pull request #413 from roadster31/coupon-types Manuel Raynaud 2014-05-19 10:50:53 +02:00
• d576e62082 Removed uses of Base in core/lib/Thelia/Model Franck Allimant 2014-05-19 09:50:18 +02:00
• db94749dc0 set the placedOrder in the createManual function Guillaume Barral 2014-05-19 09:43:42 +02:00
• d153ca04c3 Merge pull request #415 from zzuutt/master Manuel Raynaud 2014-05-19 09:37:40 +02:00
• b3b16e1fb1 Added vendor block to schema Franck Allimant 2014-05-18 20:34:58 +02:00
• 612898d3b3 ENGINE=InnoDB; -> ENGINE=InnoDB CHARACTER SET='utf8'; Franck Allimant 2014-05-18 20:30:14 +02:00
• 12fb52dc88 Optimisation : 60*60*24 -> 86400 Franck Allimant 2014-05-18 20:21:23 +02:00
• ab060486d0 Fixed Thelia\Model\Base uses. Franck Allimant 2014-05-18 20:19:48 +02:00
• 7ef09069cb Merge pull request #414 from nicolasleon/master Manuel Raynaud 2014-05-18 19:38:16 +02:00
• 957140a5b7 Allow sorting by creation date for Content Loop Nicolas Léon 2014-05-18 13:43:56 +02:00
• 811186f4aa Allow sorting by creation date for Content Loop Nicolas Léon 2014-05-18 13:34:41 +02:00
• 482302e2b2 Ajout d'une variable de sortie a la boucle cart zzuutt 2014-05-17 23:23:57 +02:00
• cae0db00eb Applied Windows version of php-cs script Franck Allimant 2014-05-17 12:00:08 +02:00
• f772a49dcc Added Windows version of php-cs script Franck Allimant 2014-05-17 11:59:53 +02:00
• a3e1ece3dc Merge branch 'coupon-types' of https://github.com/roadster31/thelia into coupon-types Franck Allimant 2014-05-17 10:58:00 +02:00
• 2c7337d8e0 Applied php-cs-fixer with level psr2 Franck Allimant 2014-05-17 10:49:34 +02:00
• ef142ca077 Applied php-cs-fixer Franck Allimant 2014-05-17 10:24:22 +02:00
• f8ccea1899 Added per-user coupon maximum usage count Franck Allimant 2014-05-17 10:20:26 +02:00
• 8a6e3b854a Applied php-cs-fixer with level psr2 Franck Allimant 2014-05-17 10:49:34 +02:00
• 1bd1977ee7 Applied php-cs-fixer Franck Allimant 2014-05-17 10:24:22 +02:00
• b5cc1b47a3 dded per-user coupon maximum usage Franck Allimant 2014-05-17 10:20:26 +02:00
• 9cdac6d50e Fixes french translation. Franck Allimant 2014-05-16 11:12:24 +02:00
• 90947bcda9 Free shipping restricitions based on Countries and Shipping module Franck Allimant 2014-05-16 10:30:15 +02:00
• ffd842cbf6 Added FREE_SHIPPING_FOR_COUNTRIES_LIST and FREE_SHIPPING_FOR_MODULES_LIST Franck Allimant 2014-05-16 10:07:25 +02:00
• f2b93334eb Free shipping for selected countries and/or shipping methods Franck Allimant 2014-05-15 20:27:39 +02:00
• 392abff271 Free shipping for selected countries and/or shipping methods Franck Allimant 2014-05-15 20:25:22 +02:00
• 32542efe28 $chosenDeliveryAddress and $chosenInvoiceAddress are now protected Franck Allimant 2014-05-15 19:30:30 +02:00
• 268d5a997d Typo ! Franck Allimant 2014-05-15 18:59:48 +02:00
• 683664cb07 Added Model\Module::getModuleInstance() method Franck Allimant 2014-05-15 16:50:34 +02:00
• ac2e3ed172 Update module-tab-content.html zzuutt 2014-05-15 09:09:54 +02:00
• 9c0cc178b4 Added coupon_country and coupon_module tables Franck Allimant 2014-05-14 16:35:16 +02:00
• c0456e1c07 Additional fix for issue #408 Franck Allimant 2014-05-14 15:45:20 +02:00
• ae5e88f90c Created file. Removes some ununsed indexes Franck Allimant 2014-05-14 15:33:32 +02:00
• ed7e07e740 Merge pull request #400 from roadster31/coupons-return Manuel Raynaud 2014-05-13 08:54:39 +02:00
• 39c9ca1b2b Updated changelog with coupon conditions Franck Allimant 2014-05-12 23:38:51 +02:00
• 112cb8eeb0 Added ForSomeCustomer condition Franck Allimant 2014-05-12 23:37:43 +02:00
• 33249f0a75 Merge pull request #395 from Yochima/yochima-branch Manuel Raynaud 2014-05-10 23:15:37 +02:00
• eb0054d21e Typo Franck Allimant 2014-05-10 22:52:19 +02:00
• ad0aafeb31 Fixex #399 Franck Allimant 2014-05-10 22:51:20 +02:00
• 07411b95a1 Added more conditions Franck Allimant 2014-05-10 12:13:02 +02:00
• 0a4003ae1c Fixed condition names Franck Allimant 2014-05-10 12:12:48 +02:00
• 59ca9760a3 Added cart contains products condition Franck Allimant 2014-05-10 12:12:19 +02:00
• c4af0a9aef Added cart contains categories condition Franck Allimant 2014-05-10 12:11:48 +02:00
• 862d8ec913 Prevent Fatal error if current order coupon is deleted Franck Allimant 2014-05-10 12:10:45 +02:00
• df9b19cb91 Typo Franck Allimant 2014-05-10 02:57:02 +02:00
• de9547fc8e Updated translations Franck Allimant 2014-05-10 02:55:17 +02:00
• a581a6ca0f Fixed criteria lablels Franck Allimant 2014-05-10 02:47:23 +02:00
• 6632eba9f4 Added countries and start date conditions Franck Allimant 2014-05-10 02:39:24 +02:00
• f76e5d7aaa Added start date condition Franck Allimant 2014-05-10 02:38:03 +02:00
• c39de8bf87 Improved condition code structure (still backward compatible) Franck Allimant 2014-05-10 01:37:09 +02:00
• 38e16f0502 Changed name Franck Allimant 2014-05-10 01:36:49 +02:00