TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,346 Commits 1 Branch 0 Tags
85ea937570cc676dd9c19afb7835bbdd756cd957
Commit Graph

114 Commits

Author SHA1 Message Date
Franck Allimant
dae07e1061 Fixed issue #86 2013-11-07 00:12:06 +01:00
Franck Allimant
f8f68eb59b Fixed minor internationalizable string error in admin templates. 2013-11-06 20:01:26 +01:00
Franck Allimant
8d40605091 Continued on translations 2013-11-06 14:40:33 +01:00
Franck Allimant
2aefb87db7 Finished log configuration. All loggers are currentrly working 2013-11-01 16:15:19 +01:00
Franck Allimant
3b9f94cec8 Using now templates instead of hard code in AdminUtilities smarty plugin 2013-10-31 12:16:14 +01:00
Franck Allimant
3019d36356 Minor adjustements 2013-10-30 17:31:02 +01:00
Franck Allimant
0cabe7b9e8 Combination creation management 2013-10-30 15:44:32 +01:00
Manuel Raynaud
2bec1d8193 remove some unused blocks 2013-10-25 10:27:29 +02:00
Franck Allimant
d9fc945015 Added TAX_RUl_ID to simple part of product loop 2013-10-25 00:46:25 +02:00
Franck Allimant
06cc8ce1ea Finished product combinations edition 2013-10-25 00:32:56 +02:00
Franck Allimant
4f7e7660ca Finished PSE management for products with no combinations 2013-10-24 16:39:22 +02:00
Franck Allimant
b9410bba59 Implemented prices conversion management 2013-10-24 12:34:44 +02:00
Franck Allimant
5bf51dd47e Merge branch 'catalog' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml
 2013-10-24 00:16:33 +02:00
Franck Allimant
0bd57b0a5a Worked on catalog 2013-10-23 23:41:39 +02:00
Manuel Raynaud
24b504ad3b finish language creation process 2013-10-23 12:38:32 +02:00
Etienne Roudeix
ddd8c4f7a5 fix auth loop 2013-10-22 15:57:31 +02:00
Etienne Roudeix
abe45c5798 Merge branch 'master' into tax 
Conflicts:
	core/lib/Thelia/Config/Resources/action.xml
	core/lib/Thelia/Controller/Admin/AddressController.php
	core/lib/Thelia/Controller/Admin/CustomerController.php
	core/lib/Thelia/Controller/Admin/ModuleController.php
 2013-10-21 17:48:13 +02:00
Etienne Roudeix
9a7708451a permission cleanup 2013-10-21 17:44:17 +02:00
Manuel Raynaud
a10fa20340 create event object for module delete action 2013-10-21 10:26:51 +02:00
Manuel Raynaud
12b5a81364 display error on ajax module activation 2013-10-18 09:17:08 +02:00
Manuel Raynaud
d25ad53d5a create module event and eventListener 2013-10-17 18:26:23 +02:00
Manuel Raynaud
4f83c7f078 display module list 2013-10-15 11:07:58 +02:00
Manuel Raynaud
34ec2364e3 finish contentFolder removing process 2013-10-01 10:24:09 +02:00
Manuel Raynaud
dfda04ddd2 create contentAddFolder process 2013-10-01 09:51:07 +02:00
Manuel Raynaud
cc370af113 create dedicate file for content folder management 2013-10-01 09:19:18 +02:00
Manuel Raynaud
fc0cac2cb9 fix usage of ProfilerConnectionWrapper 2013-09-30 15:35:46 +02:00
Manuel Raynaud
f25922c60a fix breadcrumb for content/folder part 2013-09-30 15:13:04 +02:00
Manuel Raynaud
d7e9752d63 create breadcrumb and FolderPath loop 2013-09-30 15:00:51 +02:00
gmorel
0cdd960cb1 Working : images : enhance display 2013-09-26 15:26:45 +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
430e18e4e2 Working : Add a link on documents 2013-09-24 12:25:19 +02:00
gmorel
084f66589a WIP : upload documents : add action, ctrl, event 2013-09-24 10:54:52 +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
gmorel
21e6f3471c Working : upload image : fix fallback and delete links on refresh 2013-09-23 17:25:31 +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
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
gmorel
5846a5f288 Working : Upload management : on folder, category, product 2013-09-23 11:55:02 +02:00
franck
e7974a21a7 Finished combination creation GUI 2013-09-23 11:41:14 +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
franck
72a2cdfd75 Ajaxified product modification tabs 2013-09-21 16:51:51 +02:00