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

631 Commits

Author SHA1 Message Date
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
abac607534 allow possibility to change folder visibility 2013-09-20 20:23:49 +02:00
Manuel Raynaud
56197a739e icreate folder delete event 2013-09-20 19:49:12 +02:00
Manuel Raynaud
00f7c491b2 create folder events 2013-09-20 19:00:41 +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
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
16de9bbcc9 allow displaying how much product wanted in category page 2013-09-20 09:19:12 +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
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
4ac9a0afad Merge branch 'master' of github.com:thelia/thelia 2013-09-19 16:24:05 +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
Manuel Raynaud
5a79c6c016 force_return as default value tue in Image loop 2013-09-19 12:45:02 +02:00
Manuel Raynaud
fd46ba3648 create constant for folder management 2013-09-19 09:23:43 +02:00
Manuel Raynaud
dad0c1b6a5 begin working with http cache header 2013-09-19 09:07:53 +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
Etienne Roudeix
891ebcd491 fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar 2013-09-18 19:51:01 +02:00
Etienne Roudeix
45106f24bd module image 2013-09-18 15:58:58 +02:00
Manuel Raynaud
84813ced1e dispatch event when generate new url 2013-09-18 13:15:36 +02:00
franck
0214836a54 Added {url file='...'} to get file pathes 2013-09-18 12:15:17 +02:00
Etienne Roudeix
9b37bbb862 module image 2013-09-18 11:20:29 +02:00
Etienne Roudeix
f32f16e833 fix product without pse in loop 2013-09-18 09:17:49 +02:00
franck
48e2be57c6 Fixed some unit tests 2013-09-18 01:24:37 +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
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
gmorel
c99e7a91b9 Working : Content : fix loop giving no elements 2013-09-17 17:43:19 +02:00
gmorel
9c0d310441 Merge remote-tracking branch 'origin/master' 2013-09-17 17:39:22 +02:00
gmorel
82c7cdeb44 Working : Content : fix loop giving no elements 2013-09-17 17:39:12 +02:00
franck
c8baa38fed Added missing files... 2013-09-17 17:31:22 +02:00
franck
4731929a70 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-17 17:15:39 +02:00
franck
a9009b7e52 Started product management 2013-09-17 17:15:15 +02:00
gmorel
df80d39954 Working : Content : fix loop giving no elements 2013-09-17 17:11:08 +02:00
gmorel
b878bf54ad Merge remote-tracking branch 'origin/master' 2013-09-17 17:09:14 +02:00
gmorel
f8072a02d2 Working : Product : fix loop giving no elements 2013-09-17 17:09:01 +02:00
Etienne Roudeix
21df630d27 Merge branch 'master' into template 2013-09-17 16:53:57 +02:00
Etienne Roudeix
acaa4a969e empty cart or delivery exception 2013-09-17 16:38:16 +02:00