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

Commit Graph

  • 897bc892db change changelog file format Manuel Raynaud 2013-12-20 15:09:58 +01:00
  • f94b968874 Merge branch 'modules' Manuel Raynaud 2013-12-20 14:57:14 +01:00
  • eaae979b70 Prevent product and content création at catalog root Franck Allimant 2013-12-20 14:51:47 +01:00
  • 9ff72f119f Merge branch 'modules' of https://github.com/thelia/thelia into modules Franck Allimant 2013-12-20 14:31:06 +01:00
  • afea985549 Merge branch 'modules' of https://github.com/thelia/thelia into modules Franck Allimant 2013-12-20 14:30:50 +01:00
  • 22efc21bfe dynamic delivery modules on delivery front template Etienne Roudeix 2013-12-20 12:14:20 +01:00
  • 26909cf7aa complete changelog Manuel Raynaud 2013-12-20 11:59:26 +01:00
  • 882cf554d1 Finished merging modules with master Franck Allimant 2013-12-20 11:47:34 +01:00
  • 9092e39296 Merge branch 'master' into modules Franck Allimant 2013-12-20 11:32:01 +01:00
  • b3ac365b45 Revert "Merge branch 'cleanmaster' into modules" Etienne Roudeix 2013-12-20 11:16:42 +01:00
  • d0ff5260f7 Merge branch 'cleanmaster' into modules Etienne Roudeix 2013-12-20 11:16:35 +01:00
  • 67d0101dbe use TaxEngine::getDeliveryCountry in delivery loop Etienne Roudeix 2013-12-20 11:14:04 +01:00
  • 4cb8ba704b refacto getTaxCountry which is actually getDeliveryCountry Etienne Roudeix 2013-12-20 11:13:08 +01:00
  • 63ba1ceeda make it magic last stand Etienne Roudeix 2013-12-20 11:12:03 +01:00
  • 5f8a6a1a5e change loop in shipping zone template using module insteadof delivery Manuel Raynaud 2013-12-20 09:25:37 +01:00
  • 2979ca0092 Fixed template loop Franck Allimant 2013-12-20 01:40:45 +01:00
  • 3a2ad352cc Refactored templates processing Franck Allimant 2013-12-20 00:49:08 +01:00
  • 4610128134 complete readme file Manuel Raynaud 2013-12-19 16:31:50 +01:00
  • e2d7d44798 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-12-19 16:04:10 +01:00
  • bd1bac1f0d change email address of core contributors Manuel Raynaud 2013-12-19 16:03:39 +01:00
  • f434924e48 fix getPosition folder test Etienne Roudeix 2013-12-19 15:46:03 +01:00
  • 8c121dd455 add coupon tests Etienne Roudeix 2013-12-19 15:37:15 +01:00
  • 5773922314 show coupon codes in back office Etienne Roudeix 2013-12-19 14:50:45 +01:00
  • d7c1ecf09a coupon management in order and cart process Etienne Roudeix 2013-12-19 14:17:22 +01:00
  • c981102d3a Merge branch 'master' of github.com:thelia/thelia into cleanmaster Etienne Roudeix 2013-12-18 17:47:23 +01:00
  • 1ba60103f3 coupon in orders + model review : backquote use Etienne Roudeix 2013-12-18 17:46:42 +01:00
  • a6a2c43345 don't remove session order before calling payment method Manuel Raynaud 2013-12-18 17:04:48 +01:00
  • 2f4158d1f6 fix cs Manuel Raynaud 2013-12-18 10:04:13 +01:00
  • d0e5d189d2 change memory_limit value, 128 MB is enough Manuel Raynaud 2013-12-18 09:39:23 +01:00
  • e7a564b2df use composer create-project instead of git Manuel Raynaud 2013-12-17 14:47:31 +01:00
  • ade8ac6f2a add documentation URL in readme Manuel Raynaud 2013-12-17 14:46:36 +01:00
  • 0c24a8afc0 Merge branch 'master' into modules Manuel Raynaud 2013-12-17 10:48:59 +01:00
  • e5576864cd Merge branch 'frontend' Manuel Raynaud 2013-12-17 10:22:17 +01:00
  • d6b524e39a add a new entry point in each pages in bo for js include Manuel Raynaud 2013-12-17 10:21:18 +01:00
  • c39492d6ce Merge pull request #139 from thelia/frontend Manuel Raynaud 2013-12-17 00:36:01 -08:00
  • db2ad120b2 fix test suite reimplementing url updating trest Manuel Raynaud 2013-12-16 17:29:25 +01:00
  • 0e9ac181e5 fix missing current_id parameter in content-edit.html template Manuel Raynaud 2013-12-16 17:09:48 +01:00
  • 1a0d543990 fix missing id in folder-edit.html template Manuel Raynaud 2013-12-16 17:06:15 +01:00
  • 10ecec2fa1 setUrl was not call in seo event generation Manuel Raynaud 2013-12-16 16:39:14 +01:00
  • 49c6b5b05a remove novalidate paramter on seo form Manuel Raynaud 2013-12-16 16:26:26 +01:00
  • b9192e551c fix missing general form on seo form error Manuel Raynaud 2013-12-16 16:22:14 +01:00
  • 30eab4f416 fix object identifier presence Manuel Raynaud 2013-12-16 15:53:02 +01:00
  • d6ba2b3d65 Merge branch 'master' into frontend Manuel Raynaud 2013-12-16 15:45:04 +01:00
  • 65f43b5eff Merge branch 'cleanmaster' into modules Etienne Roudeix 2013-12-16 14:33:15 +01:00
  • 315ed1fb09 fix #144 Etienne Roudeix 2013-12-16 14:31:51 +01:00
  • 32d0aa15a6 PaymentModuleInterface::pay method force $order parameter Etienne Roudeix 2013-12-16 12:38:41 +01:00
  • 029c97c47f new checking in folder tests Etienne Roudeix 2013-12-16 11:38:57 +01:00
  • 977bbb55fa Merge branch 'cleanmaster' into modules Etienne Roudeix 2013-12-16 11:32:54 +01:00
  • 86f1e06e42 document repositioning after delation Etienne Roudeix 2013-12-16 11:32:05 +01:00
  • c5e69ebbb9 Merge branch 'cleanmaster' into modules Etienne Roudeix 2013-12-16 10:56:40 +01:00
  • 583cbe95b6 document positioning Etienne Roudeix 2013-12-16 10:55:18 +01:00
  • 536c88b4f8 Merge branch 'cleanmaster' into modules Etienne Roudeix 2013-12-16 09:57:35 +01:00
  • 0e30ce2760 add jquery ui in assets Etienne Roudeix 2013-12-16 09:40:13 +01:00
  • d4f721fa33 Merge branch 'master' of github.com:thelia/thelia into cleanmaster Etienne Roudeix 2013-12-16 09:11:21 +01:00
  • 3d55a6ded6 add jquery ui (ooops) Etienne Roudeix 2013-12-16 09:10:35 +01:00
  • 43b89ab39f Merge pull request #148 from DirtyF/patch-1 Manuel Raynaud 2013-12-14 12:50:13 -08:00
  • 8e663964c1 add phpbrew as a solution to handle PHP on Mac OSX DirtyF 2013-12-14 20:24:22 +01:00
  • 4b67462416 Merge pull request #147 from cordoval/update-translation Manuel Raynaud 2013-12-14 08:23:37 -08:00
  • 06fa5fa1e5 update profil translation Luis Cordova 2013-12-14 17:18:44 +01:00
  • 412e5e9253 comment missing js file Manuel Raynaud 2013-12-14 15:19:34 +01:00
  • 463cb12c08 Merge pull request #146 from thelia/adminLog Manuel Raynaud 2013-12-14 05:20:46 -08:00
  • f4c5f23d00 Change AdminLog logging request behavior, fixing issue #145 Manuel Raynaud 2013-12-14 14:16:45 +01:00
  • aa66067f0e fix bad product assignation in feature_value loop Manuel Raynaud 2013-12-14 13:50:55 +01:00
  • 48e31b1145 fix link in admin footer Manuel Raynaud 2013-12-14 13:27:09 +01:00
  • 76cd704f80 review tests Etienne Roudeix 2013-12-12 15:56:13 +01:00
  • 162f364df6 reveiw test Etienne Roudeix 2013-12-12 15:55:52 +01:00
  • d1a1e14c0a fix test Etienne Roudeix 2013-12-12 15:54:52 +01:00
  • 297f197fed Merge branch 'cleanmaster' into modules Etienne Roudeix 2013-12-12 15:45:45 +01:00
  • 65df33d0b7 Merge branch 'master' of github.com:thelia/thelia into cleanmaster Etienne Roudeix 2013-12-12 15:45:16 +01:00
  • c9e052188c images are positionable Etienne Roudeix 2013-12-12 15:41:35 +01:00
  • 93537b8d71 in progress : reorder image Etienne Roudeix 2013-12-12 15:30:10 +01:00
  • 681ac83334 Add try catch for urlRewrite touffies 2013-12-11 21:03:31 +01:00
  • bc992811d4 Add new method redirectToListTemplateById touffies 2013-12-11 21:01:56 +01:00
  • c0ee124d17 Remove constraint NotBlank touffies 2013-12-11 20:58:57 +01:00
  • a987808bdf Add new method redirectToListTemplateWithId touffies 2013-12-11 20:58:00 +01:00
  • 890f52da54 Add hidden field category_id touffies 2013-12-11 20:56:04 +01:00
  • 4990d0fd7b Fix duplicate route id touffies 2013-12-11 20:55:00 +01:00
  • ae8f4021c6 Pass the object id to the request touffies 2013-12-11 20:54:30 +01:00
  • 8034ddcc4d Add comments touffies 2013-12-11 20:53:30 +01:00
  • 129ae36182 Merge pull request #141 from Boyquotes/master Manuel Raynaud 2013-12-11 11:44:13 -08:00
  • 7eca83889a Merge branch 'master' into frontend touffies 2013-12-11 18:54:50 +01:00
  • eae8ffe764 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend touffies 2013-12-11 18:53:42 +01:00
  • f1530fa6f9 Display error message if exist (INCLUDE notifications.html) touffies 2013-12-11 18:53:17 +01:00
  • 28e70787ab Define close_url touffies 2013-12-11 18:47:30 +01:00
  • dee49ac213 Add comments touffies 2013-12-11 18:44:25 +01:00
  • b46a8fd1f2 Define close_url variable touffies 2013-12-11 18:43:43 +01:00
  • 12d4c0fdfd Keep hidden field for local touffies 2013-12-11 18:40:42 +01:00
  • 01850c7d17 - Define close_url - Use notifications.html touffies 2013-12-11 18:33:03 +01:00
  • 1b07e55396 Use $locale instead of $this->getCurrentEditionLocale() in the hydrateSeoForm method touffies 2013-12-11 18:14:48 +01:00
  • 8c20202778 Add dismissable touffies 2013-12-11 18:13:28 +01:00
  • ff828bf1ba test rewritten url reassignment Etienne Roudeix 2013-12-11 13:10:03 +01:00
  • 6acb1924d8 test url reassignment Etienne Roudeix 2013-12-11 13:07:02 +01:00
  • 02b9d2e509 Merge branch 'cleanmaster' into modules Etienne Roudeix 2013-12-10 15:57:37 +01:00
  • 63f48b79da fix rewrinting tests Etienne Roudeix 2013-12-10 15:56:59 +01:00
  • f9d4fe1e5c Merge branch 'master' of github.com:thelia/thelia into cleanmaster Etienne Roudeix 2013-12-10 15:55:07 +01:00
  • 83cac71895 fix urls in loops Etienne Roudeix 2013-12-10 15:48:22 +01:00
  • c31edf6842 Merge pull request #142 from gmorel/back_office_french_translation Manuel Raynaud 2013-12-10 04:58:33 -08:00
  • 60cb9cd52b Fix typo : attributes = déclinaisons gmorel 2013-12-10 11:00:55 +01:00
  • 2d781931aa Traduction front Nicolas Villa 2013-12-10 10:17:54 +01:00
  • f51d540950 Wrong Form Action for SEO touffies 2013-12-09 16:45:06 +01:00