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 |
|
Etienne Roudeix
|
0e30ce2760
|
add jquery ui in assets
|
2013-12-16 09:40:13 +01:00 |
|
Etienne Roudeix
|
d4f721fa33
|
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
|
2013-12-16 09:11:21 +01:00 |
|
Etienne Roudeix
|
3d55a6ded6
|
add jquery ui (ooops)
|
2013-12-16 09:10:35 +01:00 |
|
Manuel Raynaud
|
43b89ab39f
|
Merge pull request #148 from DirtyF/patch-1
add phpbrew as a solution to handle PHP on Mac OSX
|
2013-12-14 12:50:13 -08:00 |
|
DirtyF
|
8e663964c1
|
add phpbrew as a solution to handle PHP on Mac OSX
|
2013-12-14 20:24:22 +01:00 |
|
Manuel Raynaud
|
4b67462416
|
Merge pull request #147 from cordoval/update-translation
update profil translation
|
2013-12-14 08:23:37 -08:00 |
|
Luis Cordova
|
06fa5fa1e5
|
update profil translation
|
2013-12-14 17:18:44 +01:00 |
|
Manuel Raynaud
|
412e5e9253
|
comment missing js file
|
2013-12-14 15:19:34 +01:00 |
|
Manuel Raynaud
|
463cb12c08
|
Merge pull request #146 from thelia/adminLog
Change AdminLog logging request behavior, fixing issue #145
|
2013-12-14 05:20:46 -08:00 |
|
Manuel Raynaud
|
f4c5f23d00
|
Change AdminLog logging request behavior, fixing issue #145
|
2013-12-14 14:16:45 +01:00 |
|
Manuel Raynaud
|
aa66067f0e
|
fix bad product assignation in feature_value loop
|
2013-12-14 13:50:55 +01:00 |
|
Manuel Raynaud
|
48e31b1145
|
fix link in admin footer
|
2013-12-14 13:27:09 +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
|
65df33d0b7
|
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
|
2013-12-12 15:45:16 +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
|
bc992811d4
|
Add new method redirectToListTemplateById
|
2013-12-11 21:02:12 +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
|
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 |
|
Manuel Raynaud
|
129ae36182
|
Merge pull request #141 from Boyquotes/master
Translate front in FR
|
2013-12-11 11:44:13 -08: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
|
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 |
|