gmorel
8f9b86ff6a
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia : (121 commits)
set cartItem in cart add and update events
need to unescape breadcrumb strings after been in array
update readme file
update insert.sql with new release version
change changelog file format
Prevent product and content création at catalog root
dynamic delivery modules on delivery front template
complete changelog
Finished merging modules with master
Revert "Merge branch 'cleanmaster' into modules"
use TaxEngine::getDeliveryCountry in delivery loop
refacto getTaxCountry which is actually getDeliveryCountry
make it magic last stand
change loop in shipping zone template using module insteadof delivery
Fixed template loop
Refactored templates processing
complete readme file
change email address of core contributors
fix getPosition folder test
add coupon tests
...
Conflicts:
core/lib/Thelia/Controller/Admin/ProductController.php
2013-12-25 14:14:20 +01:00
gmorel
69d255f782
new branch coupon
2013-12-25 14:12:54 +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
Etienne Roudeix
f434924e48
fix getPosition folder test
2013-12-19 15:46:03 +01:00
Manuel Raynaud
2f4158d1f6
fix cs
2013-12-18 10:04:13 +01:00
Manuel Raynaud
0c24a8afc0
Merge branch 'master' into modules
...
Conflicts:
templates/backOffice/default/product-edit.html
2013-12-17 10:48:59 +01:00
Manuel Raynaud
db2ad120b2
fix test suite reimplementing url updating trest
2013-12-16 17:29:25 +01:00
Manuel Raynaud
d6ba2b3d65
Merge branch 'master' into frontend
2013-12-16 15:45:04 +01:00
Etienne Roudeix
029c97c47f
new checking in folder tests
2013-12-16 11:38:57 +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
Etienne Roudeix
76cd704f80
review tests
2013-12-12 15:56:13 +01:00
Etienne Roudeix
162f364df6
reveiw test
2013-12-12 15:55:52 +01:00
Etienne Roudeix
d1a1e14c0a
fix test
2013-12-12 15:54:52 +01:00
Etienne Roudeix
297f197fed
Merge branch 'cleanmaster' into modules
2013-12-12 15:45:45 +01:00
touffies
7eca83889a
Merge branch 'master' into frontend
2013-12-11 18:54:50 +01:00
Etienne Roudeix
ff828bf1ba
test rewritten url reassignment
2013-12-11 13:10:03 +01:00
Etienne Roudeix
6acb1924d8
test url reassignment
2013-12-11 13:07:02 +01:00
Manuel Raynaud
462b2bec5e
Merge branch 'master' into frontend
...
Conflicts:
templates/backOffice/default/folder-edit.html
2013-12-09 16:15:58 +01:00
touffies
f34a4a066d
Remove RewrittenUrlTestTrait from content
2013-12-09 15:40:23 +01:00
Etienne Roudeix
95d327f976
fix tests
2013-12-09 15:31:27 +01:00
touffies
50d638bb23
Remove test setURL
2013-12-09 15:30:04 +01:00
Etienne Roudeix
28d2add37d
fix tests
2013-12-09 15:02:09 +01:00
Etienne Roudeix
090b201fea
test rewriting
2013-12-09 13:01:39 +01:00
Etienne Roudeix
a9a2a256fa
fix updatePositionDownTest
2013-12-06 11:20:15 +01:00
Etienne Roudeix
79120528b5
fix unit tests search by id in loop bug
...
due to not visible first entry in database
2013-11-14 14:17:47 +01:00
Manuel Raynaud
52ed89f1aa
fix cs
2013-10-18 09:28:17 +02:00
Etienne Roudeix
b84e863033
fix tests
2013-10-07 14:36:20 +02:00
Manuel Raynaud
bc33827c05
test annd and remove folder content association
2013-10-01 17:36:09 +02:00
Manuel Raynaud
25ba2e4e7e
test update content position with specific position number
2013-10-01 17:02:20 +02:00
Manuel Raynaud
01efa9f5f6
test content update position up and down
2013-10-01 16:54:18 +02:00
Manuel Raynaud
d6cd73150e
test content toggleVisibility
2013-10-01 16:36:06 +02:00
Manuel Raynaud
4e323bfe8b
create test for content removal
2013-10-01 16:13:55 +02:00
Manuel Raynaud
2f736c7759
test update content
2013-10-01 15:54:58 +02:00
Manuel Raynaud
e12882a80a
test content creation process
2013-10-01 15:12:24 +02:00
Manuel Raynaud
2f5d91ac88
test folder UpdatePosition with specific position
2013-10-01 14:49:30 +02:00
Manuel Raynaud
321368bb3e
test updating up and down folder position
2013-10-01 14:39:59 +02:00
Manuel Raynaud
de98b5e9e3
test folder toggle visibility
2013-10-01 14:02:28 +02:00
Manuel Raynaud
98c3177de2
test folder removal
2013-10-01 13:52:51 +02:00
Manuel Raynaud
19e5758150
start testing folder crud
2013-10-01 11:29:47 +02:00
Manuel Raynaud
c65ec67bdf
fix cs
2013-09-30 10:35:34 +02:00
Manuel Raynaud
43b5a129f7
refactor order and image events
2013-09-30 10:34:08 +02:00
Manuel Raynaud
6d5f34767d
refactor document events
2013-09-30 10:32:48 +02:00
Manuel Raynaud
7bf5ee31c9
Merge branch 'refactor_action'
...
Conflicts:
core/lib/Thelia/Action/Product.php
core/lib/Thelia/Controller/Admin/CategoryController.php
core/lib/Thelia/Controller/Admin/ProductController.php
core/lib/Thelia/Controller/Admin/TemplateController.php
2013-09-30 10:26:59 +02:00
Manuel Raynaud
0ce4b25e72
refactor customer events
2013-09-30 10:07:01 +02:00
Manuel Raynaud
b023c33cc7
refactor address and attribute events
2013-09-30 10:03:14 +02:00
Etienne Roudeix
4bdc06e216
try to fix test
2013-09-27 09:30:22 +02:00
Etienne Roudeix
97c461fa2c
order address changes tests
2013-09-26 14:17:26 +02:00
Etienne Roudeix
f5492ed2f9
tests for order update actions
2013-09-26 13:25:25 +02:00
Etienne Roudeix
7bd511c420
order admin
2013-09-24 17:04:32 +02:00
