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 |
|
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 |
|
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
|
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
|
cfa9462474
|
add missing class. Fix #493
|
2014-06-21 13:15:41 +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 |
|
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
|
69d496715e
|
Merge branch 'master' of https://github.com/thelia/thelia into yochima-branch
|
2014-06-19 13:59:16 +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 |
|
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
|
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 |
|
Franck Allimant
|
0d8f9f3c6e
|
Fixed minor typos
|
2014-06-19 01:51:39 +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
|
0d0f04bf29
|
Added getConfiguredShopUrl() to access url_site variable
|
2014-06-18 19:34:43 +02:00 |
|
Franck Allimant
|
ce772b6b60
|
An exception is thrown if a module could not be loaded.
|
2014-06-18 15:36:59 +02:00 |
|
Guillaume Barral
|
6e9412f3ac
|
Add the table order_version to Thelia
|
2014-06-18 14:22:15 +02:00 |
|
Manuel Raynaud
|
d14a2d24f2
|
fix cs
|
2014-06-18 10:06:10 +02:00 |
|
Manuel Raynaud
|
101197c0de
|
various fixes from insight
|
2014-06-18 09:33:32 +02:00 |
|
Manuel Raynaud
|
588be42e0f
|
Merge pull request #473 from roadster31/coupon-end
Major coupon types refactoring.
|
2014-06-17 21:11:14 +02:00 |
|
Franck Allimant
|
cbf2eae842
|
Written coupons unit tests
|
2014-06-17 19:58:56 +02:00 |
|
Manuel Raynaud
|
f9e0db06c1
|
refactor formatDate function and create test
|
2014-06-17 15:41:47 +02:00 |
|
Franck Allimant
|
6f12882850
|
Added missing $this->setFieldsValue($effects);
|
2014-06-17 15:28:35 +02:00 |
|
Franck Allimant
|
8b74eae911
|
php-cs pass
|
2014-06-17 00:43:10 +02:00 |
|
Franck Allimant
|
c87c6e2793
|
Added free product coupon.
|
2014-06-17 00:38:18 +02:00 |
|
Franck Allimant
|
749487e967
|
Added getDeliveryCountry() method
|
2014-06-17 00:37:53 +02:00 |
|
Franck Allimant
|
f3ccf8ec15
|
Updated translation after finishing coupons
|
2014-06-17 00:36:23 +02:00 |
|
Franck Allimant
|
17ad1ed6fa
|
The CouponManager clear() method is now invoked.
|
2014-06-17 00:35:52 +02:00 |
|
Franck Allimant
|
6b6687c85c
|
Added clear() method
|
2014-06-17 00:35:12 +02:00 |
|
Franck Allimant
|
2edfb0b389
|
Added clear method.
|
2014-06-17 00:34:57 +02:00 |
|
Manuel Raynaud
|
7377af6029
|
Merge pull request #471 from nicolasleon/master
Date formating should be able to cope with locale time format
|
2014-06-15 19:47:22 +02:00 |
|