Etienne Roudeix
c5e69ebbb9
Merge branch 'cleanmaster' into modules
2013-12-16 10:56:40 +01:00
Etienne Roudeix
583cbe95b6
document positioning
2013-12-16 10:55:18 +01:00
Etienne Roudeix
536c88b4f8
Merge branch 'cleanmaster' into modules
...
Conflicts:
core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
2013-12-16 09:57:35 +01:00
Manuel Raynaud
f4c5f23d00
Change AdminLog logging request behavior, fixing issue #145
2013-12-14 14:16:45 +01:00
Etienne Roudeix
297f197fed
Merge branch 'cleanmaster' into modules
2013-12-12 15:45:45 +01:00
Etienne Roudeix
c9e052188c
images are positionable
2013-12-12 15:41:35 +01:00
Etienne Roudeix
93537b8d71
in progress : reorder image
2013-12-12 15:30:10 +01:00
Franck Allimant
8c864021f5
Added sorting and position ùmanagement to modules.
2013-12-06 18:59:46 +01:00
Franck Allimant
e96088080d
Merge branch 'master' into modules
2013-12-06 17:16:14 +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
Etienne Roudeix
81fa5a291c
fix tax rules issue
2013-11-28 15:31:09 +01:00
Etienne Roudeix
247ed6aa2a
Merge branch 'master' into modules
...
Conflicts:
core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
2013-11-28 10:34:57 +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
Etienne Roudeix
2bc1bbed64
asset tests
2013-11-25 10:03:48 +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
OpenStudio
89e0bf8867
move front controller classes to Front module
2013-11-18 10:51:46 +01:00
Etienne Roudeix
8cd32aa5dd
Merge branch 'modules'
2013-11-14 12:04:20 +01:00
Etienne Roudeix
fa127ed4f0
colissimo module
2013-11-14 11:53:29 +01:00
Etienne Roudeix
48409c29a9
Colissimo in progress
2013-11-14 11:21:34 +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
touffies
15b1acd2e6
Remove duplicate request to get the $deliveryAddress
2013-11-08 16:28:16 +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
Manuel Raynaud
e760cc28aa
end controller refactor
2013-11-08 11:48:08 +01:00
Etienne Roudeix
99ad2d6820
Merge branch 'master' of github.com:thelia/thelia
2013-11-08 11:26:22 +01:00
Etienne Roudeix
422a80fcce
module modification
2013-11-08 11:26:06 +01:00
Manuel Raynaud
0f1e071967
remove unused controller
2013-11-08 10:04:33 +01:00
Manuel Raynaud
d80bf97b33
refactor pdf generator in front part
2013-11-08 09:59:46 +01:00
Manuel Raynaud
07b88266e9
refactor pdf generator
2013-11-08 09:41:20 +01:00
touffies
555040fcab
Add PDF for Order Details on the account page
2013-11-07 17:15:47 +01:00
touffies
aa7efb0e9a
Issue 61
...
Add the newsletter registration on Register page
2013-11-07 12:35:34 +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
