Commit Graph

1480 Commits

Author SHA1 Message Date
badsuricate
77959afefa Add AJAX on "Add to Cart" buttons 2013-10-23 15:33:47 +02:00
badsuricate
5e62da9d29 Add new Arguments for CartLoop
New args = Limit and position
2013-10-23 15:20:42 +02:00
badsuricate
7d5803a541 Add routes for mini-cart and addedToCart 2013-10-23 11:47:42 +02:00
touffies
ac70075a38 Newsletter subscription with ajax 2013-10-22 22:26:33 +02:00
touffies
13bb69e429 Remove validation_groups 2013-10-22 16:21:30 +02:00
touffies
0a4c3e2d6e Fix password forgotten route 2013-10-22 16:16:40 +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
touffies
9d5aa5e077 Merge branch 'master' into frontend
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
2013-10-22 11:55:58 +02:00
Etienne Roudeix
cb0619a7b3 Merge branch 'master' of github.com:thelia/thelia 2013-10-22 11:33:24 +02:00
Etienne Roudeix
77dbdce4e8 fix tests 2013-10-22 11:33:01 +02:00
Etienne Roudeix
42e8b3a596 fix tests 2013-10-22 11:24:33 +02:00
Etienne Roudeix
7e32957d12 Merge branch 'master' into tax 2013-10-22 11:10:06 +02:00
Etienne Roudeix
b00f70fa24 permission management 2013-10-22 11:09:24 +02:00
Manuel Raynaud
47212490d2 verify if an email already exists in newsletter table 2013-10-22 10:58:16 +02:00
Manuel Raynaud
cc4f4f0bbe create newsletter template 2013-10-22 10:49:30 +02:00
touffies
945471dd8a Modify contact form name for the front 2013-10-22 10:20:21 +02:00
touffies
e9c6f403a3 Merge branch 'master' into frontend 2013-10-22 10:17:47 +02:00
Manuel Raynaud
c9074892b2 complete controller and newsletter listener 2013-10-22 10:01:02 +02:00
Manuel Raynaud
888c2c6ab9 create routes for newsletter management 2013-10-22 09:54:44 +02:00
Manuel Raynaud
30f0973481 complete newsletter controller 2013-10-22 09:51:42 +02:00
Manuel Raynaud
f6fb778c3e create newsletter listener 2013-10-22 09:48:24 +02:00
Manuel Raynaud
f52a0f3652 create event message for newsletter subsribe action 2013-10-22 09:46:38 +02:00
Manuel Raynaud
6b8c7602b4 create newsletter event 2013-10-22 09:45:37 +02:00
touffies
0c1ed8e702 Cleanup :
- I made the form id different between the front and the back office
- I renamed a few files to use the same convention (create / update)
2013-10-22 09:44:45 +02:00
Manuel Raynaud
aabd05f17f create form and controller for newsletter 2013-10-22 09:42:57 +02:00
Manuel Raynaud
f4c4cea32b create newsletter entity 2013-10-22 09:36:52 +02:00
Manuel Raynaud
f70c5362e9 fix typo 2013-10-22 09:13:21 +02:00
Manuel Raynaud
af51086fcb Merge branch 'master' of github.com:thelia/thelia 2013-10-22 09:12:23 +02:00
Manuel Raynaud
4630007bc2 fix typo in error message 2013-10-22 09:11:33 +02:00
Etienne Roudeix
cdeda0123e Merge branch 'master' into tax 2013-10-21 19:12:07 +02:00
Etienne Roudeix
d13434bb08 permissions 2013-10-21 19:11:42 +02:00
Manuel Raynaud
9ce90abdf5 finish contact process 2013-10-21 19:07:59 +02:00
Manuel Raynaud
c0781455cb create contact form 2013-10-21 18:33:03 +02:00
Manuel Raynaud
4236a16e49 create example for mail usage 2013-10-21 18:04:48 +02:00
Etienne Roudeix
abe45c5798 Merge branch 'master' into tax
Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php
2013-10-21 17:48:13 +02:00
Etienne Roudeix
9a7708451a permission cleanup 2013-10-21 17:44:17 +02:00
Manuel Raynaud
1f55d569ef change place where absolute url is create when rewritten url is enabled 2013-10-21 15:15:17 +02:00
Manuel Raynaud
dff112dba4 fix issue #43 2013-10-21 14:34:08 +02:00
Manuel Raynaud
ee57c7cbcf fix issue #35 2013-10-21 12:34:31 +02:00
Manuel Raynaud
3dcb399d01 fix cartItem updateQuantity method 2013-10-21 12:21:33 +02:00
Manuel Raynaud
0ba6a599a9 add some verification on country default trigger 2013-10-21 12:08:19 +02:00
Manuel Raynaud
9ca612ae0d not allowed to delete default country 2013-10-21 11:54:15 +02:00
Etienne Roudeix
f564db2a8b WIP : admin profiles 2013-10-21 11:44:33 +02:00
Manuel Raynaud
a16fb0d890 fiw test suite 2013-10-21 11:40:45 +02:00
Manuel Raynaud
6c6227c77a clear cache when a module is removed 2013-10-21 11:32:50 +02:00
Manuel Raynaud
28b7423443 end module removal 2013-10-21 11:30:19 +02:00
Manuel Raynaud
a10fa20340 create event object for module delete action 2013-10-21 10:26:51 +02:00
Manuel Raynaud
9d794e229d Merge branch 'master' into module_management
Conflicts:
	core/lib/Thelia/Core/Template/Loop/TaxRuleCountry.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
2013-10-21 09:19:08 +02:00
Etienne Roudeix
c63c509f2f Merge branch 'master' into tax
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	templates/admin/default/configuration.html
2013-10-21 08:13:18 +02:00