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

1619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gmorel
7aed1b6707 Merge remote-tracking branch 'origin/upload_management' into upload_management 
Conflicts:
	templates/admin/default/assets/js/image-upload.js
 2013-09-23 16:54:34 +02:00
gmorel
9da50760b5 Working : Upload image : Fix upload validation 2013-09-23 16:52:50 +02:00
mespeche
ddabf3fcbc - Image format allowed 
- manual-reverse order on image loop
 2013-09-23 15:26:52 +02:00
mespeche
3b397bed47 Upload allow only for images 2013-09-23 15:18:13 +02:00
mespeche
2360d145d6 Merge branch 'upload_management' of https://github.com/thelia/thelia into upload_management 2013-09-23 15:12:02 +02:00
mespeche
82be007dde Hide upload zone during upload 2013-09-23 15:11:21 +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
gmorel
e39511e3dc Working : Upload image : Fix unit tests 2013-09-23 14:55:36 +02:00
Etienne Roudeix
5bbf693e0f action order tests 2013-09-23 14:44:52 +02:00
gmorel
d0376d31f9 Working : Upload image : set product image form loaded via ajax, fix category, folder, content 2013-09-23 14:42:23 +02:00
gmorel
ac35f1f6fd Merge branch 'upload_management' of https://github.com/thelia/thelia into upload_management 
# By mespeche
# Via mespeche
* 'upload_management' of https://github.com/thelia/thelia:
  Setting tinymce
  Update uploader view Update image edit view
 2013-09-23 12:42:12 +02:00
gmorel
4f78af4f3b WIP : Upload image : set product image form loaded via ajax 2013-09-23 12:42:02 +02:00
Manuel Raynaud
fea156635d allow to delete content 2013-09-23 12:40:01 +02:00
mespeche
dfa162d53b Setting tinymce 2013-09-23 12:38:24 +02:00
mespeche
144864de09 Merge branch 'upload_management' of https://github.com/thelia/thelia into upload_management 2013-09-23 12:31:01 +02:00
mespeche
1ea614be57 Update uploader view 
Update image edit view
 2013-09-23 12:30:34 +02:00
gmorel
19782f6852 Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management 
# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Finished combination creation GUI
  Put curresncy selector in toolbar
  Started price tab
  Finished product multiple categories attachment
  Ajaxified product modification tabs
  Finished product features management
  Aded feature_template and category_template position management
  Finished product feature values
  Fixed product update process
  Added missing files
  Working catalog branch

Conflicts:
	core/lib/Thelia/Action/BaseAction.php
	install/insert.sql
	local/config/schema.xml
	templates/admin/default/folders.html
	templates/admin/default/product-edit.html
 2013-09-23 12:27:36 +02:00
Manuel Raynaud
7bc34d3d0f toofle content visibility 2013-09-23 12:08:59 +02:00
gmorel
c1d89e85c9 Working : Upload management : on content 2013-09-23 11:57:19 +02:00
gmorel
b02feefc33 Merge branch 'master' of https://github.com/thelia/thelia into upload_management 
# By Manuel Raynaud (14) and Etienne Roudeix (1)
# Via Etienne Roudeix
* 'master' of https://github.com/thelia/thelia:
  cache dataccessfunctions
  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
 2013-09-23 11:55:24 +02:00
gmorel
5846a5f288 Working : Upload management : on folder, category, product 2013-09-23 11:55:02 +02:00
Manuel Raynaud
74fde51d96 allow to load jquery offline 2013-09-23 11:44:05 +02:00
franck
e7974a21a7 Finished combination creation GUI 2013-09-23 11:41:14 +02:00
Manuel Raynaud
49f79071a6 allow update content position number 2013-09-23 11:39:53 +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
gmorel
7c563eda42 Working : Upload management : fix e.preventDefault in chrome and safari 2013-09-23 10:33:36 +02:00
franck
915516e679 Put curresncy selector in toolbar 2013-09-23 01:22:54 +02:00
franck
8781721512 Started price tab 2013-09-23 00:57:03 +02:00
franck
22f3f49f79 Finished product multiple categories attachment 2013-09-22 22:14:39 +02:00
gmorel
b91a11536b Working : Image management set on Category 2013-09-22 20:50:42 +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
franck
72a2cdfd75 Ajaxified product modification tabs 2013-09-21 16:51:51 +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
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
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
franck
bb9e1d6999 Finished product features management 2013-09-21 14:14:56 +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
franck
e3644cd6cc Aded feature_template and category_template position management 2013-09-21 11:46:09 +02:00