touffies
1b07e55396
Use $locale instead of $this->getCurrentEditionLocale() in the hydrateSeoForm method
2013-12-11 18:14:48 +01:00
touffies
d476672150
Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT
2013-12-09 15:00:51 +01:00
touffies
d6f39787d0
Add to the context the site URL based on the language (Used in the SEO tab)
2013-12-09 14:52:45 +01:00
touffies
71302493c1
Add a new method to get the site URL based on the language
2013-12-09 14:52:45 +01:00
touffies
c1140ec279
Extend AbstractCrudController to manage the SEO methods
2013-12-09 14:52:44 +01:00
touffies
5980ff44fc
Hydrate SeoForm under SEO Tab
2013-12-09 14:52:44 +01:00
touffies
6447385605
Add Action + Event to manage SEO information
2013-12-09 14:51:51 +01:00
Franck Allimant
5b0307b5b3
Merge branch 'master' of https://github.com/thelia/thelia
2013-12-06 10:44:39 +01:00
Franck Allimant
52c7c6c9f7
Added translation of email templates
2013-12-06 10:44:06 +01:00
Etienne Roudeix
0c5683ef25
fix close #131
2013-12-06 10:37:08 +01:00
Franck Allimant
c2292b75d4
Fixed issue #123 . Introduced NumberFormat::formatStandardNumber()
2013-12-05 18:46:35 +01:00
Franck Allimant
5857c07ef0
Fixed issue 118
2013-12-05 15:57:56 +01:00
gmorel
ffc699fa7f
Merge branch 'master' of git://github.com/thelia/thelia
...
* 'master' of git://github.com/thelia/thelia:
fix typo
Implemented mail messages templates and layouts
Email template + test email
add REF to product_sale_element loop and fix product tempalte
Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
Add correct url(subdiretory included) in config page
Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
2013-11-28 20:58:24 +01:00
Franck Allimant
33e0a854f2
Implemented mail messages templates and layouts
2013-11-27 21:21:07 +01:00
gmorel
67a38bca20
Merge branch 'master' of git://github.com/thelia/thelia
...
* 'master' of git://github.com/thelia/thelia:
Check if store_country has a value
Fixed double '/' in generated assets URLs
Add validation for Store configuration
Use Store contact information
Call the wrong AdminResources in saveAction
Action buttons smaller
Replace company_name and contact_email by store_name & store_email
Add a new admin page to manage the basic store configurations
Add routing for Store Configuration
Add argument Title on Content Loop & Folder Loop
2013-11-25 22:43:04 +01:00
gmorel
ffbd53fceb
Coupon : Fix namespace issues
2013-11-24 22:05:58 +01:00
gmorel
90b5fbde05
Refactor removing Manager notion
2013-11-23 20:18:04 +01:00
touffies
4ef7bd4c38
Call the wrong AdminResources in saveAction
2013-11-22 17:42:09 +01:00
touffies
29ae2d26fe
Add a new admin page to manage the basic store configurations
2013-11-22 17:38:21 +01:00
gmorel
968bddbcf9
Fix Coupon/Condition refactor
2013-11-19 13:15:23 +01:00
Etienne Roudeix
8cd32aa5dd
Merge branch 'modules'
2013-11-14 12:04:20 +01:00
Etienne Roudeix
299b192018
Colissimo module + countires areas
2013-11-14 09:13:28 +01:00
Manuel Raynaud
c5d6157cd5
change translation template baseDir
2013-11-13 16:27:36 +01:00
Etienne Roudeix
77760e7d3f
module template inclusion
2013-11-13 14:48:35 +01:00
touffies
d1b897a254
Merge branch 'master' into frontend
...
Conflicts:
core/lib/Thelia/Controller/Admin/OrderController.php
2013-11-12 11:20:46 +01:00
Franck Allimant
d2087b994a
Fixed customer edit routes
2013-11-09 19:38:38 +01:00
Franck Allimant
f6fc886d06
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
core/lib/Thelia/Controller/Admin/CustomerController.php
2013-11-09 18:31:52 +01:00
Franck Allimant
ac74c1d61d
Refactored back-office customer management
2013-11-09 18:28:01 +01:00
Etienne Roudeix
417ed2e324
change signature
2013-11-08 14:35:29 +01:00
touffies
10632f990b
Merge branch 'master' into frontend
2013-11-08 14:34:12 +01:00
Etienne Roudeix
422a80fcce
module modification
2013-11-08 11:26:06 +01:00
Manuel Raynaud
07b88266e9
refactor pdf generator
2013-11-08 09:41:20 +01:00
Franck Allimant
f8f68eb59b
Fixed minor internationalizable string error in admin templates.
2013-11-06 20:01:26 +01:00
Franck Allimant
8d40605091
Continued on translations
2013-11-06 14:40:33 +01:00
Manuel Raynaud
b1517945f4
Merge branch 'modules'
...
Conflicts:
core/lib/Thelia/Controller/Admin/BaseAdminController.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
core/lib/Thelia/Core/Thelia.php
2013-11-06 14:37:31 +01:00
Manuel Raynaud
6e5ae0f634
refactor render template process
2013-11-06 13:48:32 +01:00
Manuel Raynaud
2d291cf5a0
refactor how to assign template to parser
2013-11-06 11:12:39 +01:00
Franck Allimant
361e4a9d74
Implementing translations (still in progress)
2013-11-06 10:49:03 +01:00
Etienne Roudeix
06ee460e8a
Merge branch 'master' of github.com:thelia/thelia
2013-11-04 16:16:21 +01:00
Etienne Roudeix
969c077f81
admin home stats and information
2013-11-04 16:15:48 +01:00
Franck Allimant
2aefb87db7
Finished log configuration. All loggers are currentrly working
2013-11-01 16:15:19 +01:00
Etienne Roudeix
899a154350
Merge branch 'master' of github.com:thelia/thelia
2013-10-31 15:33:30 +01:00
Franck Allimant
3b9f94cec8
Using now templates instead of hard code in AdminUtilities smarty plugin
2013-10-31 12:16:14 +01:00
Etienne Roudeix
00dab8e7ec
review jqplot
2013-10-31 11:20:51 +01:00
Etienne Roudeix
e5f5570d2b
Merge branch 'master' of github.com:thelia/thelia
2013-10-31 11:20:42 +01:00
Franck Allimant
d1c54ea62a
Merge branch 'catalog'
...
Conflicts:
core/lib/Thelia/Core/Template/Smarty/Plugins/Format.php
2013-10-30 19:55:10 +01:00
Franck Allimant
f5828dc18b
added timestamp parameter to format_date sparty plugin
2013-10-30 19:52:47 +01:00
Etienne Roudeix
f90df03f7d
admin home stats
2013-10-30 17:00:38 +01:00
Etienne Roudeix
083dde5e93
admin home stats
2013-10-30 16:32:24 +01:00
Manuel Raynaud
86d84462ad
clean some code in FileController
2013-10-30 16:13:06 +01:00
