TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,991 Commits 1 Branch 0 Tags
fcceaa630d8f21ce13f55bd8c02b3453b35dbc60
Commit Graph

3991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Franck Allimant
fcceaa630d Deleted test images after tests 2014-06-26 20:17:24 +02:00
Franck Allimant
2c9accf58e Added pre and post processing event disatching 2014-06-26 19:52:28 +02:00
Franck Allimant
ca862b07e4 Merge branch 'master' into brands 
Conflicts:
	core/lib/Thelia/Tools/FileManager.php
	setup/update/2.0.3.sql
 2014-06-26 16:35:08 +02:00
Franck Allimant
65dd2fb129 Changed product_brand fk 2014-06-26 15:50:00 +02:00
Franck Allimant
13e57e332a Added brand creation 2014-06-26 15:49:46 +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
Franck Allimant
9b455e6c87 Fixed unit tests 2014-06-26 11:26:49 +02:00
Franck Allimant
4012761815 testFormatDateWithLocale always fails on Windows 2014-06-26 11:25:50 +02:00
Franck Allimant
0dde8b888a Added brands management 2014-06-26 10:52:13 +02:00
Franck Allimant
2cf405c267 Refactoring of images and documents management 2014-06-26 10:42:57 +02:00
Franck Allimant
0b3de508b4 Introduced automatic form fields binding 2014-06-26 10:42:16 +02:00
Franck Allimant
ce3ed19b67 Introduced the automatic form fields binding. 2014-06-26 10:41:26 +02:00
Franck Allimant
114a55c1e8 Refactoring of images and documents management 2014-06-26 10:36:12 +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
Franck Allimant
b49f8a6423 Fixes #495 2014-06-21 12:00:37 +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
Franck Allimant
9cb145e644 Fix for #490 2014-06-19 17:56:01 +02:00
Guillaume Barral
2a6d99e36b Automatic versionning of all existing orders during the update 2.0.3 2014-06-19 15:24:14 +02:00
Guillaume Barral
d4efd004f7 Merge branch 'master' of https://github.com/thelia/thelia into yochima-branch 2014-06-19 15:23:25 +02:00