TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 46469541f7 Merge conflict touffies 2013-10-25 14:47:13 +02:00
  • a35ae5c42e Add GNU General Public License touffies 2013-10-25 14:41:04 +02:00
  • 4b157b30eb move shim in head part Manuel Raynaud 2013-10-25 14:07:23 +02:00
  • d9a2855084 Issue 79 : English error touffies 2013-10-25 14:03:54 +02:00
  • 5d1d02fa20 integration error message for coupon code touffies 2013-10-25 14:01:09 +02:00
  • ede3d95fad CSS3 Media Queries for IE8 touffies 2013-10-25 12:30:49 +02:00
  • 2e5c9d2799 fix image resolution Manuel Raynaud 2013-10-25 12:45:21 +02:00
  • ade22f5928 Merge pull request #77 from thelia/frontend Manuel Raynaud 2013-10-25 03:33:20 -07:00
  • 1cee17732a CSS3 Media Queries for IE8 touffies 2013-10-25 12:30:49 +02:00
  • de147b7b0c change visibility parameter in content and folder loops Manuel Raynaud 2013-10-25 12:24:47 +02:00
  • a51868cc9b Remove TTC touffies 2013-10-25 12:24:34 +02:00
  • a2dbde0fd3 Remove TTC touffies 2013-10-25 12:24:03 +02:00
  • 8196349ceb change visibility parameter in category loop Manuel Raynaud 2013-10-25 12:23:50 +02:00
  • 7bcbab6918 Remove "Christophe Laffont" touffies 2013-10-25 12:20:41 +02:00
  • 7cc73b7d4c fix typo in customer address book Manuel Raynaud 2013-10-25 12:20:23 +02:00
  • a0cfead4b0 display status label instead of id status in account page Manuel Raynaud 2013-10-25 12:14:46 +02:00
  • 603fdfb9a3 Car url should be on lowercase touffies 2013-10-25 12:03:23 +02:00
  • 804b8599b1 Merge pull request #74 from thelia/frontend Manuel Raynaud 2013-10-25 02:54:51 -07:00
  • e33ed5047f check if email contact eists before sending emails Manuel Raynaud 2013-10-25 11:52:46 +02:00
  • d25e536b8d Change contact email address touffies 2013-10-25 11:50:17 +02:00
  • 1e0599438a Change contact address touffies 2013-10-25 11:48:57 +02:00
  • f83d12f2aa Center vertical Cart and Mini Cart touffies 2013-10-25 11:41:34 +02:00
  • 4a6745fef4 change link for changing language and currency in front office Manuel Raynaud 2013-10-25 11:38:22 +02:00
  • 8fe2955726 Remove margin bottom on the Quantity dropdown touffies 2013-10-25 11:37:28 +02:00
  • 64260d7429 Hide the label for the coupon code touffies 2013-10-25 11:33:33 +02:00
  • e2a7bbe1c0 fix typo Manuel Raynaud 2013-10-25 11:32:51 +02:00
  • e26c8fdd7c Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-10-25 11:29:00 +02:00
  • 0de3245eb6 Check by default the first delivery method and check by default the default delivery address touffies 2013-10-25 11:28:54 +02:00
  • f8a688fb03 change syntax for displaying date in templates Manuel Raynaud 2013-10-25 11:28:17 +02:00
  • 7ca339492f fix test suite Manuel Raynaud 2013-10-25 11:21:39 +02:00
  • cc3aa39cae fix product loop Etienne Roudeix 2013-10-25 11:18:20 +02:00
  • 166407844b Fix semantic on the delivery method list touffies 2013-10-25 11:10:27 +02:00
  • b7dc345edd Add default label for the delivery address touffies 2013-10-25 11:03:52 +02:00
  • 157f97467a Replace button checkout with link into mini-cart touffies 2013-10-25 11:00:25 +02:00
  • 0d8c4f97a1 return empty value instead of throwing an exception for format_number smarty function Manuel Raynaud 2013-10-25 10:54:53 +02:00
  • 3c4525d6d6 fix product loop Manuel Raynaud 2013-10-25 10:52:41 +02:00
  • 936af2ec91 return empty value instead of throwing an exception for format_date smarty function Manuel Raynaud 2013-10-25 10:43:40 +02:00
  • 2bec1d8193 remove some unused blocks Manuel Raynaud 2013-10-25 10:27:29 +02:00
  • 1b3b470b60 Change color of an active thumbnail touffies 2013-10-25 10:11:04 +02:00
  • 2c030f910b fix cs Manuel Raynaud 2013-10-25 10:07:21 +02:00
  • 84032af8aa Copyright date dynamic touffies 2013-10-25 10:00:35 +02:00
  • 22caf28f80 add thelia version in admin home page Manuel Raynaud 2013-10-25 09:42:30 +02:00
  • 0ef89a0e82 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-10-25 09:26:45 +02:00
  • 3439fd6276 project copying Etienne Roudeix 2013-10-25 09:14:14 +02:00
  • 373fe13287 save thelia version Manuel Raynaud 2013-10-25 09:10:27 +02:00
  • 8043b50c75 new permission system in controllers Etienne Roudeix 2013-10-25 08:59:09 +02:00
  • ee1ba49aa8 change thelia url in composer.json file Manuel Raynaud 2013-10-25 01:13:30 +02:00
  • ebba25a7d0 create contributors file Manuel Raynaud 2013-10-25 01:01:41 +02:00
  • d9fc945015 Added TAX_RUl_ID to simple part of product loop Franck Allimant 2013-10-25 00:46:25 +02:00
  • eccad09abe Merge branch 'catalog' Franck Allimant 2013-10-25 00:36:24 +02:00
  • 0d50557269 Merge branch 'master' of https://github.com/thelia/thelia Franck Allimant 2013-10-25 00:33:52 +02:00
  • 06cc8ce1ea Finished product combinations edition Franck Allimant 2013-10-25 00:32:56 +02:00
  • 60683b7a32 Merge pull request #56 from thelia/frontend Manuel Raynaud 2013-10-24 12:56:37 -07:00
  • 29c2d543fb Wrong name form used into updateAction (CustomerController) touffies 2013-10-24 21:39:50 +02:00
  • a85c0a75cf Merge pull request #55 from thelia/frontend Manuel Raynaud 2013-10-24 12:31:42 -07:00
  • b8751b26a5 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-10-24 21:25:41 +02:00
  • dfbdce3f80 send order confirmation email Manuel Raynaud 2013-10-24 21:24:14 +02:00
  • 29c7d077c6 Wrong form name thelia.admin.customer.modification replaced by thelia.admin.customer.update touffies 2013-10-24 21:12:32 +02:00
  • a0b59c8549 Merge branch 'tax' Etienne Roudeix 2013-10-24 20:26:26 +02:00
  • d8611c2965 admin search in customer and products Etienne Roudeix 2013-10-24 20:26:00 +02:00
  • f6b65e70d9 create order confirmation email Manuel Raynaud 2013-10-24 20:23:43 +02:00
  • 54eda797a2 Replace /login and /register by /logout and /account in the footer if the customer is logged in touffies 2013-10-24 19:56:15 +02:00
  • 97d3be6104 fix AdminResources constant in MessageController Manuel Raynaud 2013-10-24 19:52:09 +02:00
  • 6ea61ff68c searchLoopInterface + use in OrderLoop Etienne Roudeix 2013-10-24 19:50:09 +02:00
  • 64985faedc small fix touffies 2013-10-24 19:49:52 +02:00
  • 72f9cbb305 save website url in install process Manuel Raynaud 2013-10-24 19:45:51 +02:00
  • d8b2ef28fc Issue 51, removed s at account information touffies 2013-10-24 19:45:30 +02:00
  • b0fb0fdd43 I need the route cart.view for the OrderException.php file. touffies 2013-10-24 19:39:54 +02:00
  • bba21b2a94 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-10-24 19:20:18 +02:00
  • 1f3315a3ec Merge pull request #54 from thelia/frontend Manuel Raynaud 2013-10-24 10:18:03 -07:00
  • ca5d7d2a00 Change some route to use the default $this->redirectToRoute('default', array('view'=>'cart')); touffies 2013-10-24 18:51:49 +02:00
  • a327c98671 fix admin order pdf routes Manuel Raynaud 2013-10-24 18:28:02 +02:00
  • 9965b6a7a7 remove link on product images in invoice page Manuel Raynaud 2013-10-24 17:52:06 +02:00
  • 32725832f1 Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-10-24 17:42:22 +02:00
  • 2dc4589126 non-complex product loop returns default PSE Etienne Roudeix 2013-10-24 17:41:32 +02:00
  • 91f2920336 remove http cache Manuel Raynaud 2013-10-24 17:35:17 +02:00
  • 9cd986d3b6 fix issue #53 Manuel Raynaud 2013-10-24 17:33:35 +02:00
  • d1cccb13cb remove some links in admin config part Manuel Raynaud 2013-10-24 17:28:50 +02:00
  • 5b008a8b17 Merge branch 'master' into loops Etienne Roudeix 2013-10-24 17:15:48 +02:00
  • c3fe31c0af new product loop Etienne Roudeix 2013-10-24 17:15:16 +02:00
  • a25249439f remove phpinfo file Manuel Raynaud 2013-10-24 17:12:04 +02:00
  • 10f78b90a5 Merge pull request #49 from thelia/frontend Manuel Raynaud 2013-10-24 08:07:18 -07:00
  • 87df547668 Removed var_dump(à Franck Allimant 2013-10-24 17:01:10 +02:00
  • 54f2172ca1 Merge branch 'master' of https://github.com/thelia/thelia Franck Allimant 2013-10-24 16:56:52 +02:00
  • d0213f36d4 Removed forgotten var_dump(). Franck Allimant 2013-10-24 16:56:14 +02:00
  • 9b5c631fcb Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-10-24 16:55:09 +02:00
  • 0be7285863 save discount Manuel Raynaud 2013-10-24 16:54:52 +02:00
  • ebec82d1d2 Merge with master touffies 2013-10-24 16:52:03 +02:00
  • db6d5692eb Merge branch 'catalog' Franck Allimant 2013-10-24 16:47:53 +02:00
  • 4f7e7660ca Finished PSE management for products with no combinations Franck Allimant 2013-10-24 16:39:22 +02:00
  • 2f7dcb7f51 remove tooltip from coupon edit controller Manuel Raynaud 2013-10-24 15:55:35 +02:00
  • 1d92ac0626 Merge branch 'frontend' of github.com:thelia/thelia into frontend badsuricate 2013-10-24 15:31:46 +02:00
  • e0a927daf1 Add 404 Page badsuricate 2013-10-24 15:31:12 +02:00
  • ecaf0ccd07 consider FROM_DEFAULT_CURRENCY in pse loop Etienne Roudeix 2013-10-24 15:23:16 +02:00
  • 7b9585b11b consider FROM_DEFAULT_CURRENCY field in product loop Etienne Roudeix 2013-10-24 15:15:29 +02:00
  • 02c2f6560e add todo comment in coupon event Manuel Raynaud 2013-10-24 14:49:15 +02:00
  • b9410bba59 Implemented prices conversion management Franck Allimant 2013-10-24 12:34:44 +02:00
  • ca03e374f2 newsletter modification from account email modification from account Etienne Roudeix 2013-10-24 12:10:35 +02:00
  • 4065f338b9 Merge branch 'master' into tax Etienne Roudeix 2013-10-24 10:37:05 +02:00
  • fb4e15ae77 fix issue #47 Etienne Roudeix 2013-10-24 10:36:06 +02:00