franck
|
645ff15fcf
|
Impemented combination creation
|
2013-09-23 17:03:36 +02:00 |
|
franck
|
8781721512
|
Started price tab
|
2013-09-23 00:57:03 +02:00 |
|
franck
|
22f3f49f79
|
Finished product multiple categories attachment
|
2013-09-22 22:14:39 +02:00 |
|
franck
|
bb9e1d6999
|
Finished product features management
|
2013-09-21 14:14:56 +02:00 |
|
franck
|
e3644cd6cc
|
Aded feature_template and category_template position management
|
2013-09-21 11:46:09 +02:00 |
|
franck
|
f6530f0bfc
|
Finished product feature values
|
2013-09-20 23:10:31 +02:00 |
|
franck
|
1cf8c87d1a
|
Fixed product update process
|
2013-09-20 17:17:44 +02:00 |
|
franck
|
5622a246b2
|
Added missing files
|
2013-09-20 15:59:19 +02:00 |
|
franck
|
e27b3cfbae
|
Working catalog branch
|
2013-09-20 15:54:50 +02:00 |
|
Manuel Raynaud
|
4e6aac8917
|
Merge branch 'integration'
|
2013-09-20 14:39:00 +02:00 |
|
Manuel Raynaud
|
16de9bbcc9
|
allow displaying how much product wanted in category page
|
2013-09-20 09:19:12 +02:00 |
|
Manuel Raynaud
|
acffa60e50
|
awesome menu created in front office
|
2013-09-20 08:05:44 +02:00 |
|
Manuel Raynaud
|
24f17bcb0f
|
fix count child on folder and category folder. Doubitch
|
2013-09-19 20:24:33 +02:00 |
|
franck
|
e672677748
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
templates/admin/default/category-edit.html
|
2013-09-19 17:27:46 +02:00 |
|
Etienne Roudeix
|
4ecf388d8b
|
refresh position in accessory
|
2013-09-19 16:55:50 +02:00 |
|
franck
|
3f6dc9046d
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 16:50:08 +02:00 |
|
franck
|
3ff1f7f9bb
|
Added accessories management events
|
2013-09-19 16:49:39 +02:00 |
|
Etienne Roudeix
|
4ac9a0afad
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 16:24:05 +02:00 |
|
Manuel Raynaud
|
41bd8a7cec
|
icomplete product page
|
2013-09-19 15:39:36 +02:00 |
|
Etienne Roudeix
|
3c02a9d23c
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 15:12:37 +02:00 |
|
Etienne Roudeix
|
61fab3a62a
|
order creation
|
2013-09-19 15:11:54 +02:00 |
|
Manuel Raynaud
|
5a79c6c016
|
force_return as default value tue in Image loop
|
2013-09-19 12:45:02 +02:00 |
|
Etienne Roudeix
|
66536d0b31
|
Merge branch 'master' into template
Conflicts:
core/lib/Thelia/Core/Template/Loop/Product.php
|
2013-09-18 20:03:13 +02:00 |
|
Etienne Roudeix
|
891ebcd491
|
fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar
|
2013-09-18 19:51:01 +02:00 |
|
Etienne Roudeix
|
45106f24bd
|
module image
|
2013-09-18 15:58:58 +02:00 |
|
Manuel Raynaud
|
84813ced1e
|
dispatch event when generate new url
|
2013-09-18 13:15:36 +02:00 |
|
franck
|
0214836a54
|
Added {url file='...'} to get file pathes
|
2013-09-18 12:15:17 +02:00 |
|
Etienne Roudeix
|
9b37bbb862
|
module image
|
2013-09-18 11:20:29 +02:00 |
|
Etienne Roudeix
|
f32f16e833
|
fix product without pse in loop
|
2013-09-18 09:17:49 +02:00 |
|
franck
|
48e2be57c6
|
Fixed some unit tests
|
2013-09-18 01:24:37 +02:00 |
|
franck
|
d02f13f021
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Controller/Admin/ProductController.php
core/lib/Thelia/Model/Product.php
|
2013-09-18 00:35:48 +02:00 |
|
franck
|
de4767ef56
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Model/Product.php
|
2013-09-17 23:51:31 +02:00 |
|
Etienne Roudeix
|
5ffb737c50
|
Merge branch 'master' into template
|
2013-09-17 20:14:17 +02:00 |
|
Etienne Roudeix
|
0d1c6cf8cb
|
postage + invoice step
|
2013-09-17 19:47:10 +02:00 |
|
gmorel
|
c99e7a91b9
|
Working : Content : fix loop giving no elements
|
2013-09-17 17:43:19 +02:00 |
|
gmorel
|
9c0d310441
|
Merge remote-tracking branch 'origin/master'
|
2013-09-17 17:39:22 +02:00 |
|
gmorel
|
82c7cdeb44
|
Working : Content : fix loop giving no elements
|
2013-09-17 17:39:12 +02:00 |
|
franck
|
c8baa38fed
|
Added missing files...
|
2013-09-17 17:31:22 +02:00 |
|
franck
|
4731929a70
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-17 17:15:39 +02:00 |
|
franck
|
a9009b7e52
|
Started product management
|
2013-09-17 17:15:15 +02:00 |
|
gmorel
|
df80d39954
|
Working : Content : fix loop giving no elements
|
2013-09-17 17:11:08 +02:00 |
|
gmorel
|
b878bf54ad
|
Merge remote-tracking branch 'origin/master'
|
2013-09-17 17:09:14 +02:00 |
|
gmorel
|
f8072a02d2
|
Working : Product : fix loop giving no elements
|
2013-09-17 17:09:01 +02:00 |
|
Etienne Roudeix
|
21df630d27
|
Merge branch 'master' into template
|
2013-09-17 16:53:57 +02:00 |
|
Etienne Roudeix
|
acaa4a969e
|
empty cart or delivery exception
|
2013-09-17 16:38:16 +02:00 |
|
Manuel Raynaud
|
8122dc3084
|
Merge branch 'install_wizard'
|
2013-09-17 16:02:24 +02:00 |
|
Manuel Raynaud
|
072dec5cc9
|
nstall step Please enter the commit message for your changes. Lines starting
|
2013-09-17 15:43:15 +02:00 |
|
Etienne Roudeix
|
ddbced036f
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-17 15:02:38 +02:00 |
|
Etienne Roudeix
|
8d20316217
|
no-return-functions block
|
2013-09-17 14:59:40 +02:00 |
|
gmorel
|
fd1aaaef63
|
Working : Content loop : add default content parameter
|
2013-09-17 14:56:17 +02:00 |
|