Manuel Raynaud
|
ccd16dc363
|
update phpunit version
|
2014-06-19 12:58:40 +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 |
|
Manuel Raynaud
|
e86195a912
|
Merge pull request #486 from roadster31/translations
Fixed minor typos
|
2014-06-19 10:08:47 +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 |
|
Franck Allimant
|
04135032bf
|
Impmroved Tinymce module
|
2014-06-18 15:36:24 +02:00 |
|
Benjamin Perche
|
7d4d1857fc
|
Fix colissimo and cheque id retrieving
modifié: setup/faker.php
|
2014-06-18 15:00:29 +02:00 |
|
Benjamin Perche
|
b688ee86f0
|
fix cs
modifié: setup/faker.php
|
2014-06-18 13:30:45 +02:00 |
|
Benjamin Perche
|
da6244d220
|
Add clear order table and use propel random selection
modifié: setup/faker.php
|
2014-06-18 13:29:30 +02:00 |
|
Benjamin Perche
|
c5fa984e6e
|
Fix cs
|
2014-06-18 12:35:24 +02:00 |
|
Benjamin Perche
|
087f9e46a1
|
Add line return
modifié: setup/faker.php
|
2014-06-18 12:33:53 +02:00 |
|
Benjamin Perche
|
2fcec08e50
|
Insert fake orders with faker
modifié: setup/faker.php
|
2014-06-18 12:31:36 +02:00 |
|
Manuel Raynaud
|
8aac09ad90
|
Merge pull request #479 from lunika/fixes
various fixes from insight
|
2014-06-18 10:26:19 +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 |
|
Julien
|
97db5baa44
|
Merge pull request #476 from lunika/date
refactor formatDate function and create test
|
2014-06-17 17:01:10 +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 |
|
Manuel Raynaud
|
cc55c730bb
|
Merge pull request #478 from Yochima/yochima-branch
Allow to search a customer in the default template if $search is not nul...
|
2014-06-17 15:08:32 +02:00 |
|
Guillaume Barral
|
8196690458
|
Add link in template-edit to go to Attributes and features edition (this is more intuitive)
|
2014-06-17 11:48:35 +02:00 |
|
Guillaume Barral
|
816a9b81ca
|
Allow to search a customer in the default template if $search is not null
|
2014-06-17 11:19:16 +02:00 |
|
Franck Allimant
|
5534780e3c
|
Added the FreeProduct coupon.
|
2014-06-17 00:45:55 +02:00 |
|
Franck Allimant
|
8b74eae911
|
php-cs pass
|
2014-06-17 00:43:10 +02:00 |
|
Franck Allimant
|
63f00d82b9
|
Using 0 as default value if some loop parameters are not defined
|
2014-06-17 00:39:00 +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
|
e3dc87dd6a
|
Updated translations after finishing coupons
|
2014-06-17 00:37:06 +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 |
|
Nicolas Léon
|
20593a0576
|
Fix PSR coding style
|
2014-06-14 21:58:33 +02:00 |
|