Commit Graph

1254 Commits

Author SHA1 Message Date
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
Franck Allimant
ae6eaefd25 Fixed @param and @return annotations 2014-06-14 16:10:52 +02:00
Nicolas Léon
7c653d63a6 Save and restore the current locale setting 2014-06-13 09:54:38 +02:00
Franck Allimant
ec26ebac32 php-cs fixer passed. 2014-06-12 17:10:38 +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
Nicolas Léon
f33c50fdd3 Typo fix 2014-06-11 17:55:14 +02:00
Nicolas Léon
8126c8e1b0 Allow localization of date formating 2014-06-11 17:53:19 +02:00
Manuel Raynaud
3434010b54 prepare release 2.0.2 2014-06-11 16:05:08 +02:00
Franck Allimant
71ea9e9671 php-cs fixes. 2014-06-11 09:43:27 +02:00
Franck Allimant
5cb01ff30f Fixed typo. 2014-06-11 09:43:20 +02:00
Franck Allimant
ff78e982cd Fixed typo. 2014-06-11 09:43:19 +02:00
Franck Allimant
0bb24298aa replaced ucfirst by underscoreToCamelcase for calculating method name 2014-06-11 09:43:15 +02:00
Franck Allimant
5873b29fc1 Changed "return_to" into "previous" 2014-06-11 09:43:14 +02:00
Franck Allimant
15da99446c Added "js" parameter to intl function for a safe usage in JS string, 2014-06-11 09:43:14 +02:00
Franck Allimant
0683d20d2c Improved and simplified coupon form management 2014-06-11 09:43:09 +02:00
Manuel Raynaud
83ed4aa833 fix copy/past issue 2014-06-05 17:21:37 +02:00
Manuel Raynaud
a4e28e5561 implement search on content loop. 2014-06-05 17:21:37 +02:00
Manuel Raynaud
57cf2d1a10 implement seach on content loop. 2014-06-05 17:21:37 +02:00
Manuel Raynaud
ac028a70b5 implement seach on category loop. 2014-06-05 17:21:37 +02:00
Manuel Raynaud
86c34f589c fix payment and delivery form. Fix #434 2014-06-05 17:21:37 +02:00
Benjamin Perche
946a671c4d Fix cs
modifié:         core/lib/Thelia/Core/Event/SessionEvent.php
	modifié:         core/lib/Thelia/Core/EventListener/SessionListener.php
	modifié:         core/lib/Thelia/Core/TheliaKernelEvents.php
	modifié:         core/lib/Thelia/Model/CartItem.php
2014-06-04 13:43:03 +02:00
Manuel Raynaud
d439197133 translate product in car. Fix #416 2014-05-30 17:07:55 +02:00
Manuel Raynaud
eb13849b79 fix parameter in document loop. Fix #405 2014-05-30 12:22:22 +02:00
Guillaume Barral
2587f208c6 add argument id to the order_product loop 2014-05-27 08:44:49 +02:00