Etienne Roudeix
|
622e1ca3b6
|
Merge branch 'master' into tax
Conflicts:
core/lib/Thelia/Core/Template/Loop/FeatureValue.php
core/lib/Thelia/Model/Base/AttributeTemplate.php
core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
install/thelia.sql
local/config/schema.xml
|
2013-09-27 10:29:51 +02:00 |
|
gmorel
|
0cdd960cb1
|
Working : images : enhance display
|
2013-09-26 15:26:45 +02:00 |
|
Etienne Roudeix
|
d967242a59
|
order admin
|
2013-09-25 13:26:12 +02:00 |
|
Etienne Roudeix
|
7bd511c420
|
order admin
|
2013-09-24 17:04:32 +02:00 |
|
mespeche
|
144864de09
|
Merge branch 'upload_management' of https://github.com/thelia/thelia into upload_management
|
2013-09-23 12:31:01 +02:00 |
|
mespeche
|
1ea614be57
|
Update uploader view
Update image edit view
|
2013-09-23 12:30:34 +02:00 |
|
franck
|
72a2cdfd75
|
Ajaxified product modification tabs
|
2013-09-21 16:51:51 +02:00 |
|
mespeche
|
b933a96c8e
|
Vertical align middle tables
|
2013-09-20 10:39:02 +02:00 |
|
mespeche
|
1d90e8ba54
|
Responsive management header
|
2013-09-19 16:42:03 +02:00 |
|
mespeche
|
2640794af7
|
Change properties of bootstrap-select field
|
2013-09-19 13:21:42 +02:00 |
|
mespeche
|
260fc5b51a
|
Width 100% on bootstrap-select
|
2013-09-19 12:47:56 +02:00 |
|
mespeche
|
0ebaf458ed
|
- Adding of bootstrap-select
- Finish shipping_configuration view
- bootstrap-select on shipping_zones view
|
2013-09-19 12:31:46 +02:00 |
|
mespeche
|
a02ba364be
|
Change background image to simple background color
|
2013-09-19 10:15:14 +02:00 |
|
mespeche
|
742b90b24c
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-18 11:55:04 +02:00 |
|
mespeche
|
c7a6fe060f
|
- Setting dashboard view with jqplot plugin
|
2013-09-18 11:53:39 +02:00 |
|
franck
|
2f41d4db6f
|
Started category management
|
2013-09-16 18:58:45 +02:00 |
|
mespeche
|
8b0c8bd760
|
First version of installation wizard
|
2013-09-13 18:03:45 +02:00 |
|
mespeche
|
9fdf3d35de
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
templates/admin/default/customers.html
|
2013-09-13 11:59:21 +02:00 |
|
mespeche
|
bb896b56ab
|
Insert pagination inside tfoot
|
2013-09-13 11:57:49 +02:00 |
|
franck
|
316043d93a
|
Fixed action column alignment
|
2013-09-13 00:18:19 +02:00 |
|
mespeche
|
2163121a1a
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-09-12 12:41:30 +02:00 |
|
mespeche
|
c64b987e9b
|
- Creation of order-edit view
|
2013-09-12 12:40:46 +02:00 |
|
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
|
f50d41b32c
|
Change breadcrumb separator color
|
2013-09-11 11:46:50 +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
|
c015bbe8b5
|
Working :
- Refactor to bootstrap3
- Label information in Form files
|
2013-09-06 12:12:27 +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
|
5d6f01d338
|
Working : Clean of currencies list and storage bootstrap-editable
|
2013-09-05 11:12:18 +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 |
|