Commit Graph

Select branches

Hide Pull Requests

main

#1

Mono Color

• d02f13f021 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-18 00:35:48 +02:00
• de4767ef56 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-17 23:51:31 +02:00
• b545e1c012 Working : Coupon : fix loop, fix read display gmorel 2013-09-17 23:29:25 +02:00
• be665cba56 Working : Coupon : fix loop, fix read display gmorel 2013-09-17 23:25:38 +02:00
• 542a142329 Working : Coupon : fix loop, fix read display gmorel 2013-09-17 23:19:09 +02:00
• ce72a20074 Working : Coupon : fix loop gmorel 2013-09-17 23:09:55 +02:00
• 3aa9c71e34 Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-17 22:55:29 +02:00
• 5326ab1341 Working : Coupon : fixture add old coupon gmorel 2013-09-17 22:54:49 +02:00
• 5a64654ce5 move url generation to I18n entity Manuel Raynaud 2013-09-17 20:45:29 +02:00
• c659bc0e66 Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-09-17 20:33:08 +02:00
• 294c48f8ab fix content faker Etienne Roudeix 2013-09-17 20:32:51 +02:00
• 7c340303f6 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-17 20:29:47 +02:00
• e4b36098c7 fix typo and remove url generation in postInsert model Manuel Raynaud 2013-09-17 20:29:09 +02:00
• 1e15142283 Added product creation franck 2013-09-17 20:18:53 +02:00
• f068539e79 add covers annotation in ProductRewriteTest Manuel Raynaud 2013-09-17 20:16:51 +02:00
• 9bce1cbabb Merge branch 'master' into template Etienne Roudeix 2013-09-17 20:16:48 +02:00
• da7f9e07c4 create test for UrlRewritingTrait Manuel Raynaud 2013-09-17 20:15:28 +02:00
• 5ffb737c50 Merge branch 'master' into template Etienne Roudeix 2013-09-17 20:14:17 +02:00
• 03375a65b3 payment loop Etienne Roudeix 2013-09-17 20:07:50 +02:00
• 347e5e5089 fix postage display Etienne Roudeix 2013-09-17 19:52:20 +02:00
• 0d1c6cf8cb postage + invoice step Etienne Roudeix 2013-09-17 19:47:10 +02:00
• e1e383707b template is not mandatory in product table. Manuel Raynaud 2013-09-17 19:19:52 +02:00
• 9020de5b9a Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-17 19:12:14 +02:00
• 60d09dc76e refactor rewrriten method name Manuel Raynaud 2013-09-17 19:11:44 +02:00
• 9e927c40be Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-17 18:40:06 +02:00
• ecf4412fbd Changed getDefaultCategory in getDefaultCategoryId franck 2013-09-17 18:38:49 +02:00
• 232ad70494 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-17 17:52:53 +02:00
• 50212c55cf remove old model classes: Manuel Raynaud 2013-09-17 17:50:05 +02:00
• c99e7a91b9 Working : Content : fix loop giving no elements gmorel 2013-09-17 17:43:19 +02:00
• 9c0d310441 Merge remote-tracking branch 'origin/master' gmorel 2013-09-17 17:39:22 +02:00
• 82c7cdeb44 Working : Content : fix loop giving no elements gmorel 2013-09-17 17:39:12 +02:00
• c8baa38fed Added missing files... franck 2013-09-17 17:31:22 +02:00
• 4731929a70 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-17 17:15:39 +02:00
• a9009b7e52 Started product management franck 2013-09-17 17:15:15 +02:00
• df80d39954 Working : Content : fix loop giving no elements gmorel 2013-09-17 17:11:08 +02:00
• b878bf54ad Merge remote-tracking branch 'origin/master' gmorel 2013-09-17 17:09:14 +02:00
• f8072a02d2 Working : Product : fix loop giving no elements gmorel 2013-09-17 17:09:01 +02:00
• 21df630d27 Merge branch 'master' into template Etienne Roudeix 2013-09-17 16:53:57 +02:00
• 4a6adf532a cart billing integration Etienne Roudeix 2013-09-17 16:53:20 +02:00
• 7ca3429cbb Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-17 16:38:49 +02:00
• acaa4a969e empty cart or delivery exception Etienne Roudeix 2013-09-17 16:38:16 +02:00
• 79e508524d remove isntall routing and template Manuel Raynaud 2013-09-17 16:30:15 +02:00
• 34f0b03bdc Added product management routes franck 2013-09-17 16:30:14 +02:00
• 640c0fbde8 add .htaccess in tracking files Manuel Raynaud 2013-09-17 16:02:44 +02:00
• 8122dc3084 Merge branch 'install_wizard' Manuel Raynaud 2013-09-17 16:02:24 +02:00
• 072dec5cc9 nstall step Please enter the commit message for your changes. Lines starting Manuel Raynaud 2013-09-17 15:43:15 +02:00
• ddbced036f Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-09-17 15:02:38 +02:00
• 654caf4c6e Working : Content : add faker default folder gmorel 2013-09-17 15:01:58 +02:00
• 8d20316217 no-return-functions block Etienne Roudeix 2013-09-17 14:59:40 +02:00
• fd1aaaef63 Working : Content loop : add default content parameter gmorel 2013-09-17 14:56:17 +02:00
• 63b3e0c3da Working : Product : add faker default category gmorel 2013-09-17 14:46:46 +02:00
• df6b3dbcd5 Merge branch 'master' of https://github.com/thelia/thelia gmorel 2013-09-17 14:42:06 +02:00
• 5509f08df8 Merge branch 'master' of https://github.com/thelia/thelia gmorel 2013-09-17 14:40:28 +02:00
• 35299dd6be config step Manuel Raynaud 2013-09-17 14:22:32 +02:00
• f10842069c Working : Fixture : Product add default category gmorel 2013-09-17 14:15:23 +02:00
• a3dd6c7e8b Polished categories related content franck 2013-09-17 14:03:52 +02:00
• 13265182c2 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-17 13:50:23 +02:00
• 3d78af8b97 Finished category related content management franck 2013-09-17 13:50:01 +02:00
• 233c952b4e Merge branch 'master' into template Etienne Roudeix 2013-09-17 12:44:34 +02:00
• c4fd65e6ea delivery process Etienne Roudeix 2013-09-17 12:38:23 +02:00
• 2bebb5697a Working : Fixture : fix coupon table not cleaned gmorel 2013-09-17 12:24:20 +02:00
• edd84fb622 icreate install wizard Manuel Raynaud 2013-09-17 12:17:48 +02:00
• 67060c6367 Working : Updating model schema.xml gmorel 2013-09-17 11:56:46 +02:00
• b9bc07af18 Merge branch 'master' of https://github.com/thelia/thelia gmorel 2013-09-17 11:41:53 +02:00
• 3b249dc21c Working : Coupon : Unit testing gmorel 2013-09-17 11:41:09 +02:00
• 692badb06b delivery form Etienne Roudeix 2013-09-17 11:05:29 +02:00
• ae4ad0038b Merge branch 'coupon' of https://github.com/thelia/thelia into coupon gmorel 2013-09-17 09:20:13 +02:00
• d097851522 Added documents action and loop franck 2013-09-17 01:07:42 +02:00
• a7ef4300aa WIP : Coupon : unit tests on Rules gmorel 2013-09-16 23:56:31 +02:00
• ad48823b48 WIP : Coupon : unit tests on Rules gmorel 2013-09-16 23:51:47 +02:00
• 73c0a96979 WIP : Coupon : unit tests on Operator gmorel 2013-09-16 23:05:46 +02:00
• cfc54bd6df Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-16 22:47:58 +02:00
• 6f1c77a57e WIP : Coupon functional tests gmorel 2013-09-16 22:41:17 +02:00
• bff08dd581 Typo franck 2013-09-16 22:35:29 +02:00
• 4721b6c1de Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-16 22:32:22 +02:00
• 7858e809b7 Added UrlRewritingTrait to manage URLs from model classes franck 2013-09-16 22:31:55 +02:00
• 16f402aaf4 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-16 22:07:09 +02:00
• 9338cdb472 Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-09-16 22:05:33 +02:00
• eeb9a0f9eb use sqlite database for install process Manuel Raynaud 2013-09-16 20:42:18 +02:00
• 7a8dea28a6 fix typo Manuel Raynaud 2013-09-16 19:08:01 +02:00
• 63472b9f80 WIP : install wizard : step 1, 2, 3 gmorel 2013-09-16 19:00:28 +02:00
• e473c64588 Merge branch 'master' of https://github.com/thelia/thelia franck 2013-09-16 18:59:18 +02:00
• 2f41d4db6f Started category management franck 2013-09-16 18:58:45 +02:00
• afa9a46abf order delivery form Etienne Roudeix 2013-09-16 18:55:29 +02:00
• 67b6e5f07d add some php doc Manuel Raynaud 2013-09-16 18:21:07 +02:00
• 874c5f6cac integrate swiftMailer as mailer solution Manuel Raynaud 2013-09-16 18:20:15 +02:00
• cfc52c4e7f Working : install wizard : type inference gmorel 2013-09-16 18:15:09 +02:00
• 035d9dd0e9 add swiftmailer in composer Manuel Raynaud 2013-09-16 16:57:08 +02:00
• bf3bc02f8b fix fixture dependant unit test Etienne Roudeix 2013-09-16 16:46:12 +02:00
• aa4e0636e8 use dump autoloader in all compser scripts Manuel Raynaud 2013-09-16 16:31:13 +02:00
• 2309a2e788 remove script part of composer.json file Manuel Raynaud 2013-09-16 16:29:09 +02:00
• 361e9e1126 delivery process Etienne Roudeix 2013-09-16 16:12:04 +02:00
• 1dcde3ff2c fix typo Manuel Raynaud 2013-09-16 15:47:32 +02:00
• 484b2730de Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-09-16 15:44:10 +02:00
• 785057c0be add some information for OSX requirements Manuel Raynaud 2013-09-16 15:42:25 +02:00
• 5a7794b0cc Merge branch 'master' of https://github.com/thelia/thelia mespeche 2013-09-16 15:33:14 +02:00
• a229f555cb No alert bloc mespeche 2013-09-16 15:32:52 +02:00
• 84204cbf05 Merge branch 'master' into template Etienne Roudeix 2013-09-16 15:32:17 +02:00
• 5399e08490 Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-09-16 15:31:07 +02:00
• 5ca7136e6d default country Etienne Roudeix 2013-09-16 15:30:46 +02:00