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

1277 Commits

Author SHA1 Message Date
Julien
f06854ce48 Merge pull request #505 from roadster31/brands 
- Brands implementation
- image + documents refactoring
- new smarty functions for form generation.
- lots of code enhancements
 2014-07-08 11:45:44 +02:00
Franck Allimant
6c1e45276b PHP-CS fixer passed 2014-07-08 10:33:47 +02:00
Franck Allimant
ab484973e1 Fixed "success_url" appearing twice in forms 2014-07-07 23:24:39 +02:00
Franck Allimant
7580d5c869 Template fragments are now in a subdirectory 2014-07-04 15:27:56 +02:00
Franck Allimant
f46168f518 Fixed some typos 2014-07-03 19:19:21 +02:00
Franck Allimant
af5e0bde23 Refined form fields HTML bindings 2014-07-03 16:27:18 +02:00
Franck Allimant
c0541e3aa2 Added getTemplateDirectories method to ParserInterface 2014-07-03 16:25:50 +02:00
Guillaume Barral
182ba26045 correction of the filter visible in categoryTree. 2014-07-02 11:47:27 +02:00
Franck Allimant
544060d062 NULL no longer returned by $BRAND_ID and $LOGO_IMAGE_ID 2014-07-01 01:21:59 +02:00
Franck Allimant
811e89f740 PHP-CS fixer pass 2014-07-01 01:07:56 +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
a4806132a1 Fixed again excaption image is not found 2014-06-30 22:56:00 +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
a3a2b8ad8e Added brand data access 2014-06-30 15:18:22 +02:00
Franck Allimant
31182c07fc Added product parapter 2014-06-30 14:49:58 +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
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
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
Franck Allimant
0dde8b888a Added brands management 2014-06-26 10:52:13 +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
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
84c2432507 remove unused variable 2014-06-24 10:38:43 +02:00
Manuel Raynaud
a00a23e495 remove unused use statement 2014-06-24 10:29:17 +02:00
Manuel Raynaud
cfa9462474 add missing class. Fix #493 2014-06-21 13:15:41 +02:00
Franck Allimant
9cb145e644 Fix for #490 2014-06-19 17:56:01 +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
ce772b6b60 An exception is thrown if a module could not be loaded. 2014-06-18 15:36:59 +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
Manuel Raynaud
f9e0db06c1 refactor formatDate function and create test 2014-06-17 15:41:47 +02:00
Franck Allimant
8b74eae911 php-cs pass 2014-06-17 00:43:10 +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