Franck Allimant
c8620ea63b
Merge branch 'master' of https://github.com/thelia/thelia
2014-01-23 09:34:25 +01:00
Franck Allimant
54db55467b
Fixed injection of TaxManager in TaxCreationForm instance
2014-01-23 09:33:09 +01:00
Manuel Raynaud
1974d3e3c3
fix psr
2014-01-22 12:52:36 +01:00
Franck Allimant
5d92ea0bab
TaxManager is now a service in the container.
2014-01-22 01:18:28 +01:00
Manuel Raynaud
2218b79e8d
company field is not required
2014-01-20 14:04:52 +01:00
Manuel Raynaud
9d0121f321
fix cs
2014-01-10 11:41:55 +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
6057c69f95
session parameter is needed on TaxEngine::getInstance method
2014-01-02 10:07:51 +01: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
3e12ace045
Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
2013-12-30 00:50:04 +01:00
gmorel
ae1a05eb85
Merge
2013-12-29 04:28:11 +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
Etienne Roudeix
b3ac365b45
Revert "Merge branch 'cleanmaster' into modules"
...
This reverts commit d0ff5260f767d0101dbe
2013-12-20 11:16:42 +01:00
Manuel Raynaud
2f4158d1f6
fix cs
2013-12-18 10:04:13 +01:00
touffies
c0ee124d17
Remove constraint NotBlank
2013-12-11 20:58:57 +01:00
touffies
12d4c0fdfd
Keep hidden field for local
2013-12-11 18:40:42 +01:00
touffies
d476672150
Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT
2013-12-09 15:00:51 +01:00
touffies
083f3bfa8c
Move URL to SeoForm (SEO tab)
2013-12-09 14:52:44 +01:00
touffies
945921048e
Add new SEO form
2013-12-09 14:46:07 +01:00
Franck Allimant
de0542b33c
Changed direct accesses to verifyStok by calls to checkAvailableStock
2013-12-05 13:02:13 +01:00
gmorel
94e2d7881d
Merge branch 'master' of git://github.com/thelia/thelia into french_translation
...
* 'master' of git://github.com/thelia/thelia:
fix typo
Implemented mail messages templates and layouts
Email template + test email
2013-11-27 22:22:26 +01:00
Franck Allimant
33e0a854f2
Implemented mail messages templates and layouts
2013-11-27 21:21:07 +01:00
gmorel
e7038c9369
Spelling rewritten with 2 t
2013-11-27 20:37:40 +01:00
touffies
a33a4cc963
Add validation for Store configuration
2013-11-25 11:22:38 +01:00
touffies
fd0301022d
Merge branch 'backoffice' into frontend
2013-11-25 10:24:29 +01:00
touffies
29ae2d26fe
Add a new admin page to manage the basic store configurations
2013-11-22 17:38:21 +01:00
David Rimbault
4b2a73c85d
Added some translations in the Customer Creation Form
2013-11-19 23:50:23 +01:00
Franck Allimant
f6fc886d06
Merge branch 'master' of https://github.com/thelia/thelia
...
Conflicts:
core/lib/Thelia/Controller/Admin/CustomerController.php
2013-11-09 18:31:52 +01:00
Franck Allimant
ac74c1d61d
Refactored back-office customer management
2013-11-09 18:28:01 +01:00
Etienne Roudeix
99ad2d6820
Merge branch 'master' of github.com:thelia/thelia
2013-11-08 11:26:22 +01:00
Etienne Roudeix
422a80fcce
module modification
2013-11-08 11:26:06 +01:00
touffies
aa7efb0e9a
Issue 61
...
Add the newsletter registration on Register page
2013-11-07 12:35:34 +01:00
touffies
7fa17215f6
ISSUE 63 - Newsletter registration : error message
2013-11-07 11:57:43 +01:00
touffies
0431010a65
Missing class Translator
2013-11-05 15:46:38 +01:00
touffies
65a8953143
Profile and Useful was misspelled
...
Add missing language key into the dictionary
2013-11-04 16:35:01 +01:00
Franck Allimant
2aefb87db7
Finished log configuration. All loggers are currentrly working
2013-11-01 16:15:19 +01:00
Franck Allimant
0cabe7b9e8
Combination creation management
2013-10-30 15:44:32 +01:00
Etienne Roudeix
2eb5fc821c
mailing sytem admin
2013-10-28 12:24:59 +01:00
Manuel Raynaud
51cd9f4ee8
Merge branch 'master' into frontend
...
Conflicts:
templates/default/layout.tpl
2013-10-25 14:51:34 +02:00
touffies
d9a2855084
Issue 79 : English error
2013-10-25 14:03:54 +02:00
Manuel Raynaud
2c030f910b
fix cs
2013-10-25 10:07:21 +02:00
Franck Allimant
06cc8ce1ea
Finished product combinations edition
2013-10-25 00:32:56 +02:00
Manuel Raynaud
10f78b90a5
Merge pull request #49 from thelia/frontend
...
Frontend
2013-10-24 08:07:18 -07:00
touffies
ebec82d1d2
Merge with master
2013-10-24 16:52:03 +02:00
Franck Allimant
4f7e7660ca
Finished PSE management for products with no combinations
2013-10-24 16:39:22 +02:00
Franck Allimant
b9410bba59
Implemented prices conversion management
2013-10-24 12:34:44 +02:00
touffies
009e779110
Update profil [It's not working yet]
2013-10-24 00:19:00 +02:00
touffies
3e3695e5d3
Add validation for the current password
2013-10-24 00:17:59 +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
