Manuel Raynaud
|
52efd79fb5
|
create content controller
|
2013-09-21 14:10:08 +02:00 |
|
Manuel Raynaud
|
bb796f08b6
|
change folder_id parm by parent in list folder view
|
2013-09-21 13:55:12 +02:00 |
|
Manuel Raynaud
|
962081c17d
|
use placeholder in folder update route
|
2013-09-21 13:42:00 +02:00 |
|
Manuel Raynaud
|
cc2a3914a9
|
implement process for changing folder position
|
2013-09-20 20:38:39 +02:00 |
|
Manuel Raynaud
|
abac607534
|
allow possibility to change folder visibility
|
2013-09-20 20:23:49 +02:00 |
|
Manuel Raynaud
|
a8dddc9c26
|
allow to create folder
|
2013-09-20 20:07:59 +02:00 |
|
Manuel Raynaud
|
aa39d6300c
|
add dispatcher before/after for folder crud management
|
2013-09-20 19:57:25 +02:00 |
|
Manuel Raynaud
|
56197a739e
|
icreate folder delete event
|
2013-09-20 19:49:12 +02:00 |
|
Manuel Raynaud
|
6a1df0240e
|
process folder update action
|
2013-09-20 19:34:36 +02:00 |
|
Manuel Raynaud
|
00f7c491b2
|
create folder events
|
2013-09-20 19:00:41 +02:00 |
|
Manuel Raynaud
|
8a37636aa6
|
display info in folders edition template
|
2013-09-20 18:39:12 +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
|
b7af3ebaa3
|
push model
|
2013-09-20 17:02:19 +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
|
1649e4d76b
|
fix query in Thelia\Model\Folder::countAllContents
|
2013-09-20 14:26:36 +02:00 |
|
mespeche
|
265da6a57e
|
Add default language & editing language default field
|
2013-09-20 12:00:39 +02:00 |
|
franck
|
93abd3387c
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-20 09:39:26 +02:00 |
|
franck
|
f7d2c09c6d
|
Added producr attributes routes
|
2013-09-20 09:38:48 +02:00 |
|
mespeche
|
5abae4db7d
|
Setting profile update
|
2013-09-20 09:35:56 +02:00 |
|
Manuel Raynaud
|
16de9bbcc9
|
allow displaying how much product wanted in category page
|
2013-09-20 09:19:12 +02:00 |
|
Etienne Roudeix
|
17548e3526
|
order tax tables
|
2013-09-20 08:23:02 +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 |
|
Etienne Roudeix
|
1d969e38ec
|
order tables
|
2013-09-19 18:30:13 +02:00 |
|
mespeche
|
8731bf3c37
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 17:31:37 +02:00 |
|
mespeche
|
169b3c2659
|
Setting profile edition route and view
|
2013-09-19 17:30:57 +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
|
f74884e63c
|
Merge branch 'master' into template
|
2013-09-19 16:24:23 +02:00 |
|
Etienne Roudeix
|
4ac9a0afad
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 16:24:05 +02:00 |
|
Etienne Roudeix
|
198bd9bec8
|
add abstract getDispatcher method to use CartTrai
|
2013-09-19 16:06:42 +02:00 |
|
Manuel Raynaud
|
b71c107f7e
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-09-19 16:04:00 +02:00 |
|
Etienne Roudeix
|
ec7d4471dc
|
payment process
|
2013-09-19 15:59:16 +02:00 |
|
Manuel Raynaud
|
65558e74e3
|
clean code in test suites
|
2013-09-19 15:50:47 +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 |
|
franck
|
0d13aa7b7d
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-19 14:03:16 +02:00 |
|
franck
|
e6d8e09886
|
Added product edition routing
|
2013-09-19 14:02:56 +02:00 |
|
mespeche
|
94aab3ea8a
|
Add modules routing and default action/view
|
2013-09-19 13:27:47 +02:00 |
|
Manuel Raynaud
|
5a79c6c016
|
force_return as default value tue in Image loop
|
2013-09-19 12:45:02 +02:00 |
|
Manuel Raynaud
|
466798e7af
|
start creating folder management
|
2013-09-19 11:31:13 +02:00 |
|