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

321 Commits

Author SHA1 Message Date
Etienne Roudeix
622e1ca3b6 Merge branch 'master' into tax 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml
 2013-09-27 10:29:51 +02:00
franck
62ce7db882 Merge branch 'catalog' 2013-09-26 19:07:06 +02:00
gmorel
0cdd960cb1 Working : images : enhance display 2013-09-26 15:26:45 +02:00
Etienne Roudeix
34ef5cf524 edit order form 2013-09-26 13:07:51 +02:00
Etienne Roudeix
5e0f9cedf5 fix tests 2013-09-26 10:43:09 +02:00
Etienne Roudeix
24467edd29 Merge branch 'master' into tax 2013-09-25 15:58:43 +02:00
Etienne Roudeix
1ffcaa7dd4 order admin 2013-09-25 15:55:48 +02:00
Etienne Roudeix
d967242a59 order admin 2013-09-25 13:26:12 +02:00
gmorel
dc17f89729 Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management 
# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Finished product combination basic function
  Formatted combination table
 2013-09-24 18:41:57 +02:00
gmorel
7f3367f590 Working : Fix : Image Management + Document Management 2013-09-24 18:41:28 +02:00
Etienne Roudeix
7bd511c420 order admin 2013-09-24 17:04:32 +02:00
gmorel
430e18e4e2 Working : Add a link on documents 2013-09-24 12:25:19 +02:00
Etienne Roudeix
4600727163 order admin 2013-09-24 12:10:22 +02:00
gmorel
084f66589a WIP : upload documents : add action, ctrl, event 2013-09-24 10:54:52 +02:00
Etienne Roudeix
93e7a4dc90 order admin integration 2013-09-24 09:44:59 +02:00
franck
8d61a9222e Merge branch 'catalog' of https://github.com/thelia/thelia into catalog 2013-09-23 18:37:33 +02:00
franck
67bf7bb989 Finished product combination basic function 2013-09-23 18:36:55 +02:00
gmorel
9ee8b2b75f WIP : upload document : add forms 2013-09-23 18:13:12 +02:00
franck
4e8f4061af Merge branch 'catalog' of https://github.com/thelia/thelia into catalog 2013-09-23 17:26:28 +02:00
gmorel
21e6f3471c Working : upload image : fix fallback and delete links on refresh 2013-09-23 17:25:31 +02:00
franck
780c6b3483 Merge branch 'catalog' of https://github.com/thelia/thelia into catalog 2013-09-23 17:11:09 +02:00
franck
1b81f8725a Formatted combination table 2013-09-23 17:10:33 +02:00
gmorel
3cb7289848 Merge branches 'catalog' and 'upload_management' of https://github.com/thelia/thelia into catalog 
# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Impemented combination creation

# By Manuel Raynaud (29) and others
# Via gmorel (6) and others
* 'upload_management' of https://github.com/thelia/thelia: (52 commits)
  Working : Upload image : Fix upload validation
  - Image format allowed - manual-reverse order on image loop
  Upload allow only for images
  Hide upload zone during upload
  Working : Upload image : Fix unit tests
  Working : Upload image : set product image form loaded via ajax, fix category, folder, content
  WIP : Upload image : set product image form loaded via ajax
  Setting tinymce
  Update uploader view Update image edit view
  Working : Upload management : on content
  Working : Upload management : on folder, category, product
  cache dataccessfunctions
  Working : Upload management : fix e.preventDefault in chrome and safari
  Working : Image management set on Category
  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
  ...

Conflicts:
	templates/admin/default/product-edit.html
 2013-09-23 17:10:03 +02:00
franck
645ff15fcf Impemented combination creation 2013-09-23 17:03:36 +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
82be007dde Hide upload zone during upload 2013-09-23 15:11:21 +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
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
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