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
c8755071c9
complete changelog
2014-01-08 14:22:30 +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
Manuel Raynaud
3c19388078
fix propel type in schema file
2014-01-07 11:17:26 +01:00
Manuel Raynaud
7d085e2a88
Merge pull request #159 from enurit/patch-1
...
update breadcrumb.tpl unescape the last item
2014-01-07 02:08:41 -08:00
enurit
535f3dd850
update breadcrumb.tpl unescape the last item
...
The last item need to be unescape too
2014-01-07 11:02:08 +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
2014-01-06 11:25:25 +01:00
Manuel Raynaud
d4582f467f
Merge pull request #158 from gmorel/coupon
...
Coupon - Refactor the way conditions are managed when building Coupon
2014-01-06 00:44:25 -08: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
c671b3f93b
update changelog
2014-01-02 13:05:58 +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
Manuel Raynaud
fbeeda93d4
Merge pull request #157 from gmorel/coupon
...
Coupon : Fix bug preventing to update Coupon
2014-01-02 00:19:48 -08:00
Manuel Raynaud
49782765b4
put at the beginning of changelog file the new features
2014-01-01 16:26:49 +01:00
gmorel
46c68ae4c2
Coupon : Fix bug preventing to update coupon
...
Use $parent instead of $folder_id in folders admin template
uncomment needed return statement
add missing value in folder modification form
uncomment needed loop for parent folder
start a new section in changelog file
2014-01-01 16:20:34 +01:00
Manuel Raynaud
a06dd9916c
put at the beginning of changelog file the new features
2013-12-31 09:22:30 +01:00
Manuel Raynaud
652b1e02d1
start a new section in changelog file
2013-12-31 09:15:21 +01:00
Manuel Raynaud
465bdf76ac
Merge pull request #156 from gmorel/coupon
...
Coupon - Refactor the way parameters are stored
2013-12-31 00:00:40 -08:00
gmorel
cfbc579022
Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
...
Remove submodule
2013-12-30 21:37:26 +01:00
gmorel
67b89dbecd
Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
...
Remove submodule
2013-12-30 01:13:36 +01:00
gmorel
8574e1b36e
Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
2013-12-30 00:58:43 +01:00
gmorel
3e12ace045
Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
2013-12-30 00:50:04 +01:00
gmorel
15219b11f4
Coupon : Fix controller
2013-12-29 18:11:52 +01:00
gmorel
039b439ffb
Coupon : remove .gitmodule
2013-12-29 18:09:43 +01:00
Manuel Raynaud
c47d0d0276
uncomment needed loop for parent folder
2013-12-29 17:18:52 +01:00
Manuel Raynaud
fda7002418
add missing value in folder modification form
2013-12-29 17:18:52 +01:00
Manuel Raynaud
29feda718b
uncomment needed return statement
2013-12-29 17:18:52 +01:00
Manuel Raynaud
b3b414cb70
Use $parent instead of $folder_id in folders admin template
2013-12-29 17:18:52 +01:00
gmorel
2508ee3230
Coupon : Fix unit test
2013-12-29 15:45:42 +01:00
gmorel
9a22bdafa1
Coupon : Fix unit test
2013-12-29 14:47:51 +01:00
gmorel
ae1a05eb85
Merge
2013-12-29 04:28:11 +01:00
gmorel
ff2b1b6376
Refactor : Thelia2 can now deduce extended effect parameters
2013-12-29 04:27:55 +01:00
gmorel
b41d7c69cc
Update changelog
2013-12-29 01:26:33 +01:00
gmorel
f8ac32a4a0
Refactor : Coupon effect inputs are now more customisable
...
Adding effect to be stored as serialised in JSON
2013-12-29 01:23:50 +01:00
Manuel Raynaud
b257b16285
uncomment needed loop for parent folder
2013-12-28 11:05:42 +01:00
