mespeche
|
617b762d8a
|
Working : Resize countries flag + Add bootstrap-switch
|
2013-09-06 10:16:08 +02:00 |
|
franck
|
9655ce3c72
|
Added a 'development mode' to assetic smarty plugin
|
2013-09-06 09:56:39 +02:00 |
|
franck
|
318fb3bf2d
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
templates/admin/default/currencies.html
|
2013-09-05 23:30:50 +02:00 |
|
mespeche
|
91670d8347
|
Working : Add of bootstrap-editable in good directories
|
2013-09-05 11:14:31 +02:00 |
|
mespeche
|
5d6f01d338
|
Working : Clean of currencies list and storage bootstrap-editable
|
2013-09-05 11:12:18 +02:00 |
|
mespeche
|
75513c778a
|
Working : New version of bootstrap-editable + Update of currency pages to bootstrap3
|
2013-09-05 09:56:06 +02:00 |
|
franck
|
866036a0bf
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Config/Resources/routing/front.xml
templates/admin/default/assets/css/admin.less
templates/admin/default/currencies.html
templates/admin/default/general_error.html
templates/admin/default/messages.html
templates/admin/default/variables.html
|
2013-09-04 17:40:34 +02:00 |
|
franck
|
02a1b5c655
|
Event harmonization with MRA
|
2013-09-04 15:45:46 +02:00 |
|
mespeche
|
fec1b57aea
|
Working : Cleanup admin new version bootstrap v3
|
2013-09-04 15:34:29 +02:00 |
|
mespeche
|
7258b24c88
|
Working : Finish renaming class for bootstrap migration
|
2013-09-04 15:05:49 +02:00 |
|
mespeche
|
dafaa02718
|
Working : Major class changes migration from bootstrap 2.x to 3.0
|
2013-09-04 11:35:22 +02:00 |
|
franck
|
26da884dae
|
Fixed minor bug in Currencies
|
2013-09-03 19:32:57 +02:00 |
|
franck
|
fce528c41f
|
Added AdminUtilities Smarty plugin, optimized templates
|
2013-09-03 15:43:05 +02:00 |
|
franck
|
e4c23adba6
|
Smarty inheritance in admin template.
|
2013-09-03 11:26:03 +02:00 |
|
franck
|
5670855dd6
|
Completed the backoffice variable management
|
2013-09-02 00:17:27 +02:00 |
|
franck
|
6d5d0f6606
|
Fixed getUrl()
|
2013-08-31 15:52:42 +02:00 |
|
franck
|
6867eae9b7
|
Fixed customer front controller, events, addec admion config.
|
2013-08-30 19:46:12 +02:00 |
|
franck
|
cce270fdcc
|
Factorized ModelCriterialTools calls in loops
|
2013-08-28 19:47:31 +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
|
c46a708346
|
Categories ordrering in the catalog
|
2013-08-09 10:18:08 +02:00 |
|
franck
|
64031a1883
|
Added category creation and deletion
|
2013-08-08 02:39:42 +02:00 |
|
franck
|
90f5bdd453
|
Added first catalog page
|
2013-08-07 10:17:22 +02:00 |
|
franck
|
3a99023c1d
|
Fixed empty loop wich execute contents problem
|
2013-08-02 13:58:59 +02:00 |
|
franck
|
4ad94059e7
|
Product loop adjustements
|
2013-08-01 10:53:35 +02:00 |
|
franck
|
f7a635dbf7
|
Added DataAccess plugin, admin header completed
|
2013-07-25 22:59:46 +02:00 |
|
franck
|
e8bf47b929
|
Refactored Form system to get simple error handling and a clearer
interface
|
2013-07-16 16:34:47 +02:00 |
|
franck
|
6e5b259d44
|
Added Feed loop to retreive feeds using SimplePie
|
2013-07-06 10:18:19 +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 |
|
franck
|
7351edeb46
|
Test du sparty parser
|
2013-06-18 15:36:22 +02:00 |
|