 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 |
|
|
Jerome Nadaud
|
b141975d57
|
// Fix fields_list check
|
2013-10-21 11:49:08 +02:00 |
|
|
Jerome Nadaud
|
9c4b975cfc
|
//Module uploader bootstraping
|
2013-10-21 11:31:50 +02:00 |
|
|
Jerome Nadaud
|
693a2aa8ff
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 11:25:05 +02:00 |
|
|
Jerome Nadaud
|
81042db718
|
// CSV import uploader bootstraping
|
2013-10-21 11:24:56 +02:00 |
|
|
Vincent Augagneur
|
9cf2fe4214
|
//removed commented code
|
2013-10-21 10:24:20 +02:00 |
|
|
Gregory Roussac
|
3dea171047
|
Merge pull request #862 from PhpMadman/patch-3
[-] PDF : Removed unused code in FrontOffice PDF Invoice
|
2013-10-21 01:15:39 -07:00 |
|
|
PhpMadman
|
35df3f463c
|
Removed unsed code
I looked through the code. And I can't see that that code is used. everything is handled in PDF class.
|
2013-10-21 10:10:28 +02:00 |
|
|
Vincent Augagneur
|
459d0232a4
|
//blockcms use boostrap design
|
2013-10-21 10:08:45 +02:00 |
|
|
Vincent Augagneur
|
e058224cf2
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-21 09:58:18 +02:00 |
|
|
Vincent Augagneur
|
103582be33
|
//blocklink now use bootstrap design
|
2013-10-21 09:58:08 +02:00 |
|
|
Jerome Nadaud
|
6275e7bcad
|
// Remove translations on icon class
|
2013-10-21 09:57:13 +02:00 |
|
|
Kevin Granger
|
a5ca6f11a7
|
// css email
|
2013-10-21 09:51:46 +02:00 |
|
|
Vincent Augagneur
|
fd86a29c5c
|
//small fix
|
2013-10-21 09:50:20 +02:00 |
|
|
Rémi Gaillard
|
198e75245d
|
[-] FO: Don't auto detect language if it not associated to the shop #PSCFV-10273
|
2013-10-21 09:41:00 +02:00 |
|
|
Gregory Roussac
|
8ef22c3548
|
Merge pull request #823 from kpodemski/patch-8
[*] IN: Add phone_mobile to address format
|
2013-10-20 16:40:16 -07:00 |
|
|
gRoussac
|
9b8a7edad8
|
// small refacto
|
2013-10-21 01:05:18 +02:00 |
|
|
gRoussac
|
332c8ff49f
|
[-] CORE : Fix bug #PSCFV-10687 again, #PSCFV-10752 replaceAccentedChars() // sorry for that
|
2013-10-21 00:28:41 +02:00 |
|
|
gRoussac
|
c9d20f35b3
|
// norms
|
2013-10-21 00:00:17 +02:00 |
|
|
gRoussac
|
f2d70076bd
|
[-] : Fix bug #PSCFV-4859, could not register invoice address or invoice country in OPC as guest, and phone not required in standard registration
|
2013-10-20 23:52:48 +02:00 |
|
|
PrestaEdit
|
6633f40a7a
|
// .bak
|
2013-10-19 17:21:46 +02:00 |
|
|
J. Danse
|
02029b1006
|
//ignore .bak
|
2013-10-19 13:11:39 +02:00 |
|
|
Kevin Granger
|
1f02bcaa75
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-18 19:07:15 +02:00 |
|
|
Kevin Granger
|
067eecdc70
|
// small fix
|
2013-10-18 19:07:03 +02:00 |
|