TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,766 Commits 1 Branch 0 Tags
882cf554d148f257f98cf77dbbed0936e08a8385
Commit Graph

1915 Commits

Author SHA1 Message Date
Franck Allimant
882cf554d1 Finished merging modules with master 2013-12-20 11:47:34 +01:00
Franck Allimant
9092e39296 Merge branch 'master' 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:32:01 +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
Etienne Roudeix
f434924e48 fix getPosition folder test 2013-12-19 15:46:03 +01:00
Etienne Roudeix
8c121dd455 add coupon tests 2013-12-19 15:37:15 +01:00
Etienne Roudeix
5773922314 show coupon codes in back office 2013-12-19 14:50:45 +01:00
Etienne Roudeix
d7c1ecf09a coupon management in order and cart process 2013-12-19 14:17:22 +01:00
Etienne Roudeix
c981102d3a Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-18 17:47:23 +01:00
Etienne Roudeix
1ba60103f3 coupon in orders + model review : backquote use 2013-12-18 17:46:42 +01:00
Manuel Raynaud
a6a2c43345 don't remove session order before calling payment method 2013-12-18 17:04:48 +01:00
Manuel Raynaud
2f4158d1f6 fix cs 2013-12-18 10:04:13 +01:00
Manuel Raynaud
d0e5d189d2 change memory_limit value, 128 MB is enough 2013-12-18 09:39:23 +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