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

1186 Commits

Author SHA1 Message Date
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
Etienne Roudeix
533c4f743a Merge branch 'template' 2013-09-23 15:00:39 +02:00
Etienne Roudeix
2de820f576 order tests 2013-09-23 15:00:13 +02:00
Etienne Roudeix
5bbf693e0f action order tests 2013-09-23 14:44:52 +02:00
Etienne Roudeix
d015c8c3b8 cache dataccessfunctions 2013-09-23 11:24:30 +02:00
Etienne Roudeix
194073fa42 order action test 2013-09-23 11:12:41 +02:00
Manuel Raynaud
ac435b8f87 fire event on insert content in createmethod 2013-09-21 17:04:05 +02:00
Manuel Raynaud
04e0da56e7 fix issue, default foler is set on content creation 2013-09-21 16:58:38 +02:00
Manuel Raynaud
4e3768e0e9 allow to create new content 2013-09-21 16:38:22 +02:00
Manuel Raynaud
1da66ece29 update default param of content model 2013-09-21 16:07:25 +02:00
Manuel Raynaud
f44b7daf8c create content listener for crud management 2013-09-21 15:32:27 +02:00
Manuel Raynaud
7680fb42cc dispatch event in pre/post crud method for content model 2013-09-21 15:24:44 +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
52efd79fb5 create content controller 2013-09-21 14:10:08 +02:00
Manuel Raynaud
bb796f08b6 change folder_id parm by parent in list folder view 2013-09-21 13:55:12 +02:00
Manuel Raynaud
962081c17d use placeholder in folder update route 2013-09-21 13:42:00 +02:00
Manuel Raynaud
cc2a3914a9 implement process for changing folder position 2013-09-20 20:38:39 +02:00
Manuel Raynaud
abac607534 allow possibility to change folder visibility 2013-09-20 20:23:49 +02:00
Manuel Raynaud
a8dddc9c26 allow to create folder 2013-09-20 20:07:59 +02:00
Manuel Raynaud
aa39d6300c add dispatcher before/after for folder crud management 2013-09-20 19:57:25 +02:00
Manuel Raynaud
56197a739e icreate folder delete event 2013-09-20 19:49:12 +02:00
Manuel Raynaud
6a1df0240e process folder update action 2013-09-20 19:34:36 +02:00
Manuel Raynaud
00f7c491b2 create folder events 2013-09-20 19:00:41 +02:00
Manuel Raynaud
8a37636aa6 display info in folders edition template 2013-09-20 18:39:12 +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
b7af3ebaa3 push model 2013-09-20 17:02:19 +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
mespeche
265da6a57e Add default language & editing language default field 2013-09-20 12:00:39 +02:00
franck
93abd3387c Merge branch 'master' of https://github.com/thelia/thelia 2013-09-20 09:39:26 +02:00
franck
f7d2c09c6d Added producr attributes routes 2013-09-20 09:38:48 +02:00
mespeche
5abae4db7d Setting profile update 2013-09-20 09:35:56 +02:00
Manuel Raynaud
16de9bbcc9 allow displaying how much product wanted in category page 2013-09-20 09:19:12 +02:00
Etienne Roudeix
17548e3526 order tax tables 2013-09-20 08:23:02 +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
Etienne Roudeix
1d969e38ec order tables 2013-09-19 18:30:13 +02:00
mespeche
8731bf3c37 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-19 17:31:37 +02:00