Etienne Roudeix
7e3cbb6818
fix tests (or not ?)
2013-09-27 10:03:56 +02:00
Etienne Roudeix
0c2a0f8053
call reset_install script in travis
2013-09-27 09:50:28 +02:00
Etienne Roudeix
4bdc06e216
try to fix test
2013-09-27 09:30:22 +02:00
franck
62ce7db882
Merge branch 'catalog'
2013-09-26 19:07:06 +02:00
gmorel
dde8501790
WIP : coupon refactor + fix
2013-09-26 18:18:45 +02:00
gmorel
a1f898ff3b
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
# By Manuel Raynaud
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia :
fix missing } in password template
remove smarty cache
2013-09-26 17:48:06 +02:00
gmorel
fbf7ee1625
WIP : coupon refactor + fix
2013-09-26 17:47:50 +02:00
gmorel
73fde64f5b
WIP : coupon refactor + fix
2013-09-26 17:47:41 +02:00
gmorel
0cdd960cb1
Working : images : enhance display
2013-09-26 15:26:45 +02:00
Etienne Roudeix
49da6b1a3b
Merge branch 'master' into tax
2013-09-26 14:18:44 +02:00
Etienne Roudeix
97c461fa2c
order address changes tests
2013-09-26 14:17:26 +02:00
gmorel
c521fb2696
WIP : Condition : refactor name
2013-09-26 14:12:59 +02:00
gmorel
9ceddf4870
WIP : Condition : refactor name
2013-09-26 14:12:53 +02:00
Etienne Roudeix
f5492ed2f9
tests for order update actions
2013-09-26 13:25:25 +02:00
Etienne Roudeix
34ef5cf524
edit order form
2013-09-26 13:07:51 +02:00
Etienne Roudeix
5e0f9cedf5
fix tests
2013-09-26 10:43:09 +02:00
gmorel
4d3335f589
WIP : Condition : Fix unit text
2013-09-25 18:15:48 +02:00
Manuel Raynaud
3a7a76afe0
move folders action class to Folder directory
2013-09-25 17:53:38 +02:00
Manuel Raynaud
a8a8ecb38c
refactor product events, moving to Prduct folder
2013-09-25 17:50:29 +02:00
gmorel
965a505864
WIP : Condition : Fix unit text
2013-09-25 17:47:42 +02:00
gmorel
0da90c4a99
WIP : Condition : Fix unit text
2013-09-25 17:22:36 +02:00
gmorel
45fabcfdd6
WIP : Refactor contraint/rule becomes conditions (more generic)
2013-09-25 16:47:01 +02:00
gmorel
c10074786d
Merge branches 'coupon' and 'master' of https://github.com/thelia/thelia into coupon
...
* 'coupon' of https://github.com/thelia/thelia :
# By Manuel Raynaud
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia :
allow to delete content
toofle content visibility
allow to load jquery offline
allow update content position number
2013-09-25 16:40:54 +02:00
gmorel
b7851b2d54
WIP : Refactor contraint/rule becomes conditions (more generic)
2013-09-25 16:36:14 +02:00
Etienne Roudeix
24467edd29
Merge branch 'master' into tax
2013-09-25 15:58:43 +02:00
Etienne Roudeix
1ffcaa7dd4
order admin
2013-09-25 15:55:48 +02:00
gmorel
d6172f23cf
WIP : Refactor contraint/rule becomes conditions (more generic)
2013-09-25 14:51:42 +02:00
Etienne Roudeix
d967242a59
order admin
2013-09-25 13:26:12 +02:00
gmorel
cb389f126c
WIP : Refactor contraint/rule becomes conditions (more generic)
2013-09-25 12:58:12 +02:00
gmorel
451f79be1a
Merge branch 'coupon' of https://github.com/thelia/thelia into coupon
...
# By Manuel Raynaud (80) and others
# Via Etienne Roudeix (18) and others
* 'coupon' of https://github.com/thelia/thelia: (179 commits)
Working : coupon creation : Fix js
Working : coupon creation : add default rule (thelia.constraint.rule.available_for_everyone)
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
...
2013-09-25 09:27:21 +02:00
gmorel
dcd7d6dd4f
Merge branch 'upload_management' of https://github.com/thelia/thelia into catalog
...
* 'upload_management' of https://github.com/thelia/thelia :
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
2013-09-25 09:26:05 +02:00
gmorel
8b5c3820d5
Merge branch 'catalog' of https://github.com/thelia/thelia into catalog
...
# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia :
Finished product combination basic function
Formatted combination table
2013-09-25 09:25:28 +02:00
Manuel Raynaud
9c80120383
fix missing } in password template
2013-09-25 08:01:27 +02:00
gmorel
033bebdd30
Working : coupon creation : Fix js
2013-09-24 22:46:54 +02:00
gmorel
cef3787d68
Working : Fix : Unit test
2013-09-24 19:06:10 +02:00
gmorel
87016ddddb
Working : Fix : Unit test
2013-09-24 18:54:38 +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
Etienne Roudeix
7bd511c420
order admin
2013-09-24 17:04:32 +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
0c769a3398
Working : fix url document + refactor : naming conventions
2013-09-24 12:24:40 +02:00
gmorel
17e312ca23
Working : refactor : naming conventions
2013-09-24 12:13:25 +02:00
Etienne Roudeix
4600727163
order admin
2013-09-24 12:10:22 +02:00
gmorel
466113bc12
Working : upload : fix unit test
2013-09-24 11:11:50 +02:00
gmorel
084f66589a
WIP : upload documents : add action, ctrl, event
2013-09-24 10:54:52 +02:00
Etienne Roudeix
93e7a4dc90
order admin integration
2013-09-24 09:44:59 +02:00
Etienne Roudeix
b7c8c7584d
Merge branch 'master' into tax
2013-09-24 09:15:52 +02:00
Etienne Roudeix
fbd91c1925
add admin templates
2013-09-24 09:15:41 +02:00
Manuel Raynaud
d004e0411e
remove smarty cache
2013-09-24 08:17:46 +02:00
