TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,993 Commits 1 Branch 0 Tags
09c4575d2c6bf8c84e261de6e1a7f39ea00ecb63
Commit Graph

1229 Commits

Author SHA1 Message Date
Franck Allimant
7043a9e388 Fixed #196 2014-01-27 22:12:29 +01:00
Manuel Raynaud
d3c276041f add new translations 2014-01-27 16:56:05 +01:00
Franck Allimant
c5cc6aae76 Added administrator preferred locale (see issue #183) 2014-01-27 14:29:37 +01:00
Franck Allimant
d52d49ae05 Fixed wrong values displayed for empty text feature values 2014-01-27 12:50:18 +01:00
Franck Allimant
3c36a3e1b2 Language menu in the B.O to switch UI language on the fly. (see issue #183) 2014-01-26 22:03:11 +01:00
Franck Allimant
6b78a33f97 Improved order management in back-office 2014-01-25 19:14:57 +01:00
Manuel Raynaud
014b1670be fix smarty code style 2014-01-24 11:06:14 +01:00
Manuel Raynaud
aad23ab85e apply nofilter modifier on capture.additional in product page 2014-01-24 10:32:18 +01:00
Manuel Raynaud
13f59cda0a remove unused include 2014-01-24 09:34:04 +01:00
Manuel Raynaud
e7ac9adba4 [Front]remove toolbar inclusion in category page 2014-01-24 09:34:04 +01:00
Manuel Raynaud
b5bd437d91 use count smarty function instead of loop for retrieving number of 
results
 2014-01-24 09:34:04 +01:00
Franck Allimant
bb452c2efc Changed "Details" by "Price" 2014-01-23 15:35:52 +01:00
Manuel Raynaud
dbf0c78fa5 remove hardcoded annotation 2014-01-23 11:43:06 +01:00
Manuel Raynaud
1023790822 remove myserious annotation... 2014-01-23 11:41:15 +01:00
Emmanuel Nurit
da905bcbb1 [front office] modification template default 
Displaying fields with nofilter.
Adding some missing translation strings
 2014-01-23 09:10:27 +01:00
Manuel Raynaud
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Franck Allimant
5d92ea0bab TaxManager is now a service in the container. 2014-01-22 01:18:28 +01:00
Manuel Raynaud
3b3e993514 unescape variable in form 2014-01-21 14:56:51 +01:00
Manuel Raynaud
ce0fbb11a1 add missing close block 2014-01-21 12:25:57 +01:00
Manuel Raynaud
91cf069313 fix associations tab in product modification page 2014-01-21 11:27:15 +01:00
Manuel Raynaud
87bc1a83aa change content if on product associated content 2014-01-21 11:27:15 +01:00
Manuel Raynaud
502b149d32 change good content id for category associated content 2014-01-21 11:27:15 +01:00
Franck Allimant
8bc1f67a51 Added link to associated content 2014-01-21 02:13:55 +01:00
Franck Allimant
76926dce68 Removed the empty "details" tab 2014-01-21 02:12:43 +01:00
Manuel Raynaud
2bd23777ca "save and close" button had now effect. Fix #185 2014-01-20 14:52:44 +01:00
Manuel Raynaud
180068d252 Merge pull request #187 from enurit/master 
[front office] default template unescape title
 2014-01-20 05:01:37 -08:00
Emmanuel Nurit
83dd514114 [front office] default template unescape tile 2014-01-20 12:07:58 +01:00
Manuel Raynaud
3e4eff172f fix getExistingObject method for several controller. 2014-01-20 12:01:25 +01:00
Franck Allimant
4d933b8a46 Fixed module position change 2014-01-16 12:24:50 +01:00
Franck Allimant
66683a9169 Delete module request contains now "data data" flag 2014-01-16 12:00:51 +01:00
Franck Allimant
6fb448a461 Form content is now integrated in the modal body 2014-01-16 11:59:42 +01:00
Michaël Espeche
6401266226 Filter management optimization for ajax use 2014-01-16 11:13:52 +01:00
Manuel Raynaud
0c564be4c5 Merge branch 'master' of https://github.com/enurit/thelia into enurit-master 
Conflicts:
	templates/frontOffice/default/I18n/fr_FR.php
 2014-01-14 19:21:01 +01:00
Emmanuel Nurit
3b756574c2 [back office] add pdf french translation 2014-01-14 15:55:56 +01:00
Emmanuel Nurit
1f1fd3e90f [front office] translation fixes 2014-01-14 15:52:12 +01:00
Emmanuel Nurit
b6a4ae7749 [Back-office] Add core translation 2014-01-14 15:18:03 +01:00
Manuel Raynaud
2f91816c2a prepare tinymce module 2014-01-13 17:54:22 +01:00
Etienne Roudeix
ebd4e76e0a type 2014-01-13 11:30:49 +01:00
enurit
cabe894e13 English translation 
Fix some english translation
 2014-01-10 15:37:32 +01:00
enurit
d4f47333f2 Front Translation 
Adding translation for front default template
 2014-01-10 15:33:59 +01:00
enurit
08edf1a4c0 French translation default template 
Adding some missing translations
 2014-01-10 15:23:53 +01:00
enurit
e460d70cef English translation 
English translation fixes
 2014-01-10 15:21:18 +01:00
enurit
b40894e2d4 French translation 
Add of missing french translations
 2014-01-10 15:18:30 +01:00
Manuel Raynaud
8214ab77ec refactor update process. Now only available with command line 2014-01-08 16:23:54 +01:00
Manuel Raynaud
97a9ff26be finish update process 2014-01-08 12:16:25 +01:00
Manuel Raynaud
6a9fd30a53 create new entry in config menu and not needed update page 2014-01-08 12:16:25 +01:00
Manuel Raynaud
b72fab5212 start update process 2014-01-08 12:16:25 +01:00
enurit
535f3dd850 update breadcrumb.tpl unescape the last item 
The last item need to be unescape too
 2014-01-07 11:02:08 +01:00
Etienne Roudeix
99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules"" 
This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
 2014-01-06 11:25:25 +01:00
gmorel
b8c2c2d703 Coupon : Condition module : add tooltip on condition select 2014-01-05 20:17:30 +01:00