franck
|
c85ec2a9e3
|
Created AbstractCrudController, and refactored existing controllers
|
2013-09-12 13:02:40 +02:00 |
|
franck
|
3bd3a4d943
|
Started category modification
|
2013-09-07 10:59:43 +02:00 |
|
franck
|
6fdf60b960
|
Categories refactoring
|
2013-09-06 15:56:06 +02:00 |
|
franck
|
bbce082df3
|
Fixed minor visual glitches
|
2013-09-06 10:41:19 +02:00 |
|
mespeche
|
617b762d8a
|
Working : Resize countries flag + Add bootstrap-switch
|
2013-09-06 10:16:08 +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 |
|
franck
|
c276ab236e
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
templates/admin/default/currencies.html
|
2013-09-05 16:53:07 +02:00 |
|
mespeche
|
e289c8026f
|
Working : For attributes on labels
|
2013-09-05 16:51:45 +02:00 |
|
mespeche
|
5d6f01d338
|
Working : Clean of currencies list and storage bootstrap-editable
|
2013-09-05 11:12:18 +02:00 |
|
franck
|
3b27a71967
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-05 10:00:39 +02:00 |
|
franck
|
271e6c64f0
|
Before merging coupon
|
2013-09-05 10:00:17 +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
|
d3a287333e
|
Fixed TheliaLoop Smarty plugin (lopp imbrication was broken)
|
2013-09-04 19:02:26 +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
|
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
|
ec32aa9eb5
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Controller/BaseController.php
|
2013-09-03 19:03:27 +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 |
|