Manuel Raynaud
cd51895366
update schema including new indexes
2014-03-10 14:35:33 +01:00
Manuel Raynaud
a51c54db26
x default position value
2014-02-09 15:49:19 +01:00
Franck Allimant
8970b0614f
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
install/thelia.sql
2014-01-27 17:13:43 +01:00
Franck Allimant
1f379f60ab
Added indexes to category table
2014-01-27 17:11:23 +01:00
Manuel Raynaud
c90c8ff9db
force charset in sql file
2014-01-27 16:56:05 +01:00
Franck Allimant
a27c913f70
Fixed LONG VARCHAR problem in coupon table
2014-01-27 14:29:06 +01:00
Manuel Raynaud
1974d3e3c3
fix psr
2014-01-22 12:52:36 +01:00
Manuel Raynaud
3c19388078
fix propel type in schema file
2014-01-07 11:17:26 +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
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
Etienne Roudeix
b3ac365b45
Revert "Merge branch 'cleanmaster' into modules"
...
This reverts commit d0ff5260f767d0101dbe
2013-12-20 11:16:42 +01:00
Etienne Roudeix
5773922314
show coupon codes in back office
2013-12-19 14:50:45 +01:00
Etienne Roudeix
1ba60103f3
coupon in orders + model review : backquote use
2013-12-18 17:46:42 +01:00
touffies
0684ec2b42
Rename meta_keyword to meta_keywords
...
Add SEO to folder
2013-12-09 14:52:46 +01:00
touffies
0d5cfd29e0
Add new fields (meta_title, meta_description and meta_keyword) under I18N Product
2013-12-09 14:46:06 +01:00
Franck Allimant
33e0a854f2
Implemented mail messages templates and layouts
2013-11-27 21:21:07 +01:00
Franck Allimant
2aefb87db7
Finished log configuration. All loggers are currentrly working
2013-11-01 16:15:19 +01:00
Etienne Roudeix
434092a33b
admin login is now unique
2013-10-30 14:45:50 +01:00
Etienne Roudeix
082f9aff8d
admin logs
2013-10-29 12:22:34 +01:00
Franck Allimant
db6d5692eb
Merge branch 'catalog'
...
Conflicts:
local/config/schema.xml
2013-10-24 16:47:53 +02:00
Franck Allimant
b9410bba59
Implemented prices conversion management
2013-10-24 12:34:44 +02:00
Etienne Roudeix
fb4e15ae77
fix issue #47
2013-10-24 10:36:06 +02:00
Franck Allimant
0bd57b0a5a
Worked on catalog
2013-10-23 23:41:39 +02:00
Etienne Roudeix
44a5909c81
permission resource
2013-10-22 19:51:01 +02:00
Manuel Raynaud
f4c4cea32b
create newsletter entity
2013-10-22 09:36:52 +02:00
Etienne Roudeix
d13434bb08
permissions
2013-10-21 19:11:42 +02:00
Etienne Roudeix
9a7708451a
permission cleanup
2013-10-21 17:44:17 +02:00
Etienne Roudeix
f564db2a8b
WIP : admin profiles
2013-10-21 11:44:33 +02:00
Etienne Roudeix
0300470f7d
new model
2013-10-21 08:10:55 +02:00
Manuel Raynaud
65d23db854
validate country creation
2013-10-07 12:46:40 +02:00
Etienne Roudeix
61d9e89f2e
schema fix
2013-09-27 13:38:23 +02:00
gmorel
1766951389
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
# 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
2013-09-27 10:39:52 +02:00
gmorel
73fde64f5b
WIP : coupon refactor + fix
2013-09-26 17:47:41 +02:00
Etienne Roudeix
17548e3526
order tax tables
2013-09-20 08:23:02 +02:00
Etienne Roudeix
1d969e38ec
order tables
2013-09-19 18:30:13 +02:00
Etienne Roudeix
61fab3a62a
order creation
2013-09-19 15:11:54 +02:00
Etienne Roudeix
9b37bbb862
module image
2013-09-18 11:20:29 +02:00
franck
d02f13f021
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
core/lib/Thelia/Controller/Admin/ProductController.php
core/lib/Thelia/Model/Product.php
2013-09-18 00:35:48 +02:00
franck
de4767ef56
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
core/lib/Thelia/Model/Product.php
2013-09-17 23:51:31 +02:00
Manuel Raynaud
e1e383707b
template is not mandatory in product table.
2013-09-17 19:19:52 +02:00
franck
a9009b7e52
Started product management
2013-09-17 17:15:15 +02:00
Etienne Roudeix
8d20316217
no-return-functions block
2013-09-17 14:59:40 +02:00
Etienne Roudeix
c4fd65e6ea
delivery process
2013-09-17 12:38:23 +02:00
Etienne Roudeix
692badb06b
delivery form
2013-09-17 11:05:29 +02:00
Etienne Roudeix
d8b5df4162
delivery process
2013-09-16 15:24:08 +02:00
Manuel Raynaud
365d90b4a8
Merge branch 'master' into template
...
Conflicts:
core/lib/Thelia/Core/Event/TheliaEvents.php
2013-09-16 10:19:40 +02:00
Manuel Raynaud
5e3c10cd4f
add promo column in cart_item
2013-09-16 10:16:54 +02:00
