TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,016 Commits 1 Branch 0 Tags
413e77fa97c7d3633f3f8ccabdbaa7ccc3f20ae1
Commit Graph

76 Commits

Author SHA1 Message Date
Etienne Roudeix
ca4df15910 tax in loops 2013-09-09 16:27:46 +02:00
Etienne Roudeix
fa36b64f51 debug bar 2013-09-09 14:44:39 +02:00
Etienne Roudeix
0ddf88e46e tax engine 2013-09-09 14:24:50 +02:00
Manuel Raynaud
1e660cd930 Merge branch 'delivery' 
Conflicts:
	composer.lock
	install/insert.sql
 2013-09-07 16:37:54 +02:00
Manuel Raynaud
ed468ccb67 Merge branch 'master' into debugbar 2013-09-07 16:31:29 +02:00
Manuel Raynaud
5315e13ce9 add new event and new tag 2013-09-07 16:31:15 +02:00
Manuel Raynaud
0aad4baf26 create controller adding delivery module in session 2013-09-06 19:29:19 +02:00
Manuel Raynaud
b067ef7dcc create Delivery loop 2013-09-06 18:41:44 +02:00
Etienne Roudeix
b6a216fd9b substitutions : product category folder content 2013-09-06 12:21:36 +02:00
Etienne Roudeix
a0f894d70f customer substitutions 2013-09-05 17:54:04 +02:00
Manuel Raynaud
40b524e9d6 add label_attr attribute to form smarty plugin 2013-09-05 14:22:28 +02:00
Manuel Raynaud
3f405d1ce9 Merge branch 'master' of github.com:thelia/thelia 
Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
 2013-09-04 17:57:41 +02:00
Manuel Raynaud
ceb02841e1 validate create and update address in front context 2013-09-04 17:52:58 +02:00
Etienne Roudeix
e1965a5145 global outputs in loops 2013-09-04 14:45:14 +02:00
Etienne Roudeix
29bf7d9a92 404 not found management 2013-09-04 10:02:58 +02:00
franck
a2d6c16d13 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	templates/default/login.html
 2013-08-30 19:48:26 +02:00
franck
6867eae9b7 Fixed customer front controller, events, addec admion config. 2013-08-30 19:46:12 +02:00
Etienne Roudeix
e63ff065c7 product page 2013-08-30 15:04:08 +02:00
Etienne Roudeix
3c71aa613f url global substitution 2013-08-30 14:30:33 +02:00
Etienne Roudeix
696b871acd start rewriting 2013-08-29 08:49:48 +02:00
Etienne Roudeix
f8dfa64059 load test 2013-08-26 16:38:56 +02:00
Etienne Roudeix
9174e5154e backend loop translation 2013-08-26 14:05:29 +02:00
Etienne Roudeix
96b3de7c84 backend trasnlation in loops 2013-08-26 12:38:23 +02:00
Etienne Roudeix
2d810540ec loop review 2013-08-23 12:37:18 +02:00
Etienne Roudeix
fe4b77f7a8 associated content for categories and product tables + loop 2013-08-23 10:55:59 +02:00
Etienne Roudeix
9dbd8a283b pse and combi loops 2013-08-21 12:50:49 +02:00
Etienne Roudeix
86b11096ba Merge branch 'master' into loops 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php
 2013-08-21 09:19:56 +02:00
Etienne Roudeix
6a14bef3de feature product loop + improve faker 2013-08-20 17:59:22 +02:00
Etienne Roudeix
731a406d1c new product loop 2013-08-20 15:32:13 +02:00
Etienne Roudeix
ef756979bd product loop : order by promo or newness 2013-08-20 14:40:30 +02:00
Etienne Roudeix
42270991c5 product loop parameters done 2013-08-20 11:29:35 +02:00
Etienne Roudeix
d50b0e6e10 big progress on product loop 2013-08-19 17:18:20 +02:00
franck
d61eeef0d6 Finalized images action and loop 2013-08-15 20:47:05 +02:00
Manuel Raynaud
ecb42e906b refactor update item eventListener 2013-08-14 15:55:06 +02:00
Etienne Roudeix
805c9cf685 fix template category 2013-08-14 14:05:10 +02:00
Etienne Roudeix
70f483ad97 availability instead of available 2013-08-14 14:02:14 +02:00
Etienne Roudeix
c9485075d4 new faker entries 
new category view
 2013-08-13 11:40:24 +02:00
Manuel Raynaud
7f83225645 fix test suite issue 2013-08-13 09:34:08 +02:00
Manuel Raynaud
b377ebe6e8 refactor action process to controller process 2013-08-12 16:42:23 +02:00
franck
c46a708346 Categories ordrering in the catalog 2013-08-09 10:18:08 +02:00
Manuel Raynaud
376471db04 Merge branch 'cart' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
 2013-08-08 18:03:23 +02:00
Manuel Raynaud
2e1627398c start to implement cart loop 2013-08-08 17:56:30 +02:00
Manuel Raynaud
d63168d5ba Merge branch 'cart' 2013-08-08 14:49:03 +02:00
Manuel Raynaud
df371355b9 change phpdoc api generator to phpdoc 2013-08-08 13:26:49 +02:00
franck
64031a1883 Added category creation and deletion 2013-08-08 02:39:42 +02:00
Etienne Roudeix
fd82907209 folder and content fake 
folder and content loops
 2013-08-02 16:18:45 +02:00
Etienne Roudeix
8874404e4d remove link from folder 2013-08-02 15:25:29 +02:00
Etienne Roudeix
ab1598e50c bug fix in loops 2013-08-02 14:59:52 +02:00
Etienne Roudeix
e4a8f95b0a add bug template 2013-08-02 13:42:30 +02:00
Etienne Roudeix
799e4ad5df rename feature_prod feature_product 2013-07-30 11:32:04 +02:00