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

648 Commits

Author SHA1 Message Date
gmorel
c10074786d Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon 
* 'coupon' of https://github.com/thelia/thelia:

# By Manuel Raynaud
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia:
  allow to delete content
  toofle content visibility
  allow to load jquery offline
  allow update content position number
 2013-09-25 16:40:54 +02:00
gmorel
b7851b2d54 WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 16:36:14 +02:00
gmorel
d6172f23cf WIP : Refactor contraint/rule becomes conditions (more generic) 2013-09-25 14:51:42 +02:00
Manuel Raynaud
1e571ffbc5 Merge branch 'content' 2013-09-23 23:35:05 +02:00
gmorel
d0f20cca1d Working : coupon creation : add default rule (thelia.constraint.rule.available_for_everyone) 2013-09-23 23:04:00 +02:00
gmorel
e4658d2fa2 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud (68) and others
# Via Manuel Raynaud (12) and others
* 'master' of https://github.com/thelia/thelia: (119 commits)
  order tests
  action order tests
  cache dataccessfunctions
  order action test
  fire event on insert content in createmethod
  fix issue, default foler is set on content creation
  allow to create new content
  update default param of content model
  create content listener for crud management
  dispatch event in pre/post crud method for content model
  display content modification page
  create contentUpdateEvent
  create contentCreateEvent
  create ContentEvent
  create contentModificationForm
  create content controller
  change folder_id parm by parent in list folder view
  use placeholder in folder update route
  implement process for changing folder position
  allow possibility to change folder visibility
  ...

Conflicts:
	core/lib/Thelia/Coupon/CouponBaseAdapter.php
	templates/admin/default/coupon-list.html
	templates/admin/default/coupon-read.html
 2013-09-23 21:03:26 +02:00
Manuel Raynaud
fea156635d allow to delete content 2013-09-23 12:40:01 +02:00
Manuel Raynaud
7bc34d3d0f toofle content visibility 2013-09-23 12:08:59 +02:00
Etienne Roudeix
d015c8c3b8 cache dataccessfunctions 2013-09-23 11:24:30 +02:00
Manuel Raynaud
1da66ece29 update default param of content model 2013-09-21 16:07:25 +02:00
Manuel Raynaud
849c7dd20b display content modification page 2013-09-21 15:20:06 +02:00
Manuel Raynaud
4ec55e5aca create contentUpdateEvent 2013-09-21 14:40:35 +02:00
Manuel Raynaud
09abedeb9f create contentCreateEvent 2013-09-21 14:37:20 +02:00
Manuel Raynaud
444cee8e82 create ContentEvent 2013-09-21 14:35:01 +02:00
Manuel Raynaud
423860932f create contentModificationForm 2013-09-21 14:32:01 +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
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
gmorel
8e308d21e9 Working : Coupon : fix update effect (becomes type), update max usage 2013-09-19 23:25:01 +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