Commit Graph

Select branches

Hide Pull Requests

main

#1

Mono Color

• 114a55c1e8 Refactoring of images and documents management Franck Allimant 2014-06-26 10:36:12 +02:00
• 61b887f92a Merge pull request #501 from lovenunu/fix-psr Manuel Raynaud 2014-06-26 09:49:00 +02:00
• 33862b39b5 Translate french named variabled "origine" and "prefixe" modifié: core/lib/Thelia/Log/Tlog.php Benjamin Perche 2014-06-26 09:28:51 +02:00
• e24863fb43 Merge pull request #500 from lovenunu/fix-psr Julien 2014-06-26 09:24:14 +02:00
• feabfc4f07 Fix cs, follow PSR-2, keyword null must be in lower case modifié: core/lib/Thelia/Log/Tlog.php Benjamin Perche 2014-06-26 09:16:35 +02:00
• 6661341eb4 Replace findOneById by findPk Michaël Espeche 2014-06-26 08:59:21 +02:00
• ed464db6fd Add substitution Michaël Espeche 2014-06-25 16:43:06 +02:00
• d7a55257d5 Reinit file Michaël Espeche 2014-06-25 15:29:28 +02:00
• 4b089fae24 Merge branch 'master' of https://github.com/thelia/thelia Michaël Espeche 2014-06-25 15:26:56 +02:00
• 079f627de9 Reinit file Michaël Espeche 2014-06-25 15:25:56 +02:00
• 67e689ff85 Reinit file Michaël Espeche 2014-06-25 15:25:32 +02:00
• b22255e338 Merge branch 'master' of https://github.com/mespeche/thelia Michaël Espeche 2014-06-25 15:23:52 +02:00
• 36729343f0 Reinit file Michaël Espeche 2014-06-25 15:23:23 +02:00
• d1cb06f761 Merge pull request #498 from lunika/fix Manuel Raynaud 2014-06-24 15:48:01 +02:00
• 35d13885ab remove unused variable Manuel Raynaud 2014-06-24 10:45:48 +02:00
• 84c2432507 remove unused variable Manuel Raynaud 2014-06-24 10:38:43 +02:00
• 77a4c45aa4 remove commented code Manuel Raynaud 2014-06-24 10:30:46 +02:00
• a00a23e495 remove unused use statement Manuel Raynaud 2014-06-24 10:29:17 +02:00
• 5beefc5857 add missing use Manuel Raynaud 2014-06-24 10:27:39 +02:00
• 747feebe40 Merge pull request #497 from lunika/mailer Manuel Raynaud 2014-06-24 10:14:11 +02:00
• b5c0606814 update swiftmailer version. Manuel Raynaud 2014-06-24 10:11:50 +02:00
• c6cc0e5cf9 Merge pull request #494 from jodeq/master Manuel Raynaud 2014-06-23 09:30:46 +02:00
• 549ad7b709 Merge pull request #489 from Yochima/yochima-branch Manuel Raynaud 2014-06-21 13:17:40 +02:00
• 17704c2e21 Merge pull request #496 from lunika/webTest Manuel Raynaud 2014-06-21 13:16:08 +02:00
• cfa9462474 add missing class. Fix #493 Manuel Raynaud 2014-06-21 13:15:41 +02:00
• b49f8a6423 Fixes #495 Franck Allimant 2014-06-21 12:00:37 +02:00
• 2f81e6953b Update prices.json jodeq 2014-06-20 23:12:32 +02:00
• 9e1004789d Merge pull request #492 from lovenunu/lovenunu-thelia Manuel Raynaud 2014-06-20 15:42:42 +02:00
• 45adf78faf Correct bug with default addresses modifié: core/lib/Thelia/Action/Address.php Benjamin Perche 2014-06-20 14:33:52 +02:00
• 3d238902ac Complete AddressTest, highlight bug modifié: core/lib/Thelia/Tests/Action/AddressTest.php Benjamin Perche 2014-06-20 14:32:54 +02:00
• 1f26ff997d Fix bug with CreateOrUpdateAddress action modifié: core/lib/Thelia/Action/Address.php Benjamin Perche 2014-06-20 11:55:13 +02:00
• cf66ad2dc7 Merge pull request #491 from lunika/webTest Julien 2014-06-20 09:38:28 +02:00
• 51313ea430 import test config Manuel Raynaud 2014-06-20 09:11:09 +02:00
• 3d311825d1 integrate web test case Manuel Raynaud 2014-06-20 09:09:06 +02:00
• 9cb145e644 Fix for #490 Franck Allimant 2014-06-19 17:56:01 +02:00
• 2a6d99e36b Automatic versionning of all existing orders during the update 2.0.3 Guillaume Barral 2014-06-19 15:24:14 +02:00
• d4efd004f7 Merge branch 'master' of https://github.com/thelia/thelia into yochima-branch Guillaume Barral 2014-06-19 15:23:25 +02:00
• 15e2ff5fc3 Automatic creation of all orders in order_version during the 2.0.3 update Guillaume Barral 2014-06-19 15:22:06 +02:00
• adcbc13ada Add a default version to all order in Thelia for the 2.0.3 update Guillaume Barral 2014-06-19 15:13:02 +02:00
• dc6b231301 Fixed coupon table versionning Franck Allimant 2014-06-19 15:10:21 +02:00
• 447953a176 Merge pull request #483 from Yochima/yochima-branch Manuel Raynaud 2014-06-19 14:26:57 +02:00
• 69d496715e Merge branch 'master' of https://github.com/thelia/thelia into yochima-branch Guillaume Barral 2014-06-19 13:59:16 +02:00
• cc4eb2200b Merge pull request #487 from lunika/phpunit Manuel Raynaud 2014-06-19 13:54:03 +02:00
• e80e4e4c3b add missing fixtures Manuel Raynaud 2014-06-19 13:17:43 +02:00
• c3aef614ff update test for latest php versions Manuel Raynaud 2014-06-19 13:15:57 +02:00
• ccd16dc363 update phpunit version Manuel Raynaud 2014-06-19 12:58:40 +02:00
• 60124feb17 modification of model Order to not insert two times the order_version (when we insert for the first time an order object) Guillaume Barral 2014-06-19 12:02:58 +02:00
• fded802839 Merge pull request #482 from lovenunu/master Manuel Raynaud 2014-06-19 11:47:50 +02:00
• fd0dad68d5 Merge pull request #485 from roadster31/tinymce Manuel Raynaud 2014-06-19 11:46:37 +02:00
• e5691b9793 Merge branch 'master' of https://github.com/thelia/thelia into yochima-branch Guillaume Barral 2014-06-19 10:13:50 +02:00
• e86195a912 Merge pull request #486 from roadster31/translations Manuel Raynaud 2014-06-19 10:08:47 +02:00
• 270d8da5e3 Merge branch 'master' of https://github.com/lovenunu/thelia into yochima-branch Guillaume Barral 2014-06-19 09:27:56 +02:00
• 0d8f9f3c6e Fixed minor typos Franck Allimant 2014-06-19 01:51:39 +02:00
• 9a887bc4a7 Typo. Franck Allimant 2014-06-19 01:17:13 +02:00
• 0fe99e9c8c Added frenche translation Franck Allimant 2014-06-19 01:16:30 +02:00
• fe8b7e1663 Simplified base URL construction code. Franck Allimant 2014-06-19 01:15:43 +02:00
• d0efdd84bc Added translation domain Franck Allimant 2014-06-19 01:14:24 +02:00
• ddd2008b05 Fix youtube plugin missing labels Franck Allimant 2014-06-19 01:13:48 +02:00
• d66d2b3839 PHP-CS fixer pass. Franck Allimant 2014-06-19 00:33:24 +02:00
• f842f90e00 Merge branch 'master' into tinymce Franck Allimant 2014-06-19 00:16:21 +02:00
• 6c7f160f30 Polished tinyMCE integration Franck Allimant 2014-06-18 20:26:04 +02:00
• bfe7fcd922 Added internationalization plugin Franck Allimant 2014-06-18 20:25:40 +02:00
• 7b3002067d Added proper internationalization Franck Allimant 2014-06-18 20:24:56 +02:00
• 0d0f04bf29 Added getConfiguredShopUrl() to access url_site variable Franck Allimant 2014-06-18 19:34:43 +02:00
• 8198418f97 Added a constant for the translation domain. Franck Allimant 2014-06-18 16:11:40 +02:00
• 556f2e898e Added comments and options Franck Allimant 2014-06-18 16:11:13 +02:00
• c61721605d Proper integration of responsive file manager. Youtune plugin added. Franck Allimant 2014-06-18 15:38:06 +02:00
• ce772b6b60 An exception is thrown if a module could not be loaded. Franck Allimant 2014-06-18 15:36:59 +02:00
• 04135032bf Impmroved Tinymce module Franck Allimant 2014-06-18 15:36:24 +02:00
• 7d4d1857fc Fix colissimo and cheque id retrieving modifié: setup/faker.php Benjamin Perche 2014-06-18 15:00:29 +02:00
• 243e44f571 Target thelia_release_version changed to 3 Guillaume Barral 2014-06-18 14:34:24 +02:00
• 6e9412f3ac Add the table order_version to Thelia Guillaume Barral 2014-06-18 14:22:15 +02:00
• b688ee86f0 fix cs modifié: setup/faker.php Benjamin Perche 2014-06-18 13:30:45 +02:00
• da6244d220 Add clear order table and use propel random selection modifié: setup/faker.php Benjamin Perche 2014-06-18 13:29:30 +02:00
• c5fa984e6e Fix cs Benjamin Perche 2014-06-18 12:35:24 +02:00
• 087f9e46a1 Add line return modifié: setup/faker.php Benjamin Perche 2014-06-18 12:33:53 +02:00
• 2fcec08e50 Insert fake orders with faker modifié: setup/faker.php Benjamin Perche 2014-06-18 12:31:36 +02:00
• 8aac09ad90 Merge pull request #479 from lunika/fixes Manuel Raynaud 2014-06-18 10:26:19 +02:00
• d14a2d24f2 fix cs Manuel Raynaud 2014-06-18 10:06:10 +02:00
• 101197c0de various fixes from insight Manuel Raynaud 2014-06-18 09:33:32 +02:00
• 588be42e0f Merge pull request #473 from roadster31/coupon-end Manuel Raynaud 2014-06-17 21:11:14 +02:00
• cbf2eae842 Written coupons unit tests Franck Allimant 2014-06-17 19:58:56 +02:00
• 97db5baa44 Merge pull request #476 from lunika/date Julien 2014-06-17 17:01:10 +02:00
• f9e0db06c1 refactor formatDate function and create test Manuel Raynaud 2014-06-17 09:04:59 +02:00
• 6f12882850 Added missing $this->setFieldsValue($effects); Franck Allimant 2014-06-17 15:28:35 +02:00
• cc55c730bb Merge pull request #478 from Yochima/yochima-branch Manuel Raynaud 2014-06-17 15:08:32 +02:00
• 8196690458 Add link in template-edit to go to Attributes and features edition (this is more intuitive) Guillaume Barral 2014-06-17 11:48:35 +02:00
• 816a9b81ca Allow to search a customer in the default template if $search is not null Guillaume Barral 2014-06-17 11:19:16 +02:00
• 5534780e3c Added the FreeProduct coupon. Franck Allimant 2014-06-17 00:45:55 +02:00
• 8b74eae911 php-cs pass Franck Allimant 2014-06-17 00:43:10 +02:00
• 63f00d82b9 Using 0 as default value if some loop parameters are not defined Franck Allimant 2014-06-17 00:39:00 +02:00
• c87c6e2793 Added free product coupon. Franck Allimant 2014-06-17 00:38:18 +02:00
• 749487e967 Added getDeliveryCountry() method Franck Allimant 2014-06-17 00:37:53 +02:00
• e3dc87dd6a Updated translations after finishing coupons Franck Allimant 2014-06-17 00:37:06 +02:00
• f3ccf8ec15 Updated translation after finishing coupons Franck Allimant 2014-06-17 00:36:23 +02:00
• 17ad1ed6fa The CouponManager clear() method is now invoked. Franck Allimant 2014-06-17 00:35:52 +02:00
• 6b6687c85c Added clear() method Franck Allimant 2014-06-17 00:35:12 +02:00
• 2edfb0b389 Added clear method. Franck Allimant 2014-06-17 00:34:57 +02:00
• 7377af6029 Merge pull request #471 from nicolasleon/master Manuel Raynaud 2014-06-15 19:47:22 +02:00
• 20593a0576 Fix PSR coding style Nicolas Léon 2014-06-14 21:58:33 +02:00