TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,501 Commits 1 Branch 0 Tags
b91a11536b03cf1a01293981f41dcd658e82899a
Commit Graph

319 Commits

Author SHA1 Message Date
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
aa39d6300c add dispatcher before/after for folder crud management 2013-09-20 19:57:25 +02:00
Etienne Roudeix
b7af3ebaa3 push model 2013-09-20 17:02:19 +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
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
Etienne Roudeix
17548e3526 order tax tables 2013-09-20 08:23:02 +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
6e9af59403 order creation 2013-09-19 19:56:59 +02:00
Etienne Roudeix
1d969e38ec order tables 2013-09-19 18:30:13 +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
198bd9bec8 add abstract getDispatcher method to use CartTrai 2013-09-19 16:06:42 +02:00
Etienne Roudeix
ec7d4471dc payment process 2013-09-19 15:59:16 +02:00
Etienne Roudeix
61fab3a62a order creation 2013-09-19 15:11:54 +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
Manuel Raynaud
84813ced1e dispatch event when generate new url 2013-09-18 13:15:36 +02:00
Manuel Raynaud
fd74703658 create test rewritten url for category 2013-09-18 12:24:36 +02:00
Manuel Raynaud
4eaf7288ba create helper for retrieving passed url view 2013-09-18 12:10:56 +02:00
Manuel Raynaud
e638a927c0 add more test for rewriten url 2013-09-18 12:03:02 +02:00
Etienne Roudeix
9b37bbb862 module image 2013-09-18 11:20:29 +02:00
Manuel Raynaud
6483813a35 rtrime rewritten url 2013-09-18 11:07:15 +02:00
Manuel Raynaud
41f7b817c6 remove unused classes 2013-09-18 10:54:22 +02:00
Manuel Raynaud
e7fa896866 remove unused classes 2013-09-18 10:52:07 +02:00
Manuel Raynaud
a041273b80 remove unused classes 2013-09-18 10:34:31 +02:00
gmorel
3627d96175 WIP : Upload management 2013-09-18 10:07:57 +02:00
Manuel Raynaud
826ad83584 Merge branch 'master' of github.com:thelia/thelia 2013-09-18 08:11:08 +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
Manuel Raynaud
5a64654ce5 move url generation to I18n entity 2013-09-17 20:45:29 +02:00
Manuel Raynaud
7c340303f6 Merge branch 'master' of github.com:thelia/thelia 2013-09-17 20:29:47 +02:00
Manuel Raynaud
e4b36098c7 fix typo and remove url generation in postInsert model 2013-09-17 20:29:09 +02:00
franck
1e15142283 Added product creation 2013-09-17 20:18:53 +02:00
Etienne Roudeix
9bce1cbabb Merge branch 'master' into template 2013-09-17 20:16:48 +02:00
Manuel Raynaud
da7f9e07c4 create test for UrlRewritingTrait 2013-09-17 20:15:28 +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
Manuel Raynaud
e1e383707b template is not mandatory in product table. 2013-09-17 19:19:52 +02:00
Manuel Raynaud
9020de5b9a Merge branch 'master' of github.com:thelia/thelia 2013-09-17 19:12:14 +02:00
Manuel Raynaud
60d09dc76e refactor rewrriten method name 2013-09-17 19:11:44 +02:00
franck
ecf4412fbd Changed getDefaultCategory in getDefaultCategoryId 2013-09-17 18:38:49 +02:00
Manuel Raynaud
232ad70494 Merge branch 'master' of github.com:thelia/thelia 2013-09-17 17:52:53 +02:00
Manuel Raynaud
50212c55cf remove old model classes: 2013-09-17 17:50:05 +02:00
franck
c8baa38fed Added missing files... 2013-09-17 17:31:22 +02:00
franck
a9009b7e52 Started product management 2013-09-17 17:15:15 +02:00
Manuel Raynaud
8122dc3084 Merge branch 'install_wizard' 2013-09-17 16:02:24 +02:00