Manuel Raynaud
|
591f952287
|
Merge branch 'template'
|
2013-09-11 17:26:34 +02:00 |
|
gmorel
|
41cf74ccac
|
Working
- add ajax loader
|
2013-09-11 17:22:31 +02:00 |
|
Manuel Raynaud
|
b03eb969ca
|
add logo for beta version
|
2013-09-11 16:18:58 +02:00 |
|
mespeche
|
a6ada57b34
|
Update body background
|
2013-09-11 10:20:31 +02:00 |
|
gmorel
|
413e77fa97
|
WIP
- Coupon : ajax add
|
2013-09-09 17:46:01 +02:00 |
|
mespeche
|
617b762d8a
|
Working : Resize countries flag + Add bootstrap-switch
|
2013-09-06 10:16:08 +02:00 |
|
mespeche
|
91670d8347
|
Working : Add of bootstrap-editable in good directories
|
2013-09-05 11:14:31 +02:00 |
|
mespeche
|
7258b24c88
|
Working : Finish renaming class for bootstrap migration
|
2013-09-04 15:05:49 +02:00 |
|
Etienne Roudeix
|
86b11096ba
|
Merge branch 'master' into loops
Conflicts:
core/lib/Thelia/Core/Template/Loop/Category.php
core/lib/Thelia/Core/Template/Loop/FeatureValue.php
core/lib/Thelia/Core/Template/Loop/Folder.php
core/lib/Thelia/Core/Template/Loop/Product.php
core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
install/faker.php
|
2013-08-21 09:19:56 +02:00 |
|
franck
|
64031a1883
|
Added category creation and deletion
|
2013-08-08 02:39:42 +02:00 |
|
Etienne Roudeix
|
ad47ab7cac
|
set execution right // no more troubles
change composer required PHP version from 5.4 to 5.3
|
2013-06-20 15:21:16 +02:00 |
|
franck
|
89abfaad48
|
Integration of Assetic in SmartyParser, extended it to Admin (we can now
use loops !), added the Thelia ControllerResolver and fixed config and
routing accordingly.²:wq
|
2013-06-19 02:07:43 +02:00 |
|