TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,911 Commits 1 Branch 0 Tags
66d6d03770fbd7aa1937fc6b8e69bc01ac4b7b6b
Commit Graph

1201 Commits

Author SHA1 Message Date
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
gmorel
e606a6f8ce Coupon : Condition module refactor 
Less crappy unmaintainable javascript
More logic in extendable php
 2014-01-05 00:00:15 +01:00
gmorel
8574e1b36e Coupon : Fix mistake with chmod, file mode set as 644 as it originally was 2013-12-30 00:58:43 +01:00
Manuel Raynaud
c47d0d0276 uncomment needed loop for parent folder 2013-12-29 17:18:52 +01:00
Manuel Raynaud
fda7002418 add missing value in folder modification form 2013-12-29 17:18:52 +01:00
Manuel Raynaud
b3b414cb70 Use $parent instead of $folder_id in folders admin template 2013-12-29 17:18:52 +01:00
gmorel
ae1a05eb85 Merge 2013-12-29 04:28:11 +01:00
gmorel
f8ac32a4a0 Refactor : Coupon effect inputs are now more customisable 
Adding effect to be stored as serialised in JSON
 2013-12-29 01:23:50 +01:00
gmorel
e18298bbba Refactor : Coupon effect inputs are now more customisable (input text, select, ajax, etc.. are usable) and unlimited amount of input for coupon effect are now possible too (Event are used for custom inputs) 2013-12-26 23:47:07 +01:00
Etienne Roudeix
39c1b43249 need to unescape breadcrumb strings after been in array 2013-12-23 12:25:15 +01:00
Franck Allimant
eaae979b70 Prevent product and content création at catalog root 2013-12-20 14:51:47 +01:00
Franck Allimant
9ff72f119f Merge branch 'modules' of https://github.com/thelia/thelia into modules 2013-12-20 14:31:06 +01:00
Franck Allimant
afea985549 Merge branch 'modules' of https://github.com/thelia/thelia into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/CartItem.php
	core/lib/Thelia/Model/Base/CartItemQuery.php
	core/lib/Thelia/Model/Base/CouponOrder.php
	core/lib/Thelia/Model/Base/Order.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
	core/lib/Thelia/Model/Base/OrderQuery.php
 2013-12-20 14:30:50 +01:00
Etienne Roudeix
22efc21bfe dynamic delivery modules on delivery front template 2013-12-20 12:14:20 +01:00
Franck Allimant
9092e39296 Merge branch 'master' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php
 2013-12-20 11:32:01 +01:00
Etienne Roudeix
b3ac365b45 Revert "Merge branch 'cleanmaster' into modules" 
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
 2013-12-20 11:16:42 +01:00
Etienne Roudeix
d0ff5260f7 Merge branch 'cleanmaster' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php
 2013-12-20 11:16:35 +01:00
Manuel Raynaud
5f8a6a1a5e change loop in shipping zone template using module insteadof delivery 2013-12-20 09:25:37 +01:00
Etienne Roudeix
5773922314 show coupon codes in back office 2013-12-19 14:50:45 +01:00
Etienne Roudeix
d7c1ecf09a coupon management in order and cart process 2013-12-19 14:17:22 +01:00
Etienne Roudeix
c981102d3a Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-18 17:47:23 +01:00
Etienne Roudeix
1ba60103f3 coupon in orders + model review : backquote use 2013-12-18 17:46:42 +01:00
Manuel Raynaud
0c24a8afc0 Merge branch 'master' into modules 
Conflicts:
	templates/backOffice/default/product-edit.html
 2013-12-17 10:48:59 +01:00
Manuel Raynaud
d6b524e39a add a new entry point in each pages in bo for js include 2013-12-17 10:21:18 +01:00
Manuel Raynaud
0e9ac181e5 fix missing current_id parameter in content-edit.html template 2013-12-16 17:09:48 +01:00
Manuel Raynaud
1a0d543990 fix missing id in folder-edit.html template 2013-12-16 17:06:15 +01:00
Manuel Raynaud
49c6b5b05a remove novalidate paramter on seo form 2013-12-16 16:26:26 +01:00
Manuel Raynaud
b9192e551c fix missing general form on seo form error 2013-12-16 16:22:14 +01:00
Manuel Raynaud
30eab4f416 fix object identifier presence 2013-12-16 15:53:02 +01:00