mespeche
1ea614be57
Update uploader view
...
Update image edit view
2013-09-23 12:30:34 +02:00
gmorel
7c563eda42
Working : Upload management : fix e.preventDefault in chrome and safari
2013-09-23 10:33:36 +02:00
gmorel
b91a11536b
Working : Image management set on Category
2013-09-22 20:50:42 +02:00
gmorel
cf7e6d6952
Merge branch 'master' of https://github.com/thelia/thelia into upload_management
...
# By Manuel Raynaud (60) and others
# Via Manuel Raynaud (16) and others
* 'master' of https://github.com/thelia/thelia : (113 commits)
implement process for changing folder position
allow possibility to change folder visibility
allow to create folder
add dispatcher before/after for folder crud management
icreate folder delete event
process folder update action
create folder events
display info in folders edition template
push model
re-add home link in menu
comment dev menu in layout
translate some missing string
fixes order integration
order process
change some informations in layou
fix query in Thelia\Model\Folder::countAllContents
allow to order products on category page
Add default language & editing language default field
Vertical align middle tables
Fixed translations
...
Conflicts:
core/lib/Thelia/Tools/I18n.php
templates/admin/default/category-edit.html
2013-09-21 14:44:57 +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
Manuel Raynaud
369b7e1be1
Merge branch 'master' of github.com:thelia/thelia
2013-09-20 17:15:07 +02:00
Etienne Roudeix
b7af3ebaa3
push model
2013-09-20 17:02:19 +02:00
Manuel Raynaud
bf11fa1958
re-add home link in menu
2013-09-20 16:56:23 +02:00
gmorel
ced7b5e6dc
WIP : Upload management (upload+save+delete done) need to finish integration and add all image fields
2013-09-20 16:51:34 +02:00
Manuel Raynaud
defaadcd62
Merge branch 'master' of github.com:thelia/thelia
2013-09-20 16:50:03 +02:00
Manuel Raynaud
44d6bbdb4a
comment dev menu in layout
2013-09-20 16:48:37 +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
Manuel Raynaud
1a962d701d
translate some missing string
2013-09-20 16:31:25 +02:00
Etienne Roudeix
61191b9d32
fixes order integration
2013-09-20 16:31:19 +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
30d02799b2
Merge branch 'master' of github.com:thelia/thelia
2013-09-20 14:38:46 +02:00
Manuel Raynaud
2cf71f99a9
change some informations in layou
2013-09-20 14:38:11 +02:00
Manuel Raynaud
1649e4d76b
fix query in Thelia\Model\Folder::countAllContents
2013-09-20 14:26:36 +02:00
Manuel Raynaud
bb40086e2a
allow to order products on category page
2013-09-20 13:59:51 +02:00
mespeche
265da6a57e
Add default language & editing language default field
2013-09-20 12:00:39 +02:00
mespeche
93fd189198
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-20 10:39:34 +02:00
mespeche
b933a96c8e
Vertical align middle tables
2013-09-20 10:39:02 +02:00
franck
cb5f6d4c70
Fixed translations
2013-09-20 09:57:30 +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
Manuel Raynaud
c255548d9b
create dedicated file for menu
2013-09-20 08:45:38 +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
Manuel Raynaud
e1353a63a7
complete meta tag for product part
2013-09-19 19:05:56 +02:00
Manuel Raynaud
a7a755fab5
add isbn meta tag
2013-09-19 18:58:43 +02:00
Manuel Raynaud
a540626fff
fix product import
2013-09-19 18:47:12 +02:00
Etienne Roudeix
1d969e38ec
order tables
2013-09-19 18:30:13 +02:00
Manuel Raynaud
1f5cd1da62
create category template
2013-09-19 17:48:01 +02:00
mespeche
8731bf3c37
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-19 17:31:37 +02:00
