Commit Graph

  • 2aa8d804b0 Changed condition parameter name Franck Allimant 2014-05-10 01:36:11 +02:00
  • 861e6b0513 Changed condition parameter name Franck Allimant 2014-05-10 01:35:28 +02:00
  • 5bcb08846f Changed condition parameter name Franck Allimant 2014-05-10 01:32:46 +02:00
  • 612613fd71 Changed condition parameter names Franck Allimant 2014-05-10 01:32:14 +02:00
  • d14321ffd8 Improved error message Franck Allimant 2014-05-10 01:31:32 +02:00
  • c671a1ff5e Changed coupon condition parameter variables name Franck Allimant 2014-05-10 01:30:22 +02:00
  • 06d7eb4fc1 Implemented getDeliveryAddress() Franck Allimant 2014-05-10 01:29:54 +02:00
  • f83c9f05fd Fixed Equals and No Equals labels Franck Allimant 2014-05-10 01:29:12 +02:00
  • 45c32271b7 Removed duplicate condition Franck Allimant 2014-05-10 01:28:42 +02:00
  • 7bb0368d7f Very minor improvement on conditions evaluation Franck Allimant 2014-05-10 01:28:03 +02:00
  • 8054149dbd Added country condition Franck Allimant 2014-05-10 01:12:06 +02:00
  • a536eb5de7 Fix: save condition button should be hidden after adding condition Franck Allimant 2014-05-10 01:09:43 +02:00
  • 073905200e Added delivery country condition Franck Allimant 2014-05-10 00:10:32 +02:00
  • 86ab5fa368 reorder the {module_include location='customer_list_header'} in the template customers after firstname and lastname like the body of the table Guillaume Barral 2014-05-09 14:40:18 +02:00
  • cac067ebb4 Merge pull request #394 from lunika/install Manuel Raynaud 2014-05-09 11:20:06 +02:00
  • 9e52f734cb test variable before using it Manuel Raynaud 2014-05-09 11:15:07 +02:00
  • 1287823d3b Merge pull request #393 from lunika/minorFix Manuel Raynaud 2014-05-09 11:03:44 +02:00
  • 3f25fbc10f install is in debug nox for displaying helpfull error messages Manuel Raynaud 2014-05-09 11:01:05 +02:00
  • 85d80d1d77 fix minor bug Manuel Raynaud 2014-05-09 10:55:50 +02:00
  • d9d350ea24 Merge pull request #381 from moustikAir/doc-mysql56 Manuel Raynaud 2014-05-06 21:03:00 +02:00
  • a559efc299 Merge branch 'master' into doc-mysql56 David Rimbault 2014-05-06 19:19:52 +02:00
  • 4d724aa8d6 Merge pull request #387 from lunika/2.0.1 Manuel Raynaud 2014-05-06 15:36:27 +02:00
  • 36e4f25c6d change downlod link on admin homepage Manuel Raynaud 2014-05-06 15:28:53 +02:00
  • c2da25d40e Merge pull request #388 from roadster31/coupons Manuel Raynaud 2014-05-06 15:24:19 +02:00
  • 2ca655dc8b Removed header titles from the pges that have one Franck Allimant 2014-05-06 15:21:08 +02:00
  • 772aba093b increment thelia version Manuel Raynaud 2014-05-06 15:04:05 +02:00
  • a854d848ae Merge pull request #386 from lunika/changelog Manuel Raynaud 2014-05-06 14:55:15 +02:00
  • 994c5281b4 update changelog Manuel Raynaud 2014-05-05 11:20:48 +02:00
  • 5de9244672 Merge pull request #385 from lunika/uploadFile Manuel Raynaud 2014-05-06 14:07:22 +02:00
  • 364ff7486d add method post on upload form Manuel Raynaud 2014-05-06 14:06:43 +02:00
  • a0f3a913cb Merge pull request #384 from Yochima/new-branch Manuel Raynaud 2014-05-06 14:05:35 +02:00
  • e568ed67ce Allow to use configDir in module Guillaume Barral 2014-05-06 11:50:05 +02:00
  • 41612cbf1c Merge pull request #383 from lunika/translation Manuel Raynaud 2014-05-06 11:21:25 +02:00
  • 5231a76f51 add new languages in dsl scripts Manuel Raynaud 2014-05-06 11:13:29 +02:00
  • d4ade9afc0 integration of Czech translation Manuel Raynaud 2014-05-06 11:07:09 +02:00
  • fa71c8c4d5 integration of russian translation Manuel Raynaud 2014-05-06 11:01:32 +02:00
  • 4cd2ea6316 complete lang form including money format Manuel Raynaud 2014-05-06 10:53:16 +02:00
  • ca1cb6e4d1 Merge pull request #382 from bibich/improvements Manuel Raynaud 2014-05-06 09:40:37 +02:00
  • dad74ba290 added missing dependency Julien Chanséaume 2014-05-06 09:32:59 +02:00
  • bb43a12fba Some tweaks added. We can now override module assets by redefining them in the template. if they are not in the template, it takes them from the module. Julien Chanséaume 2014-05-06 09:23:38 +02:00
  • 4d177d70f4 One little modification on formatting David Rimbault 2014-05-05 23:56:44 +02:00
  • d49f764bbc Updated README David Rimbault 2014-05-05 23:45:02 +02:00
  • 4985834cb9 Merge pull request #380 from lunika/module Manuel Raynaud 2014-05-05 16:05:24 +02:00
  • c39d587c25 change status of the toggle button when module activation fails. Fix #287 Manuel Raynaud 2014-05-05 16:05:03 +02:00
  • 5b968dbaa7 Merge pull request #379 from lunika/delivery Manuel Raynaud 2014-05-05 14:47:31 +02:00
  • d5c5e167a6 check shipping configuration in delivery loop. Fix #311 Manuel Raynaud 2014-05-05 14:37:44 +02:00
  • b09a73af1c Merge pull request #378 from lunika/translation Manuel Raynaud 2014-05-05 12:43:42 +02:00
  • fcceef8ab8 add missing english translations Manuel Raynaud 2014-05-05 12:42:50 +02:00
  • 50696a50c7 Merge pull request #377 from lunika/mail Manuel Raynaud 2014-05-05 12:17:32 +02:00
  • 827f51a820 display city instead of coutry in pdf. Fix #358 Manuel Raynaud 2014-05-05 11:59:51 +02:00
  • 65be312137 update email translations Manuel Raynaud 2014-05-05 11:46:23 +02:00
  • 5ffd01e99f check if a country is available before displaying it. Fix #359 Manuel Raynaud 2014-05-05 11:42:12 +02:00
  • 793e66af74 Merge pull request #371 from roadster31/coupons Manuel Raynaud 2014-05-05 10:58:59 +02:00
  • 4673a14b76 Typo Franck Allimant 2014-05-05 10:04:38 +02:00
  • 51b97c0079 Merge pull request #375 from bibich/feeds Manuel Raynaud 2014-05-05 09:57:21 +02:00
  • 9d3bb09671 Merge pull request #376 from lunika/config Manuel Raynaud 2014-05-05 09:57:12 +02:00
  • ca9d9c89c5 fix wrong smtp config Manuel Raynaud 2014-05-05 09:56:40 +02:00
  • f9e4c33875 No % or money symbol in HTML generated by CouponAbstract Franck Allimant 2014-05-05 09:52:27 +02:00
  • 3fd87f1fa1 updated sql script Julien Chanseaume 2014-05-05 07:34:09 +02:00
  • 2dbee098a1 fixed git conflicts Julien Chanseaume 2014-05-05 07:29:18 +02:00
  • 913ce22724 added french translation Julien Chanseaume 2014-05-05 07:23:48 +02:00
  • bddda57601 small fixes Julien Chanseaume 2014-05-05 07:22:52 +02:00
  • 6e0e6dddd2 updated default front theme to integrate RSS feeds Julien Chanseaume 2014-05-03 16:49:53 +02:00
  • 92a7404a3b new template for generating feeds Julien Chanseaume 2014-05-03 16:48:42 +02:00
  • 7e70ac8ac8 added new route and controller for feeds Julien Chanseaume 2014-05-03 16:48:14 +02:00
  • 17bc8cff70 Merge pull request #374 from bibich/sitemap Manuel Raynaud 2014-05-04 22:54:34 +02:00
  • 091e7f9f64 Re-added the html generatrion code in drawBackOfficeInputs() Franck Allimant 2014-05-04 19:31:41 +02:00
  • fbc4a87d34 updated default front theme to integrate RSS feeds Julien Chanseaume 2014-05-03 16:49:53 +02:00
  • d094fd4969 new template for generating feeds Julien Chanseaume 2014-05-03 16:48:42 +02:00
  • 1749ed7c91 added new route and controller for feeds Julien Chanseaume 2014-05-03 16:48:14 +02:00
  • 457f5dba7c Completed french translation Franck Allimant 2014-05-03 12:39:29 +02:00
  • d42e5cd557 drawBackOfficeInputs is no longer abstract Franck Allimant 2014-05-03 12:23:48 +02:00
  • 22cbadf5d0 fixed conflict in composer.json Julien Chanseaume 2014-05-03 11:42:30 +02:00
  • bd6045f024 added new dependency to composer.lock Julien Chanseaume 2014-05-03 11:38:30 +02:00
  • 751fcdeb59 php cs fixer Julien Chanseaume 2014-05-03 07:12:06 +02:00
  • 02e32d7871 sitemap can be generated according to a specific language and/or specific context (catalog, content) Julien Chanseaume 2014-05-03 07:04:28 +02:00
  • 24f738c4fe change URL to sitemap in robots.txt Julien Chanseaume 2014-05-03 05:57:07 +02:00
  • e2559eeb47 add dependency Julien Chanseaume 2014-05-01 16:06:33 +02:00
  • 5312acabdb Merge pull request #370 from poum/patch-1 Manuel Raynaud 2014-05-03 10:22:25 +02:00
  • ce296f56a5 php cs fixer Julien Chanseaume 2014-05-03 07:12:06 +02:00
  • 92b0f3437c sitemap can be generated according to a specific language and/or specific context (catalog, content) Julien Chanseaume 2014-05-03 07:04:28 +02:00
  • 8e116efe33 change URL to sitemap in robots.txt Julien Chanseaume 2014-05-03 05:57:07 +02:00
  • b3a89f35e3 Changed condition section title Franck Allimant 2014-05-02 20:55:27 +02:00
  • 8c044303f2 drawBackOfficeInputs() is now abstract Franck Allimant 2014-05-02 20:54:53 +02:00
  • 771f59ee47 Fixed condition category tolltip reset Franck Allimant 2014-05-02 20:54:17 +02:00
  • 500a945f98 HTML fragments in templates instead of hardcoded Franck Allimant 2014-05-02 20:52:59 +02:00
  • fe93bfacec Typo Franck Allimant 2014-05-02 20:22:10 +02:00
  • 617f2900e0 Fixed test Franck Allimant 2014-05-02 20:21:33 +02:00
  • 621c17c97d Fixed form error management Franck Allimant 2014-05-02 20:08:38 +02:00
  • 4bab223421 Fixed usage count display Franck Allimant 2014-05-02 20:01:18 +02:00
  • 7781fe5f59 Minor syntax change. Franck Allimant 2014-05-02 20:00:19 +02:00
  • 98f4395a07 Removed unused parser reference in contructor Franck Allimant 2014-05-02 19:59:33 +02:00
  • e0027c7f6e The stanck trace is displayed if an exception is thrown Franck Allimant 2014-05-02 19:58:42 +02:00
  • 8bf94517f2 No longer used Franck Allimant 2014-05-02 18:25:31 +02:00
  • 207911492e Added flags for i18n fields Franck Allimant 2014-05-02 18:25:03 +02:00
  • 23a74999e8 Fixed date manipulation² Franck Allimant 2014-05-02 18:24:15 +02:00
  • 5e3585766d Added a localized check to the expiration date Franck Allimant 2014-05-02 18:23:36 +02:00
  • 3b7589ec84 Removed useless transactions Franck Allimant 2014-05-02 18:23:04 +02:00
  • 7996c866d3 Merge branch 'coupons' of https://github.com/roadster31/thelia into coupons Franck Allimant 2014-05-02 17:16:39 +02:00
  • 9d3dd8687a Added the transformer Franck Allimant 2014-05-02 17:07:06 +02:00