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

351 Commits

Author SHA1 Message Date
Franck Allimant
b4f3e3b60a Fixed wrong fk in product table 2014-07-01 02:36:46 +02:00
Franck Allimant
30afbf1433 Added brands feed processing 2014-06-30 20:13:14 +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
0dde8b888a Added brands management 2014-06-26 10:52:13 +02:00
jodeq
2f81e6953b Update prices.json 2014-06-20 23:12:32 +02:00
Franck Allimant
dc6b231301 Fixed coupon table versionning 2014-06-19 15:10:21 +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
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
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
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
04135032bf Impmroved Tinymce module 2014-06-18 15:36:24 +02:00
Guillaume Barral
6e9412f3ac Add the table order_version to Thelia 2014-06-18 14:22:15 +02:00
Franck Allimant
96ebcf1880 Added the COUPON_CLEAR_ALL event, and a route to trigger it. 2014-06-12 16:39:27 +02:00
Benjamin Perche
e3d19f0dd0 Fix mail sending to ensure compatibility with secured SMTP 
modifié:         local/modules/Front/Controller/ContactController.php
 2014-06-11 14:30:12 +02:00
Manuel Raynaud
c738361221 Merge pull request #445 from zzuutt/master 
Correction issue #425
 2014-05-28 23:42:21 +02:00
knjeurope
58b33a8e05 Add code source insert 
Add cose source insert with TinyMce
 2014-05-26 08:36:42 +02:00
zzuutt
f8cf0b5692 Correction issue #425 
le test du status n'etait pas correct
ajout des logs
 2014-05-22 11:06:43 +02:00
Franck Allimant
b3b16e1fb1 Added vendor block to schema 2014-05-18 20:34:58 +02:00
Franck Allimant
ab060486d0 Fixed Thelia\Model\Base uses. 2014-05-18 20:19:48 +02:00
Franck Allimant
f8ccea1899 Added per-user coupon maximum usage count 2014-05-17 10:56:19 +02:00
Franck Allimant
90947bcda9 Free shipping restricitions based on Countries and Shipping module 2014-05-16 10:30:15 +02:00
Franck Allimant
392abff271 Free shipping for selected countries and/or shipping methods 2014-05-15 20:25:22 +02:00
Franck Allimant
683664cb07 Added Model\Module::getModuleInstance() method 2014-05-15 16:50:34 +02:00
Franck Allimant
9c0cc178b4 Added coupon_country and coupon_module tables 2014-05-14 16:35:16 +02:00
Julien Chanséaume
dad74ba290 added missing dependency 2014-05-06 09:32:59 +02:00
Julien Chanseaume
bddda57601 small fixes 2014-05-05 07:22:52 +02:00
Julien Chanseaume
7e70ac8ac8 added new route and controller for feeds 2014-05-05 07:00:20 +02:00
Julien Chanseaume
751fcdeb59 php cs fixer 2014-05-03 11:39:12 +02:00
Julien Chanseaume
02e32d7871 sitemap can be generated according to a specific language and/or specific context (catalog, content) 2014-05-03 11:39:12 +02:00
Julien Chanséaume
5db1cf21ec ajout doc 2014-04-29 17:23:08 +02:00
Julien Chanséaume
d04ca672fb Reimplementing sitemap functionality using Thelia loop 2014-04-29 17:14:44 +02:00
Julien Chanséaume
9ee9a88156 Sitemap functionality 2014-04-29 15:45:36 +02:00
Manuel Raynaud
8aa5912a7a return redirectReponse insteadof sending it 2014-04-28 22:21:06 +02:00
Julien Chanséaume
ac51ab21e4 add estimated shipping functionnality in cart 2014-04-28 12:24:43 +02:00
Franck Allimant
33fe269b25 Fixed module title 2014-04-24 16:28:21 +02:00
Franck Allimant
2f5ea0927a Was missing due to .gitignore misconfiguration 2014-04-24 16:23:59 +02:00
Jérôme Billiras
be923d8f56 Change index from position to activate following issue comment [https://github.com/thelia/thelia/pull/332#issuecomment-41174056] 2014-04-24 10:28:59 +02:00
Jérôme Billiras
5197afb87d Load modules by position 2014-04-23 16:33:01 +02:00
Manuel Raynaud
05bb8ecb80 Merge pull request #327 from roadster31/trad-modules 
Modules translation
 2014-04-22 12:36:30 +02:00
Franck Allimant
9e0dedcb45 Fixed module translations 2014-04-22 12:12:53 +02:00