Manuel Raynaud
34da3937dc
fix typo in insert.sql file
2014-01-14 11:30:59 +01:00
Manuel Raynaud
79dafd109e
create tinymce module
2014-01-13 18:07:23 +01:00
Manuel Raynaud
46b9919ab5
update thelia version for next beta version
2014-01-10 16:46:57 +01:00
Manuel Raynaud
798129a094
update default VAT
2014-01-10 15:21:20 +01:00
Manuel Raynaud
4d1a82e7a7
add new thelia version in migration script
2014-01-08 15:49:06 +01:00
Manuel Raynaud
366454ebe8
create sql script for migrations
2014-01-08 14:16:32 +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
e606a6f8ce
Coupon : Condition module refactor
...
Less crappy unmaintainable javascript
More logic in extendable php
2014-01-05 00:00:15 +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
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
gmorel
8f9b86ff6a
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia : (121 commits)
set cartItem in cart add and update events
need to unescape breadcrumb strings after been in array
update readme file
update insert.sql with new release version
change changelog file format
Prevent product and content création at catalog root
dynamic delivery modules on delivery front template
complete changelog
Finished merging modules with master
Revert "Merge branch 'cleanmaster' into modules"
use TaxEngine::getDeliveryCountry in delivery loop
refacto getTaxCountry which is actually getDeliveryCountry
make it magic last stand
change loop in shipping zone template using module insteadof delivery
Fixed template loop
Refactored templates processing
complete readme file
change email address of core contributors
fix getPosition folder test
add coupon tests
...
Conflicts:
core/lib/Thelia/Controller/Admin/ProductController.php
2013-12-25 14:14:20 +01:00
gmorel
69d255f782
new branch coupon
2013-12-25 14:12:54 +01:00
Manuel Raynaud
f0116b31f1
update insert.sql with new release version
2013-12-20 15:26:29 +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
8c121dd455
add coupon tests
2013-12-19 15:37:15 +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
Franck Allimant
e262bbc9ea
Added config variable titles
2013-12-05 12:57:28 +01:00
gmorel
ffc699fa7f
Merge branch 'master' of git://github.com/thelia/thelia
...
* 'master' of git://github.com/thelia/thelia:
fix typo
Implemented mail messages templates and layouts
Email template + test email
add REF to product_sale_element loop and fix product tempalte
Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
Add correct url(subdiretory included) in config page
Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
2013-11-28 20:58:24 +01:00
Franck Allimant
33e0a854f2
Implemented mail messages templates and layouts
2013-11-27 21:21:07 +01:00
gmorel
67a38bca20
Merge branch 'master' of git://github.com/thelia/thelia
...
* 'master' of git://github.com/thelia/thelia:
Check if store_country has a value
Fixed double '/' in generated assets URLs
Add validation for Store configuration
Use Store contact information
Call the wrong AdminResources in saveAction
Action buttons smaller
Replace company_name and contact_email by store_name & store_email
Add a new admin page to manage the basic store configurations
Add routing for Store Configuration
Add argument Title on Content Loop & Folder Loop
2013-11-25 22:43:04 +01:00
gmorel
19aa1c798d
Coupon : Fix namespace issues
2013-11-24 22:27:26 +01:00
gmorel
90b5fbde05
Refactor removing Manager notion
2013-11-23 20:18:04 +01:00
touffies
85d9c112d3
Replace company_name and contact_email by store_name & store_email
2013-11-22 17:40:04 +01:00
gmorel
968bddbcf9
Fix Coupon/Condition refactor
2013-11-19 13:15:23 +01:00
Manuel Raynaud
d6bf64f7a6
change max weight in faker
2013-11-18 15:04:00 +01:00
Manuel Raynaud
b39f0fd936
Front module is activated by default
2013-11-18 10:51:46 +01:00
David
54d5e98971
Corrected the French translation of "Miss" in the Register form dropdown
...
Corrected French translation of Miss from "Madamemoiselle" to "Mademoiselle"
2013-11-17 01:01:01 +01:00
Etienne Roudeix
48409c29a9
Colissimo in progress
2013-11-14 11:21:34 +01:00
Etienne Roudeix
e8b4a4ac74
Colissimo proces
2013-11-14 09:22:56 +01:00
Etienne Roudeix
299b192018
Colissimo module + countires areas
2013-11-14 09:13:28 +01:00
Etienne Roudeix
be9aba9fb8
fix stuff + module management
2013-11-08 15:11:45 +01:00
Manuel Raynaud
a793dc9f3e
change variable name for active front template
2013-11-07 10:47:14 +01:00
Franck Allimant
361e4a9d74
Implementing translations (still in progress)
2013-11-06 10:49:03 +01:00
Franck Allimant
3b9f94cec8
Using now templates instead of hard code in AdminUtilities smarty plugin
2013-10-31 12:16:14 +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
Manuel Raynaud
3bde3ffca9
fix typo in sql file
2013-10-25 15:03:31 +02:00
Manuel Raynaud
373fe13287
save thelia version
2013-10-25 09:10:27 +02:00
Franck Allimant
0d50557269
Merge branch 'master' of https://github.com/thelia/thelia
2013-10-25 00:33:52 +02:00
Franck Allimant
06cc8ce1ea
Finished product combinations edition
2013-10-25 00:32:56 +02:00
Manuel Raynaud
f6b65e70d9
create order confirmation email
2013-10-24 20:23:43 +02:00
Manuel Raynaud
72f9cbb305
save website url in install process
2013-10-24 19:45:51 +02:00
Franck Allimant
d0213f36d4
Removed forgotten var_dump().
2013-10-24 16:56:14 +02: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
4065f338b9
Merge branch 'master' into tax
2013-10-24 10:37:05 +02:00
Etienne Roudeix
fb4e15ae77
fix issue #47
2013-10-24 10:36:06 +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
0bd57b0a5a
Worked on catalog
2013-10-23 23:41:39 +02:00
