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

268 Commits

Author SHA1 Message Date
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
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
849c7dd20b display content modification page 2013-09-21 15:20:06 +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
6a1df0240e process folder update action 2013-09-20 19:34:36 +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
mespeche
265da6a57e Add default language & editing language default field 2013-09-20 12:00:39 +02:00
mespeche
93fd189198 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-20 10:39:34 +02:00
mespeche
b933a96c8e Vertical align middle tables 2013-09-20 10:39:02 +02:00
franck
cb5f6d4c70 Fixed translations 2013-09-20 09:57:30 +02:00
mespeche
5abae4db7d Setting profile update 2013-09-20 09:35:56 +02:00
gmorel
8e308d21e9 Working : Coupon : fix update effect (becomes type), update max usage 2013-09-19 23:25:01 +02:00
mespeche
8731bf3c37 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-19 17:31:37 +02:00
mespeche
169b3c2659 Setting profile edition route and view 2013-09-19 17:30:57 +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
franck
05aa284f4b Fixed minor UI glithces 2013-09-19 17:06:10 +02:00
mespeche
8a5f15c952 All tables are now responsive 2013-09-19 17:01:17 +02:00
mespeche
1d90e8ba54 Responsive management header 2013-09-19 16:42:03 +02:00
mespeche
e1c2f8da0a Add link on ref to edit customer 2013-09-19 16:10:14 +02:00
mespeche
3fd5e4f3ad Setting of modules index view 2013-09-19 16:07:45 +02:00
mespeche
94aab3ea8a Add modules routing and default action/view 2013-09-19 13:27:47 +02:00
mespeche
2640794af7 Change properties of bootstrap-select field 2013-09-19 13:21:42 +02:00
mespeche
260fc5b51a Width 100% on bootstrap-select 2013-09-19 12:47:56 +02:00
mespeche
0ebaf458ed - Adding of bootstrap-select 
- Finish shipping_configuration view
- bootstrap-select on shipping_zones view
 2013-09-19 12:31:46 +02:00
Manuel Raynaud
466798e7af start creating folder management 2013-09-19 11:31:13 +02:00
mespeche
a02ba364be Change background image to simple background color 2013-09-19 10:15:14 +02:00
mespeche
18d9e03172 Finish shipping configuration default view 2013-09-18 23:14:29 +02:00
mespeche
86078d3054 - Edit shipping_zone routes 
- Create shipping_configuration routes
 2013-09-18 19:33:24 +02:00
mespeche
42ad62d2cd Shipping zones views and routes creation 2013-09-18 19:20:51 +02:00
mespeche
8841958646 Add languages files and set english by default 2013-09-18 18:09:07 +02:00
mespeche
72c0685bfa Setting of tinymce and filemanager 2013-09-18 18:00:44 +02:00
mespeche
9fdf648451 Merge branch 'master' of https://github.com/thelia/thelia 2013-09-18 15:39:03 +02:00
mespeche
25becbe0cc WIP : Setting Folders management 2013-09-18 15:38:08 +02:00
franck
0214836a54 Added {url file='...'} to get file pathes 2013-09-18 12:15:17 +02:00
mespeche
742b90b24c Merge branch 'master' of https://github.com/thelia/thelia 2013-09-18 11:55:04 +02:00
mespeche
c7a6fe060f - Setting dashboard view with jqplot plugin 2013-09-18 11:53:39 +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
gmorel
be665cba56 Working : Coupon : fix loop, fix read display 2013-09-17 23:25:38 +02:00
gmorel
542a142329 Working : Coupon : fix loop, fix read display 2013-09-17 23:19:09 +02:00
franck
a9009b7e52 Started product management 2013-09-17 17:15:15 +02:00
franck
3d78af8b97 Finished category related content management 2013-09-17 13:50:01 +02:00
franck
7858e809b7 Added UrlRewritingTrait to manage URLs from model classes 2013-09-16 22:31:55 +02:00
franck
2f41d4db6f Started category management 2013-09-16 18:58:45 +02:00
mespeche
a229f555cb No alert bloc 2013-09-16 15:32:52 +02:00