Franck Allimant
5f883a41a4
Introduced money_format smarty plugin, and the related formatting class.
...
TODO: define the currency symbol location (left or right) in i18n params !
2014-01-25 19:00:29 +01:00
Manuel Raynaud
1b2c1d53ac
remove some unused variables
2014-01-22 15:50:40 +01:00
Manuel Raynaud
1974d3e3c3
fix psr
2014-01-22 12:52:36 +01:00
Etienne Roudeix
99038e688a
Revert "Revert "Merge branch 'cleanmaster' into modules""
...
This reverts commit b3ac365b45
2014-01-06 11:25:25 +01:00
Etienne Roudeix
b3ac365b45
Revert "Merge branch 'cleanmaster' into modules"
...
This reverts commit d0ff5260f767d0101dbe
2013-12-20 11:16:42 +01:00
Manuel Raynaud
2f4158d1f6
fix cs
2013-12-18 10:04:13 +01:00
Etienne Roudeix
83cac71895
fix urls in loops
2013-12-10 15:48:22 +01:00
Etienne Roudeix
28d2add37d
fix tests
2013-12-09 15:02:09 +01:00
Etienne Roudeix
090b201fea
test rewriting
2013-12-09 13:01:39 +01:00
Franck Allimant
c2292b75d4
Fixed issue #123 . Introduced NumberFormat::formatStandardNumber()
2013-12-05 18:46:35 +01:00
gmorel
e7038c9369
Spelling rewritten with 2 t
2013-11-27 20:37:40 +01:00
Franck Allimant
2aefb87db7
Finished log configuration. All loggers are currentrly working
2013-11-01 16:15:19 +01:00
Etienne Roudeix
19e373f7fe
Merge branch 'master' of github.com:thelia/thelia
2013-10-29 16:10:10 +01:00
Etienne Roudeix
082f9aff8d
admin logs
2013-10-29 12:22:34 +01:00
Manuel Raynaud
7a2469cdc8
allow to create a customer in bakcoffice
2013-10-28 16:55:07 +01:00
Manuel Raynaud
2c030f910b
fix cs
2013-10-25 10:07:21 +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
7ca2399573
Worked on catalog
2013-10-23 23:47:44 +02:00
Manuel Raynaud
1f55d569ef
change place where absolute url is create when rewritten url is enabled
2013-10-21 15:15:17 +02:00
Manuel Raynaud
d8ec745fea
fix issue concerning absoluteUrl
2013-10-09 12:44:49 +02:00
Manuel Raynaud
c65ec67bdf
fix cs
2013-09-30 10:35:34 +02:00
Manuel Raynaud
43b5a129f7
refactor order and image events
2013-09-30 10:34:08 +02:00
Manuel Raynaud
6d5f34767d
refactor document events
2013-09-30 10:32:48 +02:00
gmorel
c8e56625ad
Working : upload file/image : fix sanitizeFileName
2013-09-27 10:21:49 +02:00
gmorel
cef3787d68
Working : Fix : Unit test
2013-09-24 19:06:10 +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
084f66589a
WIP : upload documents : add action, ctrl, event
2013-09-24 10:54:52 +02:00
gmorel
ce7a9eccfc
Working : upload image : fix return URL to images tab
2013-09-23 17:28:11 +02:00
gmorel
9da50760b5
Working : Upload image : Fix upload validation
2013-09-23 16:52:50 +02:00
gmorel
4f78af4f3b
WIP : Upload image : set product image form loaded via ajax
2013-09-23 12:42:02 +02:00
gmorel
b91a11536b
Working : Image management set on Category
2013-09-22 20:50:42 +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
gmorel
ced7b5e6dc
WIP : Upload management (upload+save+delete done) need to finish integration and add all image fields
2013-09-20 16:51:34 +02:00
Etienne Roudeix
8541499302
order process
2013-09-20 16:25:46 +02:00
Etienne Roudeix
45106f24bd
module image
2013-09-18 15:58:58 +02:00
franck
d097851522
Added documents action and loop
2013-09-17 01:07:42 +02:00
franck
7858e809b7
Added UrlRewritingTrait to manage URLs from model classes
2013-09-16 22:31:55 +02:00
franck
71c1cee66d
Implemented "Remember Me" feature on admin. Started template management
2013-09-16 09:23:44 +02:00
franck
7cd44c3867
Merge branch 'master' of https://github.com/thelia/thelia
2013-09-13 00:16:56 +02:00
franck
6a66a3f99a
Fixed duplication parameter check regexp
2013-09-13 00:16:29 +02:00
franck
d1d9892ae8
absoluteUrl prevetn duplicate parameters in generated URL
2013-09-12 22:10:51 +02:00
Etienne Roudeix
a73c9e1de4
fix current url bug + fix empty loop pagination exception
2013-09-12 17:20:33 +02:00
Manuel Raynaud
e2a5ee90ff
use ROUTER::ABSOLUTE_URL by default
2013-09-11 11:03:35 +02:00
Manuel Raynaud
70d93d1daa
fix cs
2013-09-11 08:27:40 +02:00
Manuel Raynaud
7eb3ec41fe
complete login form
2013-09-10 12:16:19 +02:00
Etienne Roudeix
519678a543
Merge branch 'tax'
2013-09-09 16:28:32 +02:00
Etienne Roudeix
ca4df15910
tax in loops
2013-09-09 16:27:46 +02:00
gmorel
c1a79028a1
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
# By Manuel Raynaud (19) and others
# Via Manuel Raynaud (5) and others
* 'master' of https://github.com/thelia/thelia : (37 commits)
add PropelDataCollector to debugbar, still missing some informations
remove unused class
integrate debugbar module
remove htmlpurifier
modify insert.sql including debugBar module
add new event and new tag
Started category modification
Factorized modal dialogs javascript
Factorized creation and confirmation modal dialogs
create controller adding delivery module in session
create Delivery loop
Working :
Continuing categories administration...
Working :
create base loop for delivery and payment entities
remove htmlpurifier dependency
country id can be an argument for calculate method
Working :
Working :
fix typo
...
Conflicts:
composer.lock
core/lib/Thelia/Controller/Admin/CategoryController.php
templates/admin/default/assets/less/thelia/variables.less
2013-09-08 00:08:02 +02:00
