Commit Graph

  • 60be64ef19 update model with good namespace for newsletter entity Manuel Raynaud 2013-10-24 09:53:39 +02:00
  • e7270af63b remove wrong files Manuel Raynaud 2013-10-24 09:20:10 +02:00
  • b9e5b4d9c7 Merge branch 'frontend' of github.com:thelia/thelia into frontend badsuricate 2013-10-24 09:12:52 +02:00
  • 54242eef43 clear cache at end process Manuel Raynaud 2013-10-24 08:54:20 +02:00
  • 3f7300bdee add some control for knwoing if user is in install mode Manuel Raynaud 2013-10-24 08:31:49 +02:00
  • 009e779110 Update profil [It's not working yet] touffies 2013-10-24 00:19:00 +02:00
  • 3e3695e5d3 Add validation for the current password touffies 2013-10-24 00:17:59 +02:00
  • 5bf51dd47e Merge branch 'catalog' Franck Allimant 2013-10-24 00:16:33 +02:00
  • 04c43a12da Add new event NEWSLETTER_UNSUBSCRIBE touffies 2013-10-24 00:15:51 +02:00
  • ac3e842662 All the fields should be with the type password. touffies 2013-10-24 00:11:30 +02:00
  • 7ca2399573 Worked on catalog Franck Allimant 2013-10-23 23:47:44 +02:00
  • 0bd57b0a5a Worked on catalog Franck Allimant 2013-10-23 23:41:39 +02:00
  • b26c3216c5 Fix 404 error page badsuricate 2013-10-23 23:25:41 +02:00
  • 5c5861aa2e Add new method getCustomerByEmail into CustomerQuery touffies 2013-10-23 20:28:41 +02:00
  • 10fee02fbf Add isSubscribed method touffies 2013-10-23 20:10:30 +02:00
  • fa99482f46 update phpdoc Manuel Raynaud 2013-10-23 19:54:28 +02:00
  • f6b20f813f add customer order list Manuel Raynaud 2013-10-23 19:53:47 +02:00
  • e207424a2d Remove login information (Password and Confirm password) Check if email doesn't exist (Exclude current user) touffies 2013-10-23 19:50:43 +02:00
  • 4db360a22a Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-10-23 19:34:28 +02:00
  • fc49b13ef8 remove composer.phar from tracked files Manuel Raynaud 2013-10-23 19:33:35 +02:00
  • 7433971515 Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-10-23 19:23:53 +02:00
  • d1024c6841 fix minor admin bugs Etienne Roudeix 2013-10-23 19:23:29 +02:00
  • bfbb9c46db hide default_lang_without_translation config parameter Manuel Raynaud 2013-10-23 19:21:30 +02:00
  • a7796cf481 manage lanf <=> url assignment Manuel Raynaud 2013-10-23 19:04:49 +02:00
  • 2defbb3b6c Remove temporary the filter touffies 2013-10-23 18:14:40 +02:00
  • d81c384ce0 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-10-23 18:02:23 +02:00
  • c924b2a5bd create form for language url Manuel Raynaud 2013-10-23 18:02:04 +02:00
  • a631a4e174 fix tagged_form_field Etienne Roudeix 2013-10-23 18:00:04 +02:00
  • 21286c2094 Bug : Minimum quantity is 1 touffies 2013-10-23 17:49:51 +02:00
  • f7f7444fcb Modification of "Continue Shopping" button touffies 2013-10-23 17:47:04 +02:00
  • 0c4592a9dd Merge branch 'frontend' of https://github.com/thelia/thelia into frontend touffies 2013-10-23 17:27:52 +02:00
  • cb560691eb Fix login box touffies 2013-10-23 17:27:41 +02:00
  • 4660992d75 Add good product combination to the cart badsuricate 2013-10-23 17:26:11 +02:00
  • c6a11f44c0 add class cart-container badsuricate 2013-10-23 17:25:22 +02:00
  • 1d75e6a4ad CHange input type hidden to input type integer badsuricate 2013-10-23 17:25:03 +02:00
  • 62c64444a3 Delete console.log badsuricate 2013-10-23 16:55:39 +02:00
  • 8c55675dd8 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend touffies 2013-10-23 16:51:30 +02:00
  • 3f69abc16c Bug : Remove double quote touffies 2013-10-23 16:51:20 +02:00
  • b3c956880f Add jquery validation touffies 2013-10-23 16:50:14 +02:00
  • 6fb6cc9679 Merge frontend badsuricate 2013-10-23 16:47:24 +02:00
  • cf67a0478e Merge branch 'master' into tax Etienne Roudeix 2013-10-23 16:32:10 +02:00
  • fb8b82093a administrators management Etienne Roudeix 2013-10-23 16:31:37 +02:00
  • 5515caa0d5 Internationalizing "No products available in this category" badsuricate 2013-10-23 15:48:06 +02:00
  • dffb5375f5 Check if hasbtn is true to display the button "add to cart " badsuricate 2013-10-23 15:45:00 +02:00
  • b8c433f92c reorganize the menu to display the number of products by categories badsuricate 2013-10-23 15:43:46 +02:00
  • 3dd51d98b6 process default behacior for languages Manuel Raynaud 2013-10-23 15:41:41 +02:00
  • e35d17346d Add CSS to align "Upsell Products" badsuricate 2013-10-23 15:41:40 +02:00
  • 41713d68be add css for modal-box badsuricate 2013-10-23 15:37:56 +02:00
  • 77959afefa Add AJAX on "Add to Cart" buttons badsuricate 2013-10-23 15:33:47 +02:00
  • 5e62da9d29 Add new Arguments for CartLoop New args = Limit and position badsuricate 2013-10-23 15:20:42 +02:00
  • 5542d8c494 create lang defaultBehavior form Manuel Raynaud 2013-10-23 15:03:23 +02:00
  • 53e25ce7c1 process delete language Manuel Raynaud 2013-10-23 12:36:08 +02:00
  • b16edfbd1d create language delete event object Manuel Raynaud 2013-10-23 12:15:53 +02:00
  • 24b504ad3b finish language creation process Manuel Raynaud 2013-10-23 12:00:33 +02:00
  • f881edbaa6 create toggleDefault method in lang method and modify in Country model Manuel Raynaud 2013-10-23 09:19:53 +02:00
  • eac2c274e7 change http code status on different context Manuel Raynaud 2013-10-23 09:12:05 +02:00
  • d356974ef7 create lang toggleDefault object Manuel Raynaud 2013-10-23 08:45:02 +02:00
  • 38761a7275 process lang udate action Manuel Raynaud 2013-10-22 19:56:18 +02:00
  • a2d292f6a3 create lang object events Manuel Raynaud 2013-10-22 19:17:27 +02:00
  • 7915552fe6 create ajax modal for lang edition Manuel Raynaud 2013-10-22 18:59:12 +02:00
  • c15431a468 create languages pages Manuel Raynaud 2013-10-22 16:53:37 +02:00
  • b6f9624544 Add a generic route (default) to manage the simple path touffies 2013-10-23 11:49:36 +02:00
  • 7d5803a541 Add routes for mini-cart and addedToCart badsuricate 2013-10-23 11:47:42 +02:00
  • 3c69e38a3b Merge branch 'tax' Etienne Roudeix 2013-10-23 08:49:24 +02:00
  • fb66f5a021 fix insert Etienne Roudeix 2013-10-23 08:48:59 +02:00
  • e824907854 Merge pull request #48 from thelia/coupon Manuel Raynaud 2013-10-22 23:30:17 -07:00
  • a91303a27d Add new method updatePasswordAction (Not finished) touffies 2013-10-23 00:07:27 +02:00
  • 5dc33aec4d Remove duplicate class "panel" touffies 2013-10-22 23:45:56 +02:00
  • 52e471ab1b Working adding decrementation when coupon is consumed gmorel 2013-10-22 23:04:08 +02:00
  • b45fbef2ad Merge branch 'master' of https://github.com/thelia/thelia into coupon gmorel 2013-10-22 23:01:04 +02:00
  • c48c7b5486 issues/45 : Check if an input field has focus on the mini login form, if no we hide the form touffies 2013-10-22 22:44:35 +02:00
  • ac70075a38 Newsletter subscription with ajax touffies 2013-10-22 22:26:33 +02:00
  • 29d4ecbe35 Merge branch 'master' into tax Etienne Roudeix 2013-10-22 20:20:40 +02:00
  • dba4a129ff module access management Etienne Roudeix 2013-10-22 20:20:15 +02:00
  • 44a5909c81 permission resource Etienne Roudeix 2013-10-22 19:51:01 +02:00
  • f844080758 Align the navbar on the right Add google map for the contact page touffies 2013-10-22 18:17:53 +02:00
  • 2d987473b4 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-10-22 17:20:18 +02:00
  • 0580539ed8 fix cart quantity for issue #46 Manuel Raynaud 2013-10-22 17:19:16 +02:00
  • 0d242a4fc0 fix auth loop on index Etienne Roudeix 2013-10-22 16:53:40 +02:00
  • 9c702e8d14 Integration : Add min height to the product tabs touffies 2013-10-22 16:35:53 +02:00
  • aa842c510a Wrong class name on the carousel-control touffies 2013-10-22 16:31:55 +02:00
  • 13bb69e429 Remove validation_groups touffies 2013-10-22 16:21:30 +02:00
  • 0a4c3e2d6e Fix password forgotten route touffies 2013-10-22 16:16:40 +02:00
  • ca04b87738 my bad Etienne Roudeix 2013-10-22 16:13:29 +02:00
  • ddd8c4f7a5 fix auth loop Etienne Roudeix 2013-10-22 15:57:31 +02:00
  • a9dd13ae70 Oups... I forgot to rename CustomerCreation into CustomerCreateForm touffies 2013-10-22 15:50:04 +02:00
  • 8f48a56774 Contact page integration touffies 2013-10-22 15:30:14 +02:00
  • c94fa9bc24 permission management Etienne Roudeix 2013-10-22 15:04:06 +02:00
  • 6fef556319 Merge branch 'propel' Manuel Raynaud 2013-10-22 14:48:10 +02:00
  • 11d1fa46f7 Merge branch 'frontend' of github.com:thelia/thelia into frontend badsuricate 2013-10-22 12:03:06 +02:00
  • 9d5aa5e077 Merge branch 'master' into frontend touffies 2013-10-22 11:55:58 +02:00
  • cb0619a7b3 Merge branch 'master' of github.com:thelia/thelia Etienne Roudeix 2013-10-22 11:33:24 +02:00
  • 77dbdce4e8 fix tests Etienne Roudeix 2013-10-22 11:33:01 +02:00
  • 42e8b3a596 fix tests Etienne Roudeix 2013-10-22 11:24:33 +02:00
  • 5755da1e8c change newsletter success message Manuel Raynaud 2013-10-22 11:22:23 +02:00
  • 7e32957d12 Merge branch 'master' into tax Etienne Roudeix 2013-10-22 11:10:06 +02:00
  • b00f70fa24 permission management Etienne Roudeix 2013-10-22 11:09:24 +02:00
  • 47212490d2 verify if an email already exists in newsletter table Manuel Raynaud 2013-10-22 10:58:16 +02:00
  • cc4f4f0bbe create newsletter template Manuel Raynaud 2013-10-22 10:49:30 +02:00
  • dbcfd8965f Merge branch 'frontend' of github.com:thelia/thelia into frontend badsuricate 2013-10-22 10:24:03 +02:00