Manuel Raynaud
9b81e88946
fix pdf generation. Fix #170
2014-01-17 12:23:08 +01:00
Manuel Raynaud
4e1521775f
alloow possibility to specify a ref for a customer
2014-01-17 11:15:55 +01:00
Manuel Raynaud
c25fdd7e42
fix exception not thrown correctly
2014-01-17 10:37:52 +01:00
Franck Allimant
42737940a9
The router id is now configurable via setters and getters to allow
...
modules to use their own router.
2014-01-16 19:35:12 +01:00
Franck Allimant
30b8277975
Fixed internationalisation of exceptions
2014-01-16 12:20:17 +01:00
Franck Allimant
435e195a53
Delete a module when module directory is missing is now possible.
2014-01-16 12:13:29 +01:00
Franck Allimant
e0ef07bb1e
Delete module request contains now "data data" flag
2014-01-16 12:02:08 +01:00
Franck Allimant
9335a41447
Delete module request contains now "data data" flag
2014-01-16 12:01:54 +01:00
Franck Allimant
77837b74da
Fixed delete module route
2014-01-16 12:01:42 +01:00
Franck Allimant
8f06c8050b
Delete module request contains now "data data" flag
2014-01-16 12:01:05 +01:00
Franck Allimant
b27fbd776f
A generated module works now out of the box (no need to update
...
module.xml)
2014-01-16 11:25:09 +01:00
Franck Allimant
380e856df8
Fixed obsolete comment
2014-01-16 10:54:03 +01:00
Etienne Roudeix
98a21c72c5
fix empty argument in loop issue
2014-01-15 12:26:46 +01:00
Manuel Raynaud
0c564be4c5
Merge branch 'master' of https://github.com/enurit/thelia into enurit-master
...
Conflicts:
templates/frontOffice/default/I18n/fr_FR.php
2014-01-14 19:21:01 +01:00
Emmanuel Nurit
b6a4ae7749
[Back-office] Add core translation
2014-01-14 15:18:03 +01:00
Manuel Raynaud
eb5056f089
AbstractController::getExistingObject return object with hte needed
...
locale inside
2014-01-14 14:39:08 +01:00
Manuel Raynaud
d73eaad981
move tinymce to resources folder
2014-01-14 10:36:37 +01:00
Manuel Raynaud
882bfeb80c
import missing namespaces in Proruct controller
2014-01-13 10:12:08 +01:00
Manuel Raynaud
7aad8b23f0
hide passord on admin creation using CLI
2014-01-13 10:00:20 +01:00
Etienne Roudeix
f732bbed5e
Merge branch 'master' of github.com:thelia/thelia
2014-01-10 16:29:27 +01:00
Etienne Roudeix
a293cb3a76
remove useless code in auth loop
2014-01-10 16:28:29 +01:00
Manuel Raynaud
3121fc4f5f
clear order and consumed coupon in session after processing order. Fix #162
2014-01-10 14:55:52 +01:00
Manuel Raynaud
9d0121f321
fix cs
2014-01-10 11:41:55 +01:00
Manuel Raynaud
149a943a0e
don't save the currentCoupons in a property. Retrieve them from the
...
session
2014-01-10 11:20:57 +01:00
Manuel Raynaud
75007cc6c5
don't save order untill it's not the payment method
2014-01-10 10:34:57 +01:00
Manuel Raynaud
7ec7fcfa5e
check if pbject exists before deleting it
2014-01-10 09:40:33 +01:00
Manuel Raynaud
74b314b5df
update some code
2014-01-08 16:35:17 +01:00
Manuel Raynaud
8dcbed7b8d
import missing namespace
2014-01-08 16:25:30 +01:00
Manuel Raynaud
8214ab77ec
refactor update process. Now only available with command line
2014-01-08 16:23:54 +01:00
Manuel Raynaud
f1ce5a3f70
increase thelia version
2014-01-08 15:47:49 +01:00
Manuel Raynaud
653c418aa6
log more events in update process
2014-01-08 14:37:58 +01:00
Manuel Raynaud
366454ebe8
create sql script for migrations
2014-01-08 14:16:32 +01:00
Manuel Raynaud
97a9ff26be
finish update process
2014-01-08 12:16:25 +01:00
Manuel Raynaud
6a9fd30a53
create new entry in config menu and not needed update page
2014-01-08 12:16:25 +01:00
Manuel Raynaud
b72fab5212
start update process
2014-01-08 12:16:25 +01:00
Manuel Raynaud
6070d74ac3
update propel version
2014-01-08 12:05:56 +01:00
Etienne Roudeix
678aa0c5a0
fix the mess
2014-01-07 10:04:30 +01:00
Etienne Roudeix
d517c9a4ff
fix parser
2014-01-06 15:58:19 +01:00
Etienne Roudeix
26aae5adfc
remove cache behavior from product table
2014-01-06 14:20:12 +01:00
Etienne Roudeix
4e847bf5ae
fix model
2014-01-06 12:23:01 +01:00
Etienne Roudeix
6a64f827ce
fix conflicts
2014-01-06 12:14:56 +01:00
Etienne Roudeix
99038e688a
Revert "Revert "Merge branch 'cleanmaster' into modules""
...
This reverts commit b3ac365b45 .
Conflicts:
Readme.md
core/lib/Thelia/Controller/Admin/AbstractCrudController.php
core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
core/lib/Thelia/Core/Template/TemplateDefinition.php
core/lib/Thelia/Model/Base/Coupon.php
core/lib/Thelia/Model/Base/CouponQuery.php
core/lib/Thelia/Model/Base/CouponVersion.php
core/lib/Thelia/Model/Base/CouponVersionQuery.php
core/lib/Thelia/Model/Base/OrderCouponQuery.php
2014-01-06 11:25:25 +01:00
gmorel
e038c330c7
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia :
update changelog
delete product on category removal. delete only when it's the default category. Fix issue #151
delete all sub categories on category removal, fix issue #150
session parameter is needed on TaxEngine::getInstance method
put at the beginning of changelog file the new features
start a new section in changelog file
uncomment needed loop for parent folder
add missing value in folder modification form
uncomment needed return statement
Use $parent instead of $folder_id in folders admin template
2014-01-05 20:20:11 +01:00
gmorel
b8c2c2d703
Coupon : Condition module : add tooltip on condition select
2014-01-05 20:17:30 +01:00
gmorel
db09e0b224
Coupon : Condition module fix unit tests
2014-01-05 19:02:19 +01:00
gmorel
716e26986f
Coupon : Condition module cleaning
2014-01-05 01:14:41 +01:00
gmorel
e606a6f8ce
Coupon : Condition module refactor
...
Less crappy unmaintainable javascript
More logic in extendable php
2014-01-05 00:00:15 +01:00
Manuel Raynaud
cf255a6a9c
delete product on category removal. delete only when it's the default
...
category. Fix issue #151
2014-01-02 13:02:11 +01:00
Manuel Raynaud
b992cc8488
delete all sub categories on category removal, fix issue #150
2014-01-02 10:30:24 +01:00
Manuel Raynaud
6057c69f95
session parameter is needed on TaxEngine::getInstance method
2014-01-02 10:07:51 +01:00