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

Commit Graph

  • eca8b01fb6 revert last conflic Manuel Raynaud 2013-12-09 16:18:59 +01:00
  • 462b2bec5e Merge branch 'master' into frontend Manuel Raynaud 2013-12-09 16:15:58 +01:00
  • f34a4a066d Remove RewrittenUrlTestTrait from content touffies 2013-12-09 15:40:23 +01:00
  • 4c9eff379a Merge pull request #138 from gmorel/french_translation Manuel Raynaud 2013-12-09 06:39:21 -08:00
  • 95d327f976 fix tests Etienne Roudeix 2013-12-09 15:31:27 +01:00
  • 50d638bb23 Remove test setURL touffies 2013-12-09 15:30:04 +01:00
  • 6648613772 Merge branch 'frontend' of https://github.com/thelia/thelia into frontend touffies 2013-12-09 15:22:17 +01:00
  • 2f37f339ee Adding translation for Backoffice gmorel 2013-12-09 15:18:18 +01:00
  • 80eb4b7bd0 Adding translation for Backoffice gmorel 2013-12-09 15:17:37 +01:00
  • c110e4e812 Adding translation for Backoffice gmorel 2013-12-09 15:07:56 +01:00
  • 5c602bc2cb Translation replace tab by 4 spaces gmorel 2013-12-09 15:05:16 +01:00
  • 601aaf311d Adding translation for Backoffice gmorel 2013-12-09 14:49:12 +01:00
  • b8b6887fea Fix typo gmorel 2013-12-09 14:36:10 +01:00
  • f31ed34ee3 Fix typo gmorel 2013-12-09 14:30:34 +01:00
  • fcb626e784 Fix typo gmorel 2013-12-09 14:28:50 +01:00
  • 7f33c86d75 Adding translation for Backoffice gmorel 2013-12-09 14:28:14 +01:00
  • 83356ab867 Fix typo gmorel 2013-12-09 14:12:09 +01:00
  • 5f833f256f Adding translation for Backoffice gmorel 2013-12-09 14:03:30 +01:00
  • d658351343 Fix typo gmorel 2013-12-09 14:02:05 +01:00
  • ae88efd282 Adding translation for Backoffice gmorel 2013-12-09 13:16:25 +01:00
  • a064489fe4 Adding translation for Backoffice gmorel 2013-12-09 13:12:32 +01:00
  • 502a171c0d Adding translation for Backoffice gmorel 2013-12-09 12:55:49 +01:00
  • d769f51186 Fix typo gmorel 2013-12-09 12:52:27 +01:00
  • 8ba353dd6c Adding translation for Backoffice gmorel 2013-12-09 12:50:23 +01:00
  • 0d69d226f3 Adding translation for Backoffice gmorel 2013-12-09 12:38:50 +01:00
  • 80d1656762 Adding translation for Backoffice gmorel 2013-12-09 12:34:00 +01:00
  • 28d2add37d fix tests Etienne Roudeix 2013-12-09 15:02:09 +01:00
  • cd0c3342e2 Add missing page for folder touffies 2013-12-09 14:34:37 +01:00
  • d476672150 Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT touffies 2013-12-09 14:34:07 +01:00
  • 0684ec2b42 Rename meta_keyword to meta_keywords Add SEO to folder touffies 2013-12-09 10:00:10 +01:00
  • 0d8e9437b1 Remove space before Doctype HTML touffies 2013-12-06 10:34:59 +01:00
  • d6f39787d0 Add to the context the site URL based on the language (Used in the SEO tab) touffies 2013-11-29 14:30:40 +01:00
  • 71302493c1 Add a new method to get the site URL based on the language touffies 2013-11-29 14:29:12 +01:00
  • 3d48eab76c Remove unused variable $current_id touffies 2013-11-29 14:28:19 +01:00
  • 2d9e2df5a4 Missing hidden field product_id for the redirection when the user click "Save" touffies 2013-11-29 09:51:10 +01:00
  • c1140ec279 Extend AbstractCrudController to manage the SEO methods touffies 2013-11-29 09:50:13 +01:00
  • 5980ff44fc Hydrate SeoForm under SEO Tab touffies 2013-11-28 12:12:24 +01:00
  • 083f3bfa8c Move URL to SeoForm (SEO tab) touffies 2013-11-28 12:11:45 +01:00
  • 6447385605 Add Action + Event to manage SEO information touffies 2013-11-28 12:10:10 +01:00
  • 9bbaaf75a4 Add new route to save the product SEO information touffies 2013-11-28 12:07:03 +01:00
  • 9d88552492 Add action buttons at the bottom of the product General tab touffies 2013-11-28 12:06:19 +01:00
  • ba48bc985e Add SEO tab for a product touffies 2013-11-28 12:05:03 +01:00
  • 945921048e Add new SEO form touffies 2013-11-28 12:03:32 +01:00
  • 0d5cfd29e0 Add new fields (meta_title, meta_description and meta_keyword) under I18N Product touffies 2013-11-28 12:00:07 +01:00
  • 79e4193791 Merge branch 'master' of github.com:thelia/thelia into cleanmaster Etienne Roudeix 2013-12-09 13:02:04 +01:00
  • 090b201fea test rewriting Etienne Roudeix 2013-12-09 13:01:39 +01:00
  • 80a17e6438 Merge pull request #135 from gmorel/french_translation Manuel Raynaud 2013-12-09 03:22:07 -08:00
  • c88d9ccf6f Merge pull request #137 from thelia/adminInclude Manuel Raynaud 2013-12-09 03:19:57 -08:00
  • bf64cd117e Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur Franck Allimant 2013-12-05 18:08:36 +01:00
  • 8944446776 display admin hook if in debug mode and specific parameter in url Manuel Raynaud 2013-12-09 12:11:20 +01:00
  • 1e8fee99cb Merge branch 'master' of github.com:thelia/thelia into cleanmaster Etienne Roudeix 2013-12-09 11:28:47 +01:00
  • f4a2744d19 url management in backoffice Etienne Roudeix 2013-12-09 11:28:13 +01:00
  • adc7773f96 Merge pull request #136 from mespeche/master Manuel Raynaud 2013-12-09 01:44:57 -08:00
  • 706becf574 complete readme file Manuel Raynaud 2013-12-09 10:42:54 +01:00
  • 990cda786d Add of hook module to content and folder edition page. Michaël Espeche 2013-12-09 10:36:09 +01:00
  • cc4fce9add Merge branch 'master' of github.com:thelia/thelia into cleanmaster Etienne Roudeix 2013-12-09 10:29:49 +01:00
  • 9885c67ade add some phpdoc in TheliaEvents class Manuel Raynaud 2013-12-09 09:45:06 +01:00
  • 10c662d24d Merge pull request #134 from gmorel/french_translation Manuel Raynaud 2013-12-08 01:36:58 -08:00
  • 592b306b9e Fixed nt,-group css rule which caused garbage in top bar buttons Franck Allimant 2013-12-07 09:58:01 +01:00
  • 8c864021f5 Added sorting and position ùmanagement to modules. Franck Allimant 2013-12-06 18:59:46 +01:00
  • c773e2fd4e Merge remote-tracking branch 'origin/french_translation' into french_translation gmorel 2013-12-06 17:22:33 +01:00
  • 40c47affec Adding translation for Backoffice gmorel 2013-12-06 14:34:33 +01:00
  • 3f8e1dc89b Adding translation for Backoffice gmorel 2013-12-06 10:09:09 +01:00
  • e96088080d Merge branch 'master' into modules Franck Allimant 2013-12-06 17:16:14 +01:00
  • 14e7181d06 rewritten url update Etienne Roudeix 2013-12-06 16:35:14 +01:00
  • a3570b4e16 Merge branch 'master' of github.com:thelia/thelia Manuel Raynaud 2013-12-06 16:00:37 +01:00
  • 71d9524291 fix wrong integration in product template Manuel Raynaud 2013-12-06 16:00:15 +01:00
  • 2e1a6a3136 Adding translation for Backoffice gmorel 2013-12-06 14:34:33 +01:00
  • 0fcbb409e3 Factorized URL desactivation in UrlRewritingTrait::markRewritenUrlObsolete() Franck Allimant 2013-12-06 12:26:39 +01:00
  • c703f25f73 Merge branch 'master' of github.com:thelia/thelia into cleanmaster Etienne Roudeix 2013-12-06 11:51:10 +01:00
  • 926ff410d1 fix #128 Etienne Roudeix 2013-12-06 11:50:29 +01:00
  • 06c875455f remove unused constant events Manuel Raynaud 2013-12-06 11:27:32 +01:00
  • d06e0a14cf Merge branch 'master' of github.com:thelia/thelia into cleanmaster Etienne Roudeix 2013-12-06 11:20:53 +01:00
  • a9a2a256fa fix updatePositionDownTest Etienne Roudeix 2013-12-06 11:20:15 +01:00
  • 5b0307b5b3 Merge branch 'master' of https://github.com/thelia/thelia Franck Allimant 2013-12-06 10:44:39 +01:00
  • 52c7c6c9f7 Added translation of email templates Franck Allimant 2013-12-06 10:44:06 +01:00
  • 0c5683ef25 fix close #131 Etienne Roudeix 2013-12-06 10:37:08 +01:00
  • 8de2259bcb Adding translation for Backoffice gmorel 2013-12-06 10:09:09 +01:00
  • 4663a8635c Merge branch 'master' of https://github.com/thelia/thelia into french_translation gmorel 2013-12-06 09:50:47 +01:00
  • 0c107fbebf Merge branch 'master' of https://github.com/thelia/thelia Franck Allimant 2013-12-05 18:50:13 +01:00
  • c2292b75d4 Fixed issue #123. Introduced NumberFormat::formatStandardNumber() Franck Allimant 2013-12-05 18:46:35 +01:00
  • 84ebd9ee67 Merge pull request #129 from gmorel/french_translation Manuel Raynaud 2013-12-05 09:29:37 -08:00
  • e53588e8f0 Adding translation for Backoffice gmorel 2013-12-05 18:24:47 +01:00
  • 8ccc6cbc9b Merge branch 'master' of https://github.com/thelia/thelia into french_translation gmorel 2013-12-05 18:20:36 +01:00
  • e7d22f9c0a Adding translation for Backoffice gmorel 2013-12-05 18:20:10 +01:00
  • 5dfe8584ae Removed forgotten echo Franck Allimant 2013-12-05 18:08:36 +01:00
  • 7bcd04dd38 Merge branch 'master' of https://github.com/thelia/thelia into french_translation gmorel 2013-12-05 17:26:19 +01:00
  • 5857c07ef0 Fixed issue 118 Franck Allimant 2013-12-05 15:57:56 +01:00
  • 82119a171f Merge branch 'master' of https://github.com/thelia/thelia Franck Allimant 2013-12-05 13:03:01 +01:00
  • de0542b33c Changed direct accesses to verifyStok by calls to checkAvailableStock Franck Allimant 2013-12-05 13:02:13 +01:00
  • 8e56fcc651 Fixed exception when log file could not be renamed Franck Allimant 2013-12-05 13:01:43 +01:00
  • 0a7b8f05d0 Added checkAvailableStock(), changed getPassedUrlView() to getObsoleteRewrittenUrlView() Franck Allimant 2013-12-05 13:01:09 +01:00
  • 97a8d6d3bf Fixed button wrapping when in tight spaces (e.g, tables) Franck Allimant 2013-12-05 12:57:47 +01:00
  • e262bbc9ea Added config variable titles Franck Allimant 2013-12-05 12:57:28 +01:00
  • 1416265053 Fixed improper translations Franck Allimant 2013-12-05 11:05:08 +01:00
  • 0cf7b42696 Merge pull request #127 from stephaniepinet/patch-1 Manuel Raynaud 2013-12-05 02:03:57 -08:00
  • cf980aeb89 Update CHANGELOG.txt stephaniepinet 2013-12-05 11:01:50 +01:00
  • 2a667b4261 Merge branch 'master' of https://github.com/thelia/thelia into french_translation gmorel 2013-12-05 10:46:53 +01:00
  • 4ca72eb879 Merge pull request #126 from gmorel/french_translation Manuel Raynaud 2013-12-05 00:11:12 -08:00
  • db0b9e3d99 Adding translation for Backoffice gmorel 2013-12-04 17:02:25 +01:00