Etienne Roudeix
|
67d0101dbe
|
use TaxEngine::getDeliveryCountry in delivery loop
|
2013-12-20 11:14:04 +01:00 |
|
Etienne Roudeix
|
4cb8ba704b
|
refacto getTaxCountry which is actually getDeliveryCountry
|
2013-12-20 11:13:08 +01:00 |
|
Etienne Roudeix
|
63ba1ceeda
|
make it magic last stand
|
2013-12-20 11:12:03 +01:00 |
|
Franck Allimant
|
2979ca0092
|
Fixed template loop
|
2013-12-20 01:40:45 +01:00 |
|
Franck Allimant
|
3a2ad352cc
|
Refactored templates processing
|
2013-12-20 00:49:08 +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
|
1a0d543990
|
fix missing id in folder-edit.html template
|
2013-12-16 17:06:15 +01:00 |
|
Manuel Raynaud
|
10ecec2fa1
|
setUrl was not call in seo event generation
|
2013-12-16 16:39:14 +01:00 |
|
Manuel Raynaud
|
b9192e551c
|
fix missing general form on seo form error
|
2013-12-16 16:22:14 +01:00 |
|
Manuel Raynaud
|
30eab4f416
|
fix object identifier presence
|
2013-12-16 15:53:02 +01:00 |
|
Manuel Raynaud
|
d6ba2b3d65
|
Merge branch 'master' into frontend
|
2013-12-16 15:45:04 +01:00 |
|
Etienne Roudeix
|
65f43b5eff
|
Merge branch 'cleanmaster' into modules
|
2013-12-16 14:33:15 +01:00 |
|
Etienne Roudeix
|
315ed1fb09
|
fix #144
|
2013-12-16 14:31:51 +01:00 |
|
Etienne Roudeix
|
32d0aa15a6
|
PaymentModuleInterface::pay method force $order parameter
|
2013-12-16 12:38:41 +01:00 |
|
Etienne Roudeix
|
029c97c47f
|
new checking in folder tests
|
2013-12-16 11:38:57 +01:00 |
|
Etienne Roudeix
|
977bbb55fa
|
Merge branch 'cleanmaster' into modules
|
2013-12-16 11:32:54 +01:00 |
|
Etienne Roudeix
|
86f1e06e42
|
document repositioning after delation
|
2013-12-16 11:32:05 +01:00 |
|
Etienne Roudeix
|
c5e69ebbb9
|
Merge branch 'cleanmaster' into modules
|
2013-12-16 10:56:40 +01:00 |
|
Etienne Roudeix
|
583cbe95b6
|
document positioning
|
2013-12-16 10:55:18 +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 |
|
Manuel Raynaud
|
f4c5f23d00
|
Change AdminLog logging request behavior, fixing issue #145
|
2013-12-14 14:16:45 +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 |
|
Etienne Roudeix
|
c9e052188c
|
images are positionable
|
2013-12-12 15:41:35 +01:00 |
|
Etienne Roudeix
|
93537b8d71
|
in progress : reorder image
|
2013-12-12 15:30:10 +01:00 |
|
touffies
|
681ac83334
|
Add try catch for urlRewrite
|
2013-12-11 21:03:31 +01:00 |
|
touffies
|
c0ee124d17
|
Remove constraint NotBlank
|
2013-12-11 20:58:57 +01:00 |
|
touffies
|
a987808bdf
|
Add new method redirectToListTemplateWithId
|
2013-12-11 20:58:00 +01:00 |
|
touffies
|
4990d0fd7b
|
Fix duplicate route id
|
2013-12-11 20:55:00 +01:00 |
|
touffies
|
ae8f4021c6
|
Pass the object id to the request
|
2013-12-11 20:54:30 +01:00 |
|
touffies
|
8034ddcc4d
|
Add comments
|
2013-12-11 20:53:30 +01:00 |
|
touffies
|
7eca83889a
|
Merge branch 'master' into frontend
|
2013-12-11 18:54:50 +01:00 |
|
touffies
|
eae8ffe764
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-12-11 18:53:42 +01:00 |
|
touffies
|
dee49ac213
|
Add comments
|
2013-12-11 18:44:25 +01:00 |
|
touffies
|
12d4c0fdfd
|
Keep hidden field for local
|
2013-12-11 18:40:42 +01:00 |
|
touffies
|
1b07e55396
|
Use $locale instead of $this->getCurrentEditionLocale() in the hydrateSeoForm method
|
2013-12-11 18:14:48 +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 |
|
Etienne Roudeix
|
02b9d2e509
|
Merge branch 'cleanmaster' into modules
|
2013-12-10 15:57:37 +01:00 |
|
Etienne Roudeix
|
63f48b79da
|
fix rewrinting tests
|
2013-12-10 15:56:59 +01:00 |
|
Etienne Roudeix
|
f9d4fe1e5c
|
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
|
2013-12-10 15:55:07 +01:00 |
|
Etienne Roudeix
|
83cac71895
|
fix urls in loops
|
2013-12-10 15:48:22 +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 |
|
Manuel Raynaud
|
4c9eff379a
|
Merge pull request #138 from gmorel/french_translation
Adding some French translation for backoffice
|
2013-12-09 06:39:21 -08: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 |
|