Files
sterivein/core/lib/Thelia/Model
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
..
2013-09-20 17:02:19 +02:00
2013-09-20 17:02:19 +02:00
2013-07-09 11:59:37 +02:00
2013-09-13 10:55:45 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-09-17 12:38:23 +02:00
2013-09-17 12:38:23 +02:00
2013-07-09 11:59:37 +02:00
2013-09-12 15:43:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-09-16 15:32:17 +02:00
2013-09-16 13:15:35 +02:00
2013-08-21 09:19:56 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-09-16 08:56:44 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-09-10 19:13:28 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-09-16 10:40:52 +02:00
2013-09-16 10:40:52 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-08-02 16:18:45 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-09-05 08:35:47 +02:00
2013-07-09 11:59:37 +02:00
2013-09-04 10:48:59 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-09-18 11:20:29 +02:00
2013-09-18 11:20:29 +02:00
2013-09-18 11:20:29 +02:00
2013-09-18 11:20:29 +02:00
2013-07-09 11:59:37 +02:00
2013-09-20 16:25:46 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-09-19 19:56:59 +02:00
2013-09-19 19:56:59 +02:00
2013-09-20 17:02:19 +02:00
2013-09-20 17:02:19 +02:00
2013-09-20 16:25:46 +02:00
2013-09-19 15:11:54 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-09-16 11:14:23 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-08-28 15:47:47 +02:00
2013-08-28 15:47:47 +02:00
2013-09-03 16:51:41 +02:00
2013-09-11 19:01:23 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-09-20 16:25:46 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-07-09 11:59:37 +02:00
2013-09-20 16:25:46 +02:00