Manuel Raynaud
|
171d388c41
|
change error message on image upload
|
2014-04-30 14:14:26 +02:00 |
|
Manuel Raynaud
|
fc130f295a
|
Merge pull request #365 from lunika/seo
Change some behaviors on SEO tab
|
2014-04-30 11:52:43 +02:00 |
|
Manuel Raynaud
|
ca2194b7ea
|
rediplay SEO tab after submit. Fix #352
|
2014-04-30 11:26:23 +02:00 |
|
Manuel Raynaud
|
a30181d09d
|
seo title field is not mandatory anymore
|
2014-04-30 11:15:01 +02:00 |
|
Manuel Raynaud
|
dc286e3c23
|
Merge pull request #364 from lunika/content
create prev next arg for content loop. Fix #361
|
2014-04-30 11:03:06 +02:00 |
|
Manuel Raynaud
|
67293555ba
|
refactor content loop splitting parseResults method
|
2014-04-30 10:57:04 +02:00 |
|
Manuel Raynaud
|
0b36b2222d
|
implement addCriteriaToPositionQuery method in content model. #360
|
2014-04-30 10:44:34 +02:00 |
|
Manuel Raynaud
|
270b5f6499
|
filter with contentFolder table for finding next/prev content
|
2014-04-30 10:32:17 +02:00 |
|
Manuel Raynaud
|
b15d52e6d3
|
create prev next arg for content loop. Fix #361
|
2014-04-30 10:22:12 +02:00 |
|
Manuel Raynaud
|
ed1be7019b
|
Merge pull request #357 from bibich/sitemap
Sitemap functionality
|
2014-04-30 09:25:54 +02:00 |
|
Franck Allimant
|
a23116ca61
|
Removed check of admin.image/document, whis is not managed in the
back-office
|
2014-04-29 19:07:06 +02:00 |
|
Julien Chanséaume
|
5db1cf21ec
|
ajout doc
|
2014-04-29 17:23:08 +02:00 |
|
Julien Chanséaume
|
d04ca672fb
|
Reimplementing sitemap functionality using Thelia loop
|
2014-04-29 17:14:44 +02:00 |
|
Manuel Raynaud
|
2aea36ab1e
|
Merge pull request #354 from zzuutt/patch-1
Update address-update.html
|
2014-04-29 16:42:30 +02:00 |
|
Manuel Raynaud
|
a92f7bfa45
|
Merge pull request #356 from zzuutt/patch-3
Update address.html
|
2014-04-29 16:39:04 +02:00 |
|
zzuutt
|
ee43b71fdc
|
Update address.html
|
2014-04-29 16:29:20 +02:00 |
|
zzuutt
|
17c367a21e
|
Update address-update.html
|
2014-04-29 16:25:52 +02:00 |
|
zzuutt
|
c9199cff0b
|
Update address-update.html
add colon after {$label}
|
2014-04-29 16:24:25 +02:00 |
|
Manuel Raynaud
|
f35d016e7e
|
Merge pull request #355 from zzuutt/patch-2
Update account.html
|
2014-04-29 16:21:09 +02:00 |
|
Julien Chanséaume
|
9ee9a88156
|
Sitemap functionality
|
2014-04-29 15:45:36 +02:00 |
|
zzuutt
|
cd0e9cadba
|
Update address.html
add the field 'company'
|
2014-04-29 15:36:05 +02:00 |
|
zzuutt
|
ba8fa084c0
|
Update account.html
display the field 'company'
|
2014-04-29 15:34:47 +02:00 |
|
zzuutt
|
7b0cdb8cda
|
Update address-update.html
|
2014-04-29 15:31:44 +02:00 |
|
Franck Allimant
|
8f5a17288b
|
Fixed potiential javascript error
|
2014-04-29 15:01:18 +02:00 |
|
Manuel Raynaud
|
3d0f5a4679
|
Merge pull request #350 from lunika/permanentDiscount
apply a permanent discount on a customer.
|
2014-04-29 12:06:13 +02:00 |
|
Manuel Raynaud
|
158ebc7ead
|
complete changelog and add missing translations
|
2014-04-29 11:42:10 +02:00 |
|
Manuel Raynaud
|
d0edbdfd5b
|
change price if needed when customer log in or log out
|
2014-04-29 11:35:10 +02:00 |
|
Manuel Raynaud
|
406b06e09d
|
use customer permanent discount
|
2014-04-29 10:56:07 +02:00 |
|
Manuel Raynaud
|
c4320f0ada
|
add discount input on customer form
|
2014-04-29 10:56:07 +02:00 |
|
Manuel Raynaud
|
7b826796f1
|
Merge pull request #349 from lunika/dev
AuthenticationException must be catch in renderRaw and not in render met...
|
2014-04-29 10:52:36 +02:00 |
|
Manuel Raynaud
|
312b27a113
|
AuthenticationException must be catch in renderRaw and not in render method
|
2014-04-29 10:44:48 +02:00 |
|
Manuel Raynaud
|
fd10b9d9a2
|
Merge pull request #348 from lunika/redirect
return redirectReponse instead of sending it
|
2014-04-29 09:24:23 +02:00 |
|
Manuel Raynaud
|
8aa5912a7a
|
return redirectReponse insteadof sending it
|
2014-04-28 22:21:06 +02:00 |
|
Manuel Raynaud
|
c4b2898830
|
Merge pull request #345 from roadster31/various-fixes
Various fixes
|
2014-04-28 21:56:01 +02:00 |
|
Franck Allimant
|
37f43a0f51
|
Changed isSubclassOf by implementsInterface
|
2014-04-28 20:18:08 +02:00 |
|
Manuel Raynaud
|
673192db11
|
Merge pull request #347 from bibich/cart-delivery
Cart delivery
|
2014-04-28 16:08:38 +02:00 |
|
Julien Chanséaume
|
7665f32d0d
|
adding new configuration values in insert.sql
|
2014-04-28 15:48:30 +02:00 |
|
Julien Chanséaume
|
0b3ad194e0
|
unnecessary code removed, adding new configuration values in update sql
|
2014-04-28 15:28:25 +02:00 |
|
Julien Chanséaume
|
88a5acd047
|
unnecessary code removed
|
2014-04-28 14:41:36 +02:00 |
|
Julien Chanséaume
|
5856b0849b
|
unnecessary code removed
|
2014-04-28 14:39:32 +02:00 |
|
Julien Chanséaume
|
51c11a83a0
|
conflicts resolved
|
2014-04-28 12:46:42 +02:00 |
|
Julien Chanséaume
|
7c4ebe6bf7
|
php cs fixer
|
2014-04-28 12:30:31 +02:00 |
|
Julien Chanséaume
|
ac51ab21e4
|
add estimated shipping functionnality in cart
|
2014-04-28 12:24:43 +02:00 |
|
Manuel Raynaud
|
f556a7d149
|
Merge pull request #344 from bibich/fix-cart-currency
fix cart item prices when not on default currency
|
2014-04-28 12:20:58 +02:00 |
|
Julien Chanséaume
|
6553c6ad10
|
unnecessary code removed
|
2014-04-28 12:15:08 +02:00 |
|
Julien Chanséaume
|
3bacb0a917
|
refactore currency calculations in ProductSaleElements
|
2014-04-28 12:07:45 +02:00 |
|
Manuel Raynaud
|
e2aad64a70
|
Merge pull request #346 from lunika/dev
escape smarty variables
|
2014-04-28 11:09:57 +02:00 |
|
Manuel Raynaud
|
c7a611a9ec
|
escape smarty variables
|
2014-04-28 11:09:16 +02:00 |
|
Franck Allimant
|
657af6e8f1
|
Ajout du vidage des caches assets, images et documents
|
2014-04-26 17:06:10 +02:00 |
|
Franck Allimant
|
d7b9479cb9
|
Added vertical-row-space style, to add some space after a row
|
2014-04-26 17:02:35 +02:00 |
|