TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,160 Commits 1 Branch 0 Tags
f62b14b84227c96dba1ef15ff3018b94f17730d7
Commit Graph

4160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Benjamin Perche
1f26ff997d Fix bug with CreateOrUpdateAddress action 
modifié:         core/lib/Thelia/Action/Address.php
 2014-06-20 11:55:13 +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
Guillaume Barral
15e2ff5fc3 Automatic creation of all orders in order_version during the 2.0.3 update 2014-06-19 15:22:06 +02:00
Guillaume Barral
adcbc13ada Add a default version to all order in Thelia for the 2.0.3 update 2014-06-19 15:13:02 +02:00
Franck Allimant
dc6b231301 Fixed coupon table versionning 2014-06-19 15:10:21 +02:00
Manuel Raynaud
447953a176 Merge pull request #483 from Yochima/yochima-branch 
Add the table order_version to Thelia
 2014-06-19 14:26:57 +02:00
Guillaume Barral
69d496715e Merge branch 'master' of https://github.com/thelia/thelia into yochima-branch 2014-06-19 13:59:16 +02:00
Manuel Raynaud
cc4eb2200b Merge pull request #487 from lunika/phpunit 
update phpunit version
 2014-06-19 13:54:03 +02:00
Manuel Raynaud
e80e4e4c3b add missing fixtures 2014-06-19 13:17:43 +02:00
Manuel Raynaud
c3aef614ff update test for latest php versions 2014-06-19 13:15:57 +02:00
Manuel Raynaud
ccd16dc363 update phpunit version 2014-06-19 12:58:40 +02:00
Guillaume Barral
60124feb17 modification of model Order to not insert two times the order_version (when we insert for the first time an order object) 2014-06-19 12:02:58 +02:00
Manuel Raynaud
fded802839 Merge pull request #482 from lovenunu/master 
Add order create in faker
 2014-06-19 11:47:50 +02:00
Manuel Raynaud
fd0dad68d5 Merge pull request #485 from roadster31/tinymce 
Tinymce module improvement
 2014-06-19 11:46:37 +02:00
Guillaume Barral
e5691b9793 Merge branch 'master' of https://github.com/thelia/thelia into yochima-branch 2014-06-19 10:13:50 +02:00
Manuel Raynaud
e86195a912 Merge pull request #486 from roadster31/translations 
Fixed minor typos
 2014-06-19 10:08:47 +02:00
Guillaume Barral
270d8da5e3 Merge branch 'master' of https://github.com/lovenunu/thelia into yochima-branch 2014-06-19 09:27:56 +02:00
Franck Allimant
0d8f9f3c6e Fixed minor typos 2014-06-19 01:51:39 +02:00
Franck Allimant
9a887bc4a7 Typo. 2014-06-19 01:17:13 +02:00
Franck Allimant
0fe99e9c8c Added frenche translation 2014-06-19 01:16:30 +02:00
Franck Allimant
fe8b7e1663 Simplified base URL construction code. 2014-06-19 01:15:43 +02:00
Franck Allimant
d0efdd84bc Added translation domain 2014-06-19 01:14:24 +02:00
Franck Allimant
ddd2008b05 Fix youtube plugin missing labels 2014-06-19 01:13:48 +02:00
Franck Allimant
d66d2b3839 PHP-CS fixer pass. 2014-06-19 00:33:24 +02:00
Franck Allimant
f842f90e00 Merge branch 'master' into tinymce 
Conflicts:
	local/modules/Tinymce/templates/backOffice/default/include/tinymce_init.tpl
 2014-06-19 00:16:21 +02:00
Franck Allimant
6c7f160f30 Polished tinyMCE integration 2014-06-18 20:26:04 +02:00
Franck Allimant
bfe7fcd922 Added internationalization plugin 2014-06-18 20:25:40 +02:00
Franck Allimant
7b3002067d Added proper internationalization 2014-06-18 20:24:56 +02:00
Franck Allimant
0d0f04bf29 Added getConfiguredShopUrl() to access url_site variable 2014-06-18 19:34:43 +02:00
Franck Allimant
8198418f97 Added a constant for the translation domain. 2014-06-18 16:11:40 +02:00
Franck Allimant
556f2e898e Added comments and options 2014-06-18 16:11:13 +02:00
Franck Allimant
c61721605d Proper integration of responsive file manager. Youtune plugin added. 2014-06-18 15:38:06 +02:00
Franck Allimant
ce772b6b60 An exception is thrown if a module could not be loaded. 2014-06-18 15:36:59 +02:00