Commit Graph

4020 Commits

Author SHA1 Message Date
Franck Allimant
53b58515e0 Added html_output_trim_level variable 2014-07-01 01:08:27 +02:00
Franck Allimant
811e89f740 PHP-CS fixer pass 2014-07-01 01:07:56 +02:00
Franck Allimant
f820a09a1a Added brand loop test 2014-07-01 01:07:03 +02:00
Franck Allimant
e6f7baccb2 Integrated into SmartyParser.php 2014-07-01 01:00:34 +02:00
Franck Allimant
189ad9f782 Added html_output_trim_level config var, fix for #490 2014-07-01 00:57:41 +02:00
Franck Allimant
1d94f454a7 Brand related translations 2014-06-30 23:12:42 +02:00
Franck Allimant
a6ab169080 Added brand information page 2014-06-30 23:02:28 +02:00
Franck Allimant
c1e3694ab8 Typo 2014-06-30 23:02:03 +02:00
Franck Allimant
a4806132a1 Fixed again excaption image is not found 2014-06-30 22:56:00 +02:00
Franck Allimant
565de5d443 Added brand information 2014-06-30 22:55:28 +02:00
Franck Allimant
63d8ea52dd No more Exception if ID cannot be found (e.g. content=0) 2014-06-30 22:04:09 +02:00
Franck Allimant
7a10a25780 Added "current" loop parameter 2014-06-30 20:13:51 +02:00
Franck Allimant
c209df59f5 Added "brand" loop parameter 2014-06-30 20:13:30 +02:00
Franck Allimant
30afbf1433 Added brands feed processing 2014-06-30 20:13:14 +02:00
Franck Allimant
dc63498180 Added brand feed 2014-06-30 20:12:57 +02:00
Franck Allimant
4f7f26380a Fixed some more method comments 2014-06-30 19:30:00 +02:00
Franck Allimant
e972a4be60 Fixed renderRaw method comment 2014-06-30 19:24:47 +02:00
Franck Allimant
a06b0a57e3 Fixed "save & close" 2014-06-30 19:15:07 +02:00
Franck Allimant
a3a2b8ad8e Added brand data access 2014-06-30 15:18:22 +02:00
Franck Allimant
7ab306cb6c Tra,slations of strings moved from templates to form definitions 2014-06-30 14:51:04 +02:00
Franck Allimant
1458d2ff69 Brand related translations 2014-06-30 14:50:15 +02:00
Franck Allimant
31182c07fc Added product parapter 2014-06-30 14:49:58 +02:00
Franck Allimant
6bc22fd7ef Brand integration 2014-06-30 14:49:29 +02:00
Franck Allimant
a0aa0bd1c2 Added brand logo image selection 2014-06-27 21:07:51 +02:00
Franck Allimant
f279131fe6 Added brand storage in product table 2014-06-27 20:12:55 +02:00
Franck Allimant
15f60ad22b Added product's brand selection in the general tab. 2014-06-27 19:51:41 +02:00
Franck Allimant
297b0bd6ce Added some missing form variables 2014-06-27 19:50:55 +02:00
Franck Allimant
5701d76c1e Removed constraints on the "source" parameter 2014-06-27 19:50:20 +02:00
Franck Allimant
d969f84ae0 Restoired file events compatibility, factorised code 2014-06-26 20:18:06 +02:00
Franck Allimant
fcceaa630d Deleted test images after tests 2014-06-26 20:17:24 +02:00
Franck Allimant
2c9accf58e Added pre and post processing event disatching 2014-06-26 19:52:28 +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
13e57e332a Added brand creation 2014-06-26 15:49:46 +02:00
Manuel Raynaud
ec6c39096f Merge pull request #504 from lovenunu/fix-loop
Fix bug when trying to order by title
2014-06-26 15:42:28 +02:00
Benjamin Perche
f533048fbb Fix bug when trying to order by title
modifié:         core/lib/Thelia/Core/Template/Loop/Module.php
2014-06-26 15:04:25 +02:00
Manuel Raynaud
c73d55a263 Merge pull request #499 from mespeche/mespeche
Add $ROOT substitution variable
2014-06-26 11:30:14 +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
Manuel Raynaud
61b887f92a Merge pull request #501 from lovenunu/fix-psr
Translate french named variables "origine" and "prefixe"
2014-06-26 09:49:00 +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
Julien
e24863fb43 Merge pull request #500 from lovenunu/fix-psr
Fix cs, follow PSR-2, keyword null must be in lower case
2014-06-26 09:24:14 +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