 gRoussac
|
1ae587475b
|
[-] MO : Fix bug #PSCFV-10787, cms associated to all shops
|
2013-10-22 12:19:58 +02:00 |
|
|
Jerome Nadaud
|
a8db1f3030
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-22 12:13:37 +02:00 |
|
|
Jerome Nadaud
|
b6d6336e26
|
// Add date subtitle
|
2013-10-22 12:12:41 +02:00 |
|
|
Damien Metzger
|
857c66454b
|
// Typo
|
2013-10-22 11:47:47 +02:00 |
|
|
Damien Metzger
|
16cf10d586
|
// New profitability calculation
|
2013-10-22 11:39:57 +02:00 |
|
|
Jerome Nadaud
|
d8d9436f51
|
// add date change trigger
|
2013-10-22 11:35:24 +02:00 |
|
|
gRoussac
|
d20aea0563
|
[-] BO : Fix bug #PSCFV-10767, could not retrieve feature value when product IDs not forced
|
2013-10-22 11:27:45 +02:00 |
|
|
Jerome Nadaud
|
73e9d966a6
|
// list bulk actions fix
|
2013-10-22 11:24:50 +02:00 |
|
|
Rémi Gaillard
|
c6997bd525
|
// move clear cache of color list
|
2013-10-22 11:09:55 +02:00 |
|
|
Gaelle ITZKOVITZ
|
ce8d01ad4c
|
[-] MO : if customer is logged we do not recreate it
|
2013-10-22 11:09:53 +02:00 |
|
|
Jerome Nadaud
|
96766a311e
|
// Unify form fields for image preferences
|
2013-10-22 10:10:15 +02:00 |
|
|
Kevin Granger
|
aa95454c4e
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/images/content.tpl
|
2013-10-22 10:07:03 +02:00 |
|
|
Kevin Granger
|
eb82297f45
|
// small fixs
|
2013-10-22 10:04:45 +02:00 |
|
|
gRoussac
|
2aa52356ad
|
[-] BO : Fix bug #PSCFV-10607 one upload name
|
2013-10-22 09:39:59 +02:00 |
|
|
Jerome Nadaud
|
3ba337f19a
|
// Image preference bootstraping
|
2013-10-22 09:25:05 +02:00 |
|
|
Vincent Augagneur
|
a62f9169d5
|
//missing file btn-primary => btn btn-default
|
2013-10-22 09:15:46 +02:00 |
|
|
Vincent Augagneur
|
8144935d76
|
//btn-primary => btn btn-default thanks @Shipow
|
2013-10-22 09:12:01 +02:00 |
|
|
Vincent Augagneur
|
6bc9b54306
|
//small fix - added new link on block top menu
|
2013-10-21 22:29:56 +02:00 |
|
|
Jerome Nadaud
|
fb167d94f9
|
// Remove duplicate class
|
2013-10-21 19:13:19 +02:00 |
|
|
Damien Metzger
|
e8f68441db
|
// Assigned shop phone to frontend smarty
|
2013-10-21 19:02:25 +02:00 |
|
|
Kevin Granger
|
fadbc4c250
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 19:00:18 +02:00 |
|
|
Kevin Granger
|
c89f6c1adb
|
// css fix
|
2013-10-21 18:58:23 +02:00 |
|
|
Jerome Nadaud
|
f336cc599b
|
// Btn-primary replacement
|
2013-10-21 18:56:41 +02:00 |
|
|
Jerome Nadaud
|
766e409476
|
// Wrong end block position
|
2013-10-21 18:34:03 +02:00 |
|
|
Damien Metzger
|
bf6c57063c
|
// Fixed dashboard style
|
2013-10-21 18:18:48 +02:00 |
|
|
Damien Metzger
|
58aa64fab7
|
// Code cleaning
|
2013-10-21 18:18:48 +02:00 |
|
|
Kevin Granger
|
3ae1f68b3b
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 18:03:15 +02:00 |
|
|
Kevin Granger
|
2e13013657
|
// search field WIP
|
2013-10-21 18:03:00 +02:00 |
|
|
Jerome Nadaud
|
d6ad300625
|
// List pagination improvements
|
2013-10-21 17:59:48 +02:00 |
|
|
gRoussac
|
c1ecf43be8
|
[-] MO : Fix bug #PSCFV-10775, could not upload .jpeg in TinyMCE
|
2013-10-21 17:39:20 +02:00 |
|
|
Damien Metzger
|
e7b901ce34
|
// Smaller update notification
|
2013-10-21 17:24:34 +02:00 |
|
|
Jerome Nadaud
|
f0104dc726
|
// Wait 1s for ajax element close
|
2013-10-21 17:22:42 +02:00 |
|
|
Jerome Nadaud
|
5f75439a6b
|
// Date range picker improvements
|
2013-10-21 17:07:57 +02:00 |
|
|
gRoussac
|
aefa821d7f
|
[*] MO : TM - Blockcart added Layer
|
2013-10-21 16:55:47 +02:00 |
|
|
gRoussac
|
16ffbd8ee5
|
// norms
|
2013-10-21 16:46:22 +02:00 |
|
|
gRoussac
|
61884ec223
|
// norms
|
2013-10-21 16:31:56 +02:00 |
|
|
Damien Metzger
|
3cf5c9968b
|
// Added images to blockmanufacturers
|
2013-10-21 15:39:14 +02:00 |
|
|
gRoussac
|
a05c748e81
|
// addJqueryPlugin receives array in first argument
|
2013-10-21 15:05:03 +02:00 |
|
|
Vincent Augagneur
|
10473e09ad
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 14:51:25 +02:00 |
|
|
Vincent Augagneur
|
150c6e0130
|
[+] CORE : helperList action can be rendered from module classe
|
2013-10-21 14:51:14 +02:00 |
|
|
gRoussac
|
a9e45fccf3
|
[-] MO : ScrollTo not loaded
|
2013-10-21 14:35:23 +02:00 |
|
|
gRoussac
|
d25b41ef97
|
[-] BO : wrong csv files name
|
2013-10-21 14:34:59 +02:00 |
|
|
Samy Rabih
|
5d8c0a0fc2
|
duplicateFeatures doesn't protect feature values
The features values are not protected using pSQL during the features
duplication
|
2013-10-21 14:08:30 +02:00 |
|
|
Jerome Nadaud
|
7fbf6c7de0
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 13:45:50 +02:00 |
|
|
Jerome Nadaud
|
e53e63c257
|
// Add Back button to list footer
|
2013-10-21 13:45:39 +02:00 |
|
|
gRoussac
|
7c7fe5dc0b
|
// small change
|
2013-10-21 12:39:48 +02:00 |
|
|
Jerome Nadaud
|
53a7b75d7a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 12:36:02 +02:00 |
|
|
Jerome Nadaud
|
101df4c0b9
|
// Add check list filters value
|
2013-10-21 12:35:57 +02:00 |
|
|
gRoussac
|
15cd0b9fbc
|
[-] BO : Report of https://github.com/PrestaShop/PrestaShop/commit/fd86a29c5c369ec5da0f91bbe97c584a00d02d0d
|
2013-10-21 12:21:49 +02:00 |
|
|
Kevin Granger
|
957f9f0467
|
// categories group
|
2013-10-21 12:21:35 +02:00 |
|