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
Manuel Raynaud
2d987473b4
Merge branch 'master' of github.com:thelia/thelia
2013-10-22 17:20:18 +02:00
Manuel Raynaud
0580539ed8
fix cart quantity for issue #46
2013-10-22 17:19:16 +02:00
Etienne Roudeix
0d242a4fc0
fix auth loop on index
2013-10-22 16:53:40 +02:00
Etienne Roudeix
ca04b87738
my bad
2013-10-22 16:13:29 +02:00
Etienne Roudeix
ddd8c4f7a5
fix auth loop
2013-10-22 15:57:31 +02:00
Etienne Roudeix
c94fa9bc24
permission management
2013-10-22 15:04:06 +02:00
Manuel Raynaud
6fef556319
Merge branch 'propel'
...
Conflicts:
install/thelia.sql
2013-10-22 14:48:10 +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
Manuel Raynaud
5755da1e8c
change newsletter success message
2013-10-22 11:22:23 +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
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
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
gmorel
9c7c4e851e
Working cleaning
2013-10-21 23:09:04 +02:00
gmorel
42aa46905b
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-21 22:49:32 +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
043eab7ccf
fix typo in product breadcrumb
2013-10-21 14:28:03 +02:00
Manuel Raynaud
48d112c736
update countries list
2013-10-21 14:21:32 +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
cb573f478c
Merge pull request #33 from thelia/module_management
...
Module management
2013-10-21 02:32:08 -07: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
