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

1582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gmorel
116c8c31b4 Merge branch 'master' of https://github.com/thelia/thelia 
# By Manuel Raynaud (80) and others
# Via Manuel Raynaud (16) and others
* 'master' of https://github.com/thelia/thelia: (179 commits)
  Working : images : enhance display
  fix missing } in password template
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event
  remove smarty cache
  Finished product combination basic function
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Formatted combination table
  Impemented combination creation
  Working : Upload image : Fix upload validation
  - Image format allowed - manual-reverse order on image loop
  ...
 2013-09-27 10:20:02 +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
gmorel
dcd7d6dd4f Merge branch 'upload_management' of https://github.com/thelia/thelia into catalog 
* 'upload_management' of https://github.com/thelia/thelia:
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event
 2013-09-25 09:26:05 +02:00
gmorel
8b5c3820d5 Merge branch 'catalog' of https://github.com/thelia/thelia into catalog 
# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Finished product combination basic function
  Formatted combination table
 2013-09-25 09:25:28 +02:00
Manuel Raynaud
9c80120383 fix missing } in password template 2013-09-25 08:01:27 +02:00
gmorel
cef3787d68 Working : Fix : Unit test 2013-09-24 19:06:10 +02:00
gmorel
87016ddddb Working : Fix : Unit test 2013-09-24 18:54:38 +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
gmorel
71888e68aa Working : FileManager :Add some more unit tests 2013-09-24 14:50:42 +02:00
gmorel
430e18e4e2 Working : Add a link on documents 2013-09-24 12:25:19 +02:00
gmorel
0c769a3398 Working : fix url document + refactor : naming conventions 2013-09-24 12:24:40 +02:00
gmorel
17e312ca23 Working : refactor : naming conventions 2013-09-24 12:13:25 +02:00
gmorel
466113bc12 Working : upload : fix unit test 2013-09-24 11:11:50 +02:00
gmorel
084f66589a WIP : upload documents : add action, ctrl, event 2013-09-24 10:54:52 +02:00
Manuel Raynaud
d004e0411e remove smarty cache 2013-09-24 08:17:46 +02:00
Manuel Raynaud
1e571ffbc5 Merge branch 'content' 2013-09-23 23:35:05 +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
695b2b4d94 Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management 
# By gmorel (3) and franck (1)
* 'catalog' of https://github.com/thelia/thelia:
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Impemented combination creation
 2013-09-23 18:15:24 +02:00
gmorel
9ee8b2b75f WIP : upload document : add forms 2013-09-23 18:13:12 +02:00
gmorel
ce7a9eccfc Working : upload image : fix return URL to images tab 2013-09-23 17:28:11 +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
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