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
Manuel Raynaud
1545987d51
update insert script
2013-10-21 09:29:52 +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
Etienne Roudeix
0300470f7d
new model
2013-10-21 08:10:55 +02:00
gmorel
f276ccfa37
WIP : Implement coupon check on ordering tunnel
...
@todo CSS
@todo List coupon used and detailed effects
2013-10-20 23:01:12 +02:00
gmorel
8c4ca21615
Working : Missing type inference
2013-10-20 22:46:00 +02:00
gmorel
ad69c45e4f
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia: (87 commits)
Missing ajax-loader icon
don't use alternative Logger in debugbar if debug is disabled
Remove debug bar
Move temporarily fontawesome's font into the web folder
Add loader css
fix product visibility comparaison parameter
Change this page on public page
Bug : Remove close tag </a>
decode url before searching if it's a rewritten url
Modification font-size of price elements
add page View All
Add button "add product to cart"
Footer : Static to dynamic content
Add order on attribute_combination loop
Fix bug in Content Loop with "current_folder" params
Creation of Content page
Change path /customer/account into /account
Change path : /customer/update into /account/update /password into /account/password
CustomerUpdateForm - Extend CustomerCreation
Update profile - new method [Not finished yet]
...
2013-10-20 21:11:58 +02:00
Manuel Raynaud
07a2944618
Merge branch 'frontend' of github.com:thelia/thelia into frontend
2013-10-18 16:51:50 +02:00
touffies
bba7b9bb76
Missing ajax-loader icon
2013-10-18 16:48:38 +02:00
Manuel Raynaud
d6e26e428e
Merge branch 'master' into frontend
...
Conflicts:
core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
templates/admin/default/tax-rule-edit.html
templates/admin/default/taxes-rules.html
2013-10-18 16:41:39 +02:00
touffies
1ee45e0cb2
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
2013-10-18 16:00:14 +02:00
Manuel Raynaud
d354ed96ad
don't use alternative Logger in debugbar if debug is disabled
2013-10-18 15:59:49 +02:00
touffies
b21f7efc73
Remove debug bar
2013-10-18 15:59:08 +02:00
touffies
77e789e964
Move temporarily fontawesome's font into the web folder
2013-10-18 15:50:42 +02:00
touffies
268e5355aa
Add loader css
2013-10-18 15:46:32 +02:00
Manuel Raynaud
b24546a12c
fix product visibility comparaison parameter
2013-10-18 15:45:11 +02:00
badsuricate
2257623c3b
Change this page on public page
2013-10-18 14:49:47 +02:00
touffies
d204a32c09
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
2013-10-18 12:43:27 +02:00
touffies
3fe1716bc4
Bug : Remove close tag </a>
2013-10-18 12:40:08 +02:00
Manuel Raynaud
392d8a3559
decode url before searching if it's a rewritten url
2013-10-18 11:24:19 +02:00
badsuricate
e80b2157b1
Modification font-size of price elements
2013-10-18 11:04:42 +02:00
badsuricate
4b65675bef
add page View All
2013-10-18 11:04:10 +02:00
badsuricate
cab914bb64
Add button "add product to cart"
2013-10-18 10:55:47 +02:00
badsuricate
67ca9bfeec
Footer :
...
Static to dynamic content
2013-10-18 10:54:34 +02:00
badsuricate
85e9a26cb6
Add order on attribute_combination loop
2013-10-18 10:53:36 +02:00
badsuricate
dea93ccb50
Fix bug in Content Loop with "current_folder" params
2013-10-18 10:52:40 +02:00
badsuricate
3db29c9d1d
Creation of Content page
2013-10-18 10:51:52 +02:00
