Commit Graph

4160 Commits

Author SHA1 Message Date
Benjamin Perche
7a0399b303 End fix #511
modifié:         core/lib/Thelia/Action/Customer.php
2014-07-07 14:41:38 +02:00
Julien
c07ea4e324 Merge pull request #512 from lovenunu/fix
Fix issue #511
2014-07-07 14:24:08 +02:00
Benjamin Perche
6da2e2a183 Fix issue #511
When the user is registred in the session, the method "eraseCredentials" is cal$
( Thelia\Core\Security\SecurityContext::setCustomerUser ).
The form checks if the customer user of the session has the password given,
or, in the session, the password is null, so it doesn't work.

        modifié:         core/lib/Thelia/Form/CustomerPasswordUpdateForm.php
2014-07-07 14:05:27 +02:00
Franck Allimant
b7d98d8648 Fixed typos 2014-07-04 16:10:39 +02:00
Benjamin Perche
5412f9891d Merge branch 'master' of https://github.com/thelia/thelia 2014-07-04 15:45:01 +02:00
Julien
924fef8047 Merge pull request #510 from bibich/improvements
fixed new issue on rewriting test due to blank titles on some locale
2014-07-04 15:39:16 +02:00
Franck Allimant
7580d5c869 Template fragments are now in a subdirectory 2014-07-04 15:27:56 +02:00
Franck Allimant
3708fb317b Typo 2014-07-04 15:27:14 +02:00
Julien Chanséaume
ff8350352f small improvement 2014-07-04 15:25:09 +02:00
Julien Chanséaume
c8a4cbcb8a optimization 2014-07-04 14:57:10 +02:00
Franck Allimant
a57d668e3c Improved brand form declarations 2014-07-04 11:54:02 +02:00
Julien Chanséaume
71f4380dff added title for all available langages 2014-07-04 11:27:44 +02:00
Julien Chanséaume
5dae84f0fd fixed new issue on rewriting test due to blank titles on some locale 2014-07-04 10:34:00 +02:00
Benjamin Perche
794b5ef948 Merge branch 'master' of https://github.com/thelia/thelia 2014-07-04 09:33:45 +02:00
Julien
e26df0d120 Merge pull request #507 from bibich/improvements
Improvements :
- added cache on default country / currency
- fixed issues on RSS links in default front office template
- fixed random issues on position tests
2014-07-04 09:09:50 +02:00
Franck Allimant
f46168f518 Fixed some typos 2014-07-03 19:19:21 +02:00
Franck Allimant
7576b9990b Fixed minor typos, improved field attributes generation 2014-07-03 16:54:42 +02:00
Franck Allimant
af5e0bde23 Refined form fields HTML bindings 2014-07-03 16:27:18 +02:00
Franck Allimant
c70a296ff2 Refined the form fields html bindings 2014-07-03 16:26:37 +02:00
Franck Allimant
c0541e3aa2 Added getTemplateDirectories method to ParserInterface 2014-07-03 16:25:50 +02:00
Julien Chanséaume
9d79f42ae1 addded test data for position tests 2014-07-03 16:25:18 +02:00
Julien
aefca34e22 Merge pull request #508 from Yochima/yochima-branch
correction of the filter visible in categoryTree.
2014-07-03 09:07:25 +02:00
Michaël Espeche
eed0b357aa Add code editor on textarea 2014-07-03 08:57:14 +02:00
Julien Chanséaume
8436c25c45 fixed painful issues on tests that generated random errors on positions 2014-07-02 15:07:27 +02:00
Benjamin Perche
01e1ef3d58 Merge branch 'master' of https://github.com/thelia/thelia into origin/master 2014-07-02 13:51:59 +02:00
Guillaume Barral
182ba26045 correction of the filter visible in categoryTree. 2014-07-02 11:47:27 +02:00
Julien Chanséaume
791323776a added strict test === 2014-07-02 10:32:25 +02:00
Julien Chanséaume
3a9ce68694 added cache to get default country and currency 2014-07-02 09:55:14 +02:00
Julien Chanséaume
ec71959934 Fixed issues with RSS feed links 2014-07-02 09:22:20 +02:00
Michaël Espeche
368e8cd6cf Add new entry : store_description 2014-07-01 10:26:51 +02:00
Franck Allimant
b4f3e3b60a Fixed wrong fk in product table 2014-07-01 02:36:46 +02:00
Franck Allimant
ceb5b595a8 Generated more brands 2014-07-01 02:09:39 +02:00
Franck Allimant
b4e9f34290 Added Brand action test 2014-07-01 01:28:18 +02:00
Franck Allimant
5307ce1143 Updated for new brand feature 2014-07-01 01:24:12 +02:00
Franck Allimant
544060d062 NULL no longer returned by $BRAND_ID and $LOGO_IMAGE_ID 2014-07-01 01:21:59 +02:00
Franck Allimant
53b58515e0 Added html_output_trim_level variable 2014-07-01 01:08:27 +02:00
Franck Allimant
811e89f740 PHP-CS fixer pass 2014-07-01 01:07:56 +02:00
Franck Allimant
f820a09a1a Added brand loop test 2014-07-01 01:07:03 +02:00
Franck Allimant
e6f7baccb2 Integrated into SmartyParser.php 2014-07-01 01:00:34 +02:00
Franck Allimant
189ad9f782 Added html_output_trim_level config var, fix for #490 2014-07-01 00:57:41 +02:00
Franck Allimant
1d94f454a7 Brand related translations 2014-06-30 23:12:42 +02:00
Franck Allimant
a6ab169080 Added brand information page 2014-06-30 23:02:28 +02:00
Franck Allimant
c1e3694ab8 Typo 2014-06-30 23:02:03 +02:00
Franck Allimant
a4806132a1 Fixed again excaption image is not found 2014-06-30 22:56:00 +02:00
Franck Allimant
565de5d443 Added brand information 2014-06-30 22:55:28 +02:00
Franck Allimant
63d8ea52dd No more Exception if ID cannot be found (e.g. content=0) 2014-06-30 22:04:09 +02:00
Franck Allimant
7a10a25780 Added "current" loop parameter 2014-06-30 20:13:51 +02:00
Franck Allimant
c209df59f5 Added "brand" loop parameter 2014-06-30 20:13:30 +02:00
Franck Allimant
30afbf1433 Added brands feed processing 2014-06-30 20:13:14 +02:00
Franck Allimant
dc63498180 Added brand feed 2014-06-30 20:12:57 +02:00