Franck Allimant
87ed08dc6f
Fixes #293 , #294
2014-04-15 17:41:33 +02:00
Manuel Raynaud
5e9070097d
allow to possibility to flush the cache from admin panel, Fix #249
2014-04-10 15:56:52 +02:00
Manuel Raynaud
d556024073
update italian translation
2014-03-25 22:00:18 +01:00
Boyquotes
adf56fd142
Typo in class/file name
2014-03-22 10:17:00 +01:00
Boyquotes
95335babac
Merge remote-tracking branch 'upstream/master'
2014-03-21 09:30:30 +01:00
Boyquotes
34937fe3ec
reference deactivate command line
2014-03-21 09:28:31 +01:00
Manuel Raynaud
e4ba7d8d11
change the way product is created
2014-03-13 09:56:11 +01:00
Manuel Raynaud
210eb6dd72
remove executable right on some files
2014-03-10 11:22:47 +01:00
Manuel Raynaud
8c45c392ac
add a first verification in controller creation process for verifying if an admin is already logged in. Fix #246
2014-03-07 12:42:39 +01:00
Manuel Raynaud
b833b4a5b6
Merge pull request #236 from mespeche/master
...
Add Translator on all controllers & forms text strings
2014-02-22 17:52:11 +01:00
Manuel Raynaud
12741c7663
refactor validator translation in a listener
2014-02-21 17:53:49 +01:00
Michaël Espeche
03a62575ec
Add Translator on all controllers & forms text strings
2014-02-21 12:05:27 +01:00
Michaël Espeche
809693fe5e
Add Translator on all form text strings
2014-02-21 11:48:44 +01:00
Manuel Raynaud
3244e88585
create lost password email
2014-02-11 16:13:30 +01:00
Franck Allimant
84f8a15fac
Fixed Customer action configuration, the secutiry context was missing
2014-02-03 15:31:05 +01:00
Franck Allimant
89653f452b
Removes container from all Thelia actions, but Modules ( #198 )
2014-01-31 20:06:42 +01:00
Franck Allimant
f8e3553924
Removed unused container dependency from the FileManager class
2014-01-31 15:55:21 +01:00
Manuel Raynaud
58ae3bb619
remove container from administrator listener and create test for this
...
event. #198
2014-01-31 12:02:45 +01:00
Manuel Raynaud
bf49aa24dd
Remove container from Adress listenet. #198
2014-01-31 11:28:06 +01:00
Manuel Raynaud
3fb0dfe1db
Remove container in Customer listener. #198
2014-01-31 11:03:53 +01:00
Manuel Raynaud
6e33670e04
update translations
2014-01-29 14:42:06 +01:00
Manuel Raynaud
1b2c1d53ac
remove some unused variables
2014-01-22 15:50:40 +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
Franck Allimant
77837b74da
Fixed delete module route
2014-01-16 12:01:42 +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
b6a4ae7749
[Back-office] Add core translation
2014-01-14 15:18:03 +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
Etienne Roudeix
99038e688a
Revert "Revert "Merge branch 'cleanmaster' into modules""
...
This reverts commit b3ac365b45
2014-01-06 11:25:25 +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
3e12ace045
Coupon : Fix mistake with chmod, file mode set as 644 as it originally was
2013-12-30 00:50:04 +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
gmorel
8f9b86ff6a
Merge branch 'master' of https://github.com/thelia/thelia into coupon
...
* 'master' of https://github.com/thelia/thelia : (121 commits)
set cartItem in cart add and update events
need to unescape breadcrumb strings after been in array
update readme file
update insert.sql with new release version
change changelog file format
Prevent product and content création at catalog root
dynamic delivery modules on delivery front template
complete changelog
Finished merging modules with master
Revert "Merge branch 'cleanmaster' into modules"
use TaxEngine::getDeliveryCountry in delivery loop
refacto getTaxCountry which is actually getDeliveryCountry
make it magic last stand
change loop in shipping zone template using module insteadof delivery
Fixed template loop
Refactored templates processing
complete readme file
change email address of core contributors
fix getPosition folder test
add coupon tests
...
Conflicts:
core/lib/Thelia/Controller/Admin/ProductController.php
2013-12-25 14:14:20 +01:00
gmorel
69d255f782
new branch coupon
2013-12-25 14:12:54 +01:00
Etienne Roudeix
b3ac365b45
Revert "Merge branch 'cleanmaster' into modules"
...
This reverts commit d0ff5260f767d0101dbe
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
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
2f4158d1f6
fix cs
2013-12-18 10:04:13 +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
d6ba2b3d65
Merge branch 'master' into frontend
2013-12-16 15:45:04 +01:00
Etienne Roudeix
c5e69ebbb9
Merge branch 'cleanmaster' into modules
2013-12-16 10:56:40 +01:00
Etienne Roudeix
583cbe95b6
document positioning
2013-12-16 10:55:18 +01:00
Etienne Roudeix
297f197fed
Merge branch 'cleanmaster' into modules
2013-12-12 15:45:45 +01:00
Etienne Roudeix
93537b8d71
in progress : reorder image
2013-12-12 15:30:10 +01:00
touffies
4990d0fd7b
Fix duplicate route id
2013-12-11 20:55:00 +01:00
Etienne Roudeix
02b9d2e509
Merge branch 'cleanmaster' into modules
2013-12-10 15:57:37 +01:00
