Franck Allimant
811e89f740
PHP-CS fixer pass
2014-07-01 01:07:56 +02:00
Franck Allimant
c1e3694ab8
Typo
2014-06-30 23:02:03 +02:00
Franck Allimant
4f7f26380a
Fixed some more method comments
2014-06-30 19:30:00 +02:00
Franck Allimant
e972a4be60
Fixed renderRaw method comment
2014-06-30 19:24:47 +02:00
Franck Allimant
392abff271
Free shipping for selected countries and/or shipping methods
2014-05-15 20:25:22 +02:00
Manuel Raynaud
53a94c7312
add route parameters to redirectToRoute method in BaseFrontController
2014-04-23 20:48:17 +02:00
Manuel Raynaud
5e65bf0b8a
change license header
2014-04-18 09:36:41 +02:00
Manuel Raynaud
b60abb206b
fix cs
2014-04-11 09:36:43 +02:00
Franck Allimant
93d5444b8b
Fixed comments
2014-04-11 02:22:18 +02:00
Manuel Raynaud
a27e317245
update phpDoc and fix cs
2014-03-05 15:12:11 +01:00
Franck Allimant
89653f452b
Removes container from all Thelia actions, but Modules ( #198 )
2014-01-31 20:06:42 +01:00
Manuel Raynaud
1974d3e3c3
fix psr
2014-01-22 12:52:36 +01:00
Etienne Roudeix
99038e688a
Revert "Revert "Merge branch 'cleanmaster' into modules""
...
This reverts commit b3ac365b45
2014-01-06 11:25:25 +01:00
Etienne Roudeix
b3ac365b45
Revert "Merge branch 'cleanmaster' into modules"
...
This reverts commit d0ff5260f767d0101dbe
2013-12-20 11:16:42 +01:00
Etienne Roudeix
d0ff5260f7
Merge branch 'cleanmaster' into modules
...
Conflicts:
core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
core/lib/Thelia/Core/Template/Loop/Template.php
core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
core/lib/Thelia/Core/Template/TemplateDefinition.php
core/lib/Thelia/Core/Template/TemplateHelper.php
core/lib/Thelia/Core/Thelia.php
2013-12-20 11:16:35 +01:00
Manuel Raynaud
2f4158d1f6
fix cs
2013-12-18 10:04:13 +01:00
Etienne Roudeix
2bc1bbed64
asset tests
2013-11-25 10:03:48 +01:00
OpenStudio
89e0bf8867
move front controller classes to Front module
2013-11-18 10:51:46 +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
77760e7d3f
module template inclusion
2013-11-13 14:48:35 +01:00
touffies
15b1acd2e6
Remove duplicate request to get the $deliveryAddress
2013-11-08 16:28:16 +01:00
Manuel Raynaud
e760cc28aa
end controller refactor
2013-11-08 11:48:08 +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
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
touffies
5bf9050a12
Delete address with ajax callback function address.delete()
2013-11-05 17:33:55 +01:00
touffies
65a8953143
Profile and Useful was misspelled
...
Add missing language key into the dictionary
2013-11-04 16:35:01 +01:00
touffies
fb4fc4bb59
Modify the register route into the redirectToRoute
2013-10-28 13:00:33 +01:00
touffies
54e946ce82
Change login route
2013-10-28 12:59:17 +01:00
Manuel Raynaud
2c030f910b
fix cs
2013-10-25 10:07:21 +02:00
touffies
64985faedc
small fix
2013-10-24 19:49:52 +02:00
touffies
b0fb0fdd43
I need the route cart.view for the OrderException.php file.
2013-10-24 19:39:54 +02:00
touffies
ca5d7d2a00
Change some route to use the default
...
$this->redirectToRoute('default', array('view'=>'cart'));
2013-10-24 18:51:49 +02:00
touffies
ebec82d1d2
Merge with master
2013-10-24 16:52:03 +02:00
Etienne Roudeix
ca03e374f2
newsletter modification from account
...
email modification from account
2013-10-24 12:10:35 +02:00
touffies
009e779110
Update profil [It's not working yet]
2013-10-24 00:19:00 +02:00
badsuricate
6fb6cc9679
Merge frontend
2013-10-23 16:47:24 +02:00
badsuricate
77959afefa
Add AJAX on "Add to Cart" buttons
2013-10-23 15:33:47 +02:00
touffies
a91303a27d
Add new method updatePasswordAction (Not finished)
2013-10-23 00:07:27 +02:00
gmorel
b45fbef2ad
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia : (33 commits)
permissions
finish contact process
create contact form
create example for mail usage
permission cleanup
change place where absolute url is create when rewritten url is enabled
fix issue #43
fix typo in product breadcrumb
update countries list
fix issue #35
fix cartItem updateQuantity method
add some verification on country default trigger
not allowed to delete default country
WIP : admin profiles
fiw test suite
clear cache when a module is removed
end module removal
create event object for module delete action
update insert script
new model
...
Conflicts:
core/lib/Thelia/Controller/Admin/CouponController.php
2013-10-22 23:01:04 +02:00
touffies
ac70075a38
Newsletter subscription with ajax
2013-10-22 22:26:33 +02:00
Manuel Raynaud
0580539ed8
fix cart quantity for issue #46
2013-10-22 17:19:16 +02:00
touffies
a9dd13ae70
Oups... I forgot to rename CustomerCreation into CustomerCreateForm
2013-10-22 15:50:04 +02:00
touffies
8f48a56774
Contact page integration
2013-10-22 15:30:14 +02:00
Manuel Raynaud
cc4f4f0bbe
create newsletter template
2013-10-22 10:49:30 +02:00
