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

3949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Franck Allimant
b49f8a6423 Fixes #495 2014-06-21 12:00:37 +02:00
Franck Allimant
9cb145e644 Fix for #490 2014-06-19 17:56:01 +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
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
Guillaume Barral
243e44f571 Target thelia_release_version changed to 3 2014-06-18 14:34:24 +02:00
Guillaume Barral
6e9412f3ac Add the table order_version to Thelia 2014-06-18 14:22:15 +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