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
|
890f52da54
|
Add hidden field category_id
|
2013-12-11 20:56:04 +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
|
f1530fa6f9
|
Display error message if exist (INCLUDE notifications.html)
|
2013-12-11 18:53:17 +01:00 |
|
touffies
|
28e70787ab
|
Define close_url
|
2013-12-11 18:47:30 +01:00 |
|
touffies
|
dee49ac213
|
Add comments
|
2013-12-11 18:44:25 +01:00 |
|
touffies
|
b46a8fd1f2
|
Define close_url variable
|
2013-12-11 18:43:43 +01:00 |
|
touffies
|
12d4c0fdfd
|
Keep hidden field for local
|
2013-12-11 18:40:42 +01:00 |
|
touffies
|
01850c7d17
|
- Define close_url
- Use notifications.html
|
2013-12-11 18:33:03 +01:00 |
|
touffies
|
1b07e55396
|
Use $locale instead of $this->getCurrentEditionLocale() in the hydrateSeoForm method
|
2013-12-11 18:14:48 +01:00 |
|
touffies
|
8c20202778
|
Add dismissable
|
2013-12-11 18:13:28 +01:00 |
|
Etienne Roudeix
|
ff828bf1ba
|
test rewritten url reassignment
|
2013-12-11 13:10:03 +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
|
c31edf6842
|
Merge pull request #142 from gmorel/back_office_french_translation
Fix typo : attributes = déclinaisons
|
2013-12-10 04:58:33 -08:00 |
|
gmorel
|
60cb9cd52b
|
Fix typo : attributes = déclinaisons
|
2013-12-10 11:00:55 +01:00 |
|
touffies
|
f51d540950
|
Wrong Form Action for SEO
|
2013-12-09 16:45:06 +01:00 |
|
Manuel Raynaud
|
eca8b01fb6
|
revert last conflic
|
2013-12-09 16:18:59 +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 |
|
touffies
|
6648613772
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
Conflicts:
core/lib/Thelia/Action/BaseAction.php
core/lib/Thelia/Controller/Admin/AbstractSeoCrudController.php
core/lib/Thelia/Controller/Admin/ProductController.php
core/lib/Thelia/Core/Event/UpdateSeoEvent.php
core/lib/Thelia/Form/ProductModificationForm.php
core/lib/Thelia/Form/SeoFieldsTrait.php
core/lib/Thelia/Model/Base/Product.php
core/lib/Thelia/Model/Base/ProductI18n.php
core/lib/Thelia/Model/Base/ProductI18nQuery.php
core/lib/Thelia/Model/Map/ProductI18nTableMap.php
core/lib/Thelia/Model/Map/ProductTableMap.php
install/thelia.sql
local/config/schema.xml
templates/backOffice/default/includes/product-general-tab.html
templates/backOffice/default/includes/seo-tab.html
templates/backOffice/default/product-edit.html
|
2013-12-09 15:22:17 +01:00 |
|
gmorel
|
2f37f339ee
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
80eb4b7bd0
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
c110e4e812
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
5c602bc2cb
|
Translation replace tab by 4 spaces
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
601aaf311d
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
b8b6887fea
|
Fix typo
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
f31ed34ee3
|
Fix typo
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
fcb626e784
|
Fix typo
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
7f33c86d75
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
83356ab867
|
Fix typo
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
5f833f256f
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
d658351343
|
Fix typo
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
ae88efd282
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
a064489fe4
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
502a171c0d
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
d769f51186
|
Fix typo
|
2013-12-09 15:19:14 +01:00 |
|
gmorel
|
8ba353dd6c
|
Adding translation for Backoffice
|
2013-12-09 15:19:14 +01:00 |
|
gmorel
|
0d69d226f3
|
Adding translation for Backoffice
|
2013-12-09 15:19:14 +01:00 |
|
gmorel
|
80d1656762
|
Adding translation for Backoffice
|
2013-12-09 15:19:14 +01:00 |
|
Etienne Roudeix
|
28d2add37d
|
fix tests
|
2013-12-09 15:02:09 +01:00 |
|