Commit Graph

3992 Commits

Author SHA1 Message Date
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
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
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
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
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
Julien Chanséaume
8436c25c45 fixed painful issues on tests that generated random errors on positions 2014-07-02 15:07:27 +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
Manuel Raynaud
5330defe11 Merge pull request #506 from lovenunu/lovenunu-improvements
Add load requirements in getTypeInstance
2014-06-28 11:59:14 +02:00
Benjamin Perche
65ba28a251 Remove useless usage of loadRequirements
modifié:         core/lib/Thelia/TaxEngine/Calculator.php
2014-06-27 14:20:00 +02:00
Benjamin Perche
fd1a34604e Add load requirements in getTypeInstance
modifié:         core/lib/Thelia/Model/Tax.php
2014-06-27 10:03:14 +02:00
Manuel Raynaud
ec6c39096f Merge pull request #504 from lovenunu/fix-loop
Fix bug when trying to order by title
2014-06-26 15:42:28 +02:00
Benjamin Perche
f533048fbb Fix bug when trying to order by title
modifié:         core/lib/Thelia/Core/Template/Loop/Module.php
2014-06-26 15:04:25 +02:00
Manuel Raynaud
c73d55a263 Merge pull request #499 from mespeche/mespeche
Add $ROOT substitution variable
2014-06-26 11:30:14 +02:00
Manuel Raynaud
61b887f92a Merge pull request #501 from lovenunu/fix-psr
Translate french named variables "origine" and "prefixe"
2014-06-26 09:49:00 +02:00
Benjamin Perche
33862b39b5 Translate french named variabled "origine" and "prefixe"
modifié:         core/lib/Thelia/Log/Tlog.php
2014-06-26 09:28:51 +02:00
Julien
e24863fb43 Merge pull request #500 from lovenunu/fix-psr
Fix cs, follow PSR-2, keyword null must be in lower case
2014-06-26 09:24:14 +02:00
Benjamin Perche
feabfc4f07 Fix cs, follow PSR-2, keyword null must be in lower case
modifié:         core/lib/Thelia/Log/Tlog.php
2014-06-26 09:16:35 +02:00
Michaël Espeche
6661341eb4 Replace findOneById by findPk 2014-06-26 08:59:21 +02:00
Michaël Espeche
ed464db6fd Add substitution 2014-06-25 16:43:06 +02:00
Michaël Espeche
d7a55257d5 Reinit file 2014-06-25 15:29:28 +02:00
Michaël Espeche
4b089fae24 Merge branch 'master' of https://github.com/thelia/thelia 2014-06-25 15:26:56 +02:00
Michaël Espeche
079f627de9 Reinit file 2014-06-25 15:25:56 +02:00
Michaël Espeche
67e689ff85 Reinit file 2014-06-25 15:25:32 +02:00
Michaël Espeche
b22255e338 Merge branch 'master' of https://github.com/mespeche/thelia 2014-06-25 15:23:52 +02:00
Michaël Espeche
36729343f0 Reinit file 2014-06-25 15:23:23 +02:00
Manuel Raynaud
d1cb06f761 Merge pull request #498 from lunika/fix
Fix
2014-06-24 15:48:01 +02:00
Manuel Raynaud
35d13885ab remove unused variable 2014-06-24 10:45:48 +02:00
Manuel Raynaud
84c2432507 remove unused variable 2014-06-24 10:38:43 +02:00
Manuel Raynaud
77a4c45aa4 remove commented code 2014-06-24 10:30:46 +02:00
Manuel Raynaud
a00a23e495 remove unused use statement 2014-06-24 10:29:17 +02:00
Manuel Raynaud
5beefc5857 add missing use 2014-06-24 10:27:39 +02:00
Manuel Raynaud
747feebe40 Merge pull request #497 from lunika/mailer
update swiftmailer version.
2014-06-24 10:14:11 +02:00
Manuel Raynaud
b5c0606814 update swiftmailer version. 2014-06-24 10:11:50 +02:00
Manuel Raynaud
c6cc0e5cf9 Merge pull request #494 from jodeq/master
Update prices.json
2014-06-23 09:30:46 +02:00
Manuel Raynaud
549ad7b709 Merge pull request #489 from Yochima/yochima-branch
Automatic versionning of orders during the update 2.0.3
2014-06-21 13:17:40 +02:00
Manuel Raynaud
17704c2e21 Merge pull request #496 from lunika/webTest
add missing class. Fix #493
2014-06-21 13:16:08 +02:00
Manuel Raynaud
cfa9462474 add missing class. Fix #493 2014-06-21 13:15:41 +02:00
jodeq
2f81e6953b Update prices.json 2014-06-20 23:12:32 +02:00
Manuel Raynaud
9e1004789d Merge pull request #492 from lovenunu/lovenunu-thelia
Fix a bug with AddressAction
2014-06-20 15:42:42 +02:00
Benjamin Perche
45adf78faf Correct bug with default addresses
modifié:         core/lib/Thelia/Action/Address.php
2014-06-20 14:33:52 +02:00
Benjamin Perche
3d238902ac Complete AddressTest, highlight bug
modifié:         core/lib/Thelia/Tests/Action/AddressTest.php
2014-06-20 14:32:54 +02:00
Julien
cf66ad2dc7 Merge pull request #491 from lunika/webTest
implement web test case
2014-06-20 09:38:28 +02:00
Manuel Raynaud
51313ea430 import test config 2014-06-20 09:11:09 +02:00
Manuel Raynaud
3d311825d1 integrate web test case 2014-06-20 09:09:06 +02:00