# By gmorel (24) and others
# Via gmorel (12) and others
* 'master' of https://github.com/thelia/thelia: (43 commits)
Working : upload file/image : fix sanitizeFileName
Working : images : enhance display
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
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
Upload allow only for images
...
Conflicts:
core/lib/Thelia/Model/Base/AttributeTemplate.php
core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
install/faker.php
install/thelia.sql
local/config/schema.xml
templates/admin/default/assets/js/coupon.js
tests/functionnal/casperjs/exe/00_parameters.js
tests/functionnal/casperjs/exe/31_coupons_rule.js
# 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
# 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
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (8) and others
* 'master' of https://github.com/thelia/thelia: (47 commits)
tax engine
tax engine
- Add orders view route - Add view & action for orders index
Removed a redondant "use"
Add tooltip
- Add creation address form - Add addresses list - Add update address form
Added process_assets config variable
Change breadcrumb separator color
Add breadcrumb to customers view
- Change boolean type to integer type for update_logged_in_user field - Create view for customer modification
syntax
use ROUTER::ABSOLUTE_URL by default
PSE loop todo
currency management in PSE loop
Add customer view finish
Add modal for create/delete customer
Update body background
fixed typo
searching route return relative path
pse loop currency
...
Conflicts:
core/lib/Thelia/Controller/Admin/CouponController.php
core/lib/Thelia/Core/Event/TheliaEvents.php
web/index_dev.php
# By Manuel Raynaud (18) and others
# Via franck (9) and others
* 'master' of https://github.com/thelia/thelia: (39 commits)
Working :
Working :
Working :
Working :
Fixed minor visual glitches
Working : Resize countries flag + Add bootstrap-switch
fix test suite
clear asset cache in cache:cler command
Added a 'development mode' to assetic smarty plugin
rewriting router
use good Request object
Added Tools\URL test case, and a test case superclass for initializing Tools\URL
remove unused UrlWritin controller
create router for rewriting matching
customer substitutions
fix typo in front id
Working : For attributes on labels
Working : For attributes on labels
add label_attr attribute to form smarty plugin
start refactorin rewriting routing
...
Conflicts:
core/lib/Thelia/Config/Resources/routing/front.xml
templates/admin/default/assets/less/thelia/bootstrap-editable.less
templates/admin/default/categories.html
# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
WIP : Comment of route url-rewriting.check
Working : Fix script reset
Working : Cleanup admin new version bootstrap v3
Working : Finish renaming class for bootstrap migration
Working : Major class changes migration from bootstrap 2.x to 3.0
Conflicts:
reset_install.sh
templates/admin/default/assets/css/admin.less
