sterivein

Files

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

Address.php

allow address removal from front

2013-09-13 12:33:13 +02:00

Attribute.php

Finished Features management

2013-09-16 10:40:52 +02:00

AttributeAv.php

AttributesAv management

2013-09-12 15:43:37 +02:00

BaseAction.php

WIP : Upload management (upload+save+delete done) need to finish integration and add all image fields