Etienne Roudeix
|
4600727163
|
order admin
|
2013-09-24 12:10:22 +02:00 |
|
Etienne Roudeix
|
93e7a4dc90
|
order admin integration
|
2013-09-24 09:44:59 +02:00 |
|
Etienne Roudeix
|
d015c8c3b8
|
cache dataccessfunctions
|
2013-09-23 11:24:30 +02:00 |
|
Manuel Raynaud
|
1da66ece29
|
update default param of content model
|
2013-09-21 16:07:25 +02:00 |
|
Manuel Raynaud
|
849c7dd20b
|
display content modification page
|
2013-09-21 15:20:06 +02:00 |
|
Manuel Raynaud
|
4ec55e5aca
|
create contentUpdateEvent
|
2013-09-21 14:40:35 +02:00 |
|
Manuel Raynaud
|
09abedeb9f
|
create contentCreateEvent
|
2013-09-21 14:37:20 +02:00 |
|
Manuel Raynaud
|
444cee8e82
|
create ContentEvent
|
2013-09-21 14:35:01 +02:00 |
|
Manuel Raynaud
|
423860932f
|
create contentModificationForm
|
2013-09-21 14:32:01 +02:00 |
|
Manuel Raynaud
|
abac607534
|
allow possibility to change folder visibility
|
2013-09-20 20:23:49 +02:00 |
|
Manuel Raynaud
|
56197a739e
|
icreate folder delete event
|
2013-09-20 19:49:12 +02:00 |
|
Manuel Raynaud
|
00f7c491b2
|
create folder events
|
2013-09-20 19:00:41 +02:00 |
|
Manuel Raynaud
|
805b38ab9a
|
Merge branch 'master' into content
Conflicts:
core/lib/Thelia/Core/Event/TheliaEvents.php
templates/admin/default/folders.html
|
2013-09-20 17:41:38 +02:00 |
|
Etienne Roudeix
|
c05496af53
|
Merge branch 'master' into template
|
2013-09-20 16:32:42 +02:00 |
|
Etienne Roudeix
|
d74fc0e1d3
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-20 16:32:32 +02:00 |
|
Etienne Roudeix
|
8541499302
|
order process
|
2013-09-20 16:25:46 +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 |
|
Etienne Roudeix
|
6a990bf625
|
Merge branch 'template'
|
2013-09-19 20:07:57 +02:00 |
|
Etienne Roudeix
|
2959c37c2d
|
order payment email
|
2013-09-19 20:07:00 +02:00 |
|
Etienne Roudeix
|
6e9af59403
|
order creation
|
2013-09-19 19:56:59 +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 |
|
Manuel Raynaud
|
fd46ba3648
|
create constant for folder management
|
2013-09-19 09:23:43 +02:00 |
|
Manuel Raynaud
|
dad0c1b6a5
|
begin working with http cache header
|
2013-09-19 09:07:53 +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 |
|