 Damien Metzger
|
7cd38d4461
|
// Changed base64 to urlencode in import (and fixed filename issue)
|
2013-11-29 19:24:04 +01:00 |
|
|
Jerome Nadaud
|
8decc89750
|
// Fix color form item
|
2013-11-29 18:39:26 +01:00 |
|
|
Jerome Nadaud
|
0a2a36f49b
|
// Add text-success class to upload button
|
2013-11-29 18:15:55 +01:00 |
|
|
Jerome Nadaud
|
a597881da7
|
// Fix simple uploader view
|
2013-11-29 18:07:27 +01:00 |
|
|
Jerome Nadaud
|
f8a94b1be9
|
// Catalog price rules bootstraping
|
2013-11-29 17:31:28 +01:00 |
|
|
Jerome Nadaud
|
b432fd5641
|
// Bootstraping cart rules
|
2013-11-29 17:13:09 +01:00 |
|
|
Jerome Nadaud
|
6da40e7159
|
// fix new tax rule button
|
2013-11-29 16:54:33 +01:00 |
|
|
Jerome Nadaud
|
8ad3166226
|
// Add save button to Localization tax rules
|
2013-11-29 15:30:57 +01:00 |
|
|
Jerome Nadaud
|
badfef481c
|
// Small fix
|
2013-11-29 12:20:10 +01:00 |
|
|
Jerome Nadaud
|
e1568a67a2
|
// Fix products attachments uploader
|
2013-11-29 12:10:09 +01:00 |
|
|
Kevin Granger
|
cc80e82431
|
// import (todo: add the link delete/view on items loaded with js)
|
2013-11-29 11:53:43 +01:00 |
|
|
Kevin Granger
|
1d2f6c9b9d
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-28 19:22:03 +01:00 |
|
|
Kevin Granger
|
0f74646524
|
// import
|
2013-11-28 19:21:55 +01:00 |
|
|
Jerome Nadaud
|
9e6868ba97
|
// Change product attachment upload system
|
2013-11-28 19:09:24 +01:00 |
|
|
Vincent Augagneur
|
66947b5354
|
//multiple small fix on carrier wizard
|
2013-11-28 17:38:05 +01:00 |
|
|
Jerome Nadaud
|
7261490381
|
// Fix Categories image problem
|
2013-11-28 15:35:17 +01:00 |
|
|
Kevin Granger
|
8848ff08d8
|
// test git
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
controllers/admin/AdminImportController.php
|
2013-11-28 14:29:34 +01:00 |
|
|
Kevin Granger
|
6729d97534
|
// import WIP
|
2013-11-28 12:22:39 +01:00 |
|
|
Vincent Augagneur
|
dde8540a86
|
//carrier wizard logo location fixed
|
2013-11-28 11:27:34 +01:00 |
|
|
gRoussac
|
8370c18fe8
|
[-] CORE : Remove notices on ob clean
|
2013-11-28 11:11:49 +01:00 |
|
|
Vincent Augagneur
|
ddf00b3e98
|
//small fix #PSCSX-50
|
2013-11-28 11:06:46 +01:00 |
|
|
Jerome Nadaud
|
510b71054a
|
// Add Drag and Drop to uploader helper
|
2013-11-28 09:55:22 +01:00 |
|
|
Kevin Granger
|
cc3a1379d1
|
// Import WIP (still broken for first upload)
|
2013-11-27 19:33:36 +01:00 |
|
|
Jerome Nadaud
|
b58e8b6bb7
|
// One step csv uploader
|
2013-11-27 16:35:58 +01:00 |
|
|
Kevin Granger
|
8f51fee67a
|
// load jquery-timeago.js
|
2013-11-27 15:15:30 +01:00 |
|
|
Kevin Granger
|
e1ae484c10
|
// add jquery.timeago.js + jquery. validatio,.js
|
2013-11-27 14:39:09 +01:00 |
|
|
Kevin Granger
|
66f8b55fc2
|
// import WIP (broken for now)
|
2013-11-27 14:35:47 +01:00 |
|
|
Kevin Granger
|
dd36a9e8b7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-27 11:35:41 +01:00 |
|
|
gRoussac
|
b8012952f7
|
[*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/852
|
2013-11-26 22:32:57 +01:00 |
|
|
Kevin Granger
|
37d4d4bd5f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-26 19:03:27 +01:00 |
|
|
Kevin Granger
|
32af46e42c
|
// Import WIP
|
2013-11-26 19:03:15 +01:00 |
|
|
PhpMadman
|
0a5216e35b
|
show all messages link linked to tab
|
2013-11-26 15:56:21 +01:00 |
|
|
Jerome Nadaud
|
dc90bb6227
|
// Force clearstatcache on product image upload
|
2013-11-26 15:46:21 +01:00 |
|
|
Kevin Granger
|
926286eaf9
|
// fix switch
|
2013-11-26 10:33:35 +01:00 |
|
|
Jerome Nadaud
|
0d6bc850de
|
// Update datepicker button with period buttons select
|
2013-11-25 18:24:06 +01:00 |
|
|
Jerome Nadaud
|
a81ee41374
|
// Fix missing saving button in products
|
2013-11-25 18:01:01 +01:00 |
|
|
Kevin Granger
|
4c8c48f441
|
// admin import
|
2013-11-25 17:55:59 +01:00 |
|
|
Kevin Granger
|
0e3504f3b3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-25 17:17:15 +01:00 |
|
|
Kevin Granger
|
fae1fd58a9
|
// tweak on switch + admin import
|
2013-11-25 17:16:59 +01:00 |
|
|
Jerome Nadaud
|
a98002083f
|
// Now you can click on folder icon to expand or collapse
|
2013-11-25 16:45:26 +01:00 |
|
|
Jerome Nadaud
|
b2cee0426a
|
// Default category was not selected
|
2013-11-25 16:05:18 +01:00 |
|
|
Jerome Nadaud
|
d30e376354
|
// Remove "no name" error on new product
|
2013-11-25 14:42:21 +01:00 |
|
|
Jerome Nadaud
|
611cfd90a0
|
[-] BO : FixBug #PSCSX-40 categories unchanged after select a new home category
|
2013-11-25 12:08:34 +01:00 |
|
|
Damien Metzger
|
dec1555b32
|
// Fixed dashboard simulation mode switch
|
2013-11-25 11:30:30 +01:00 |
|
|
Kevin Granger
|
4044ba853e
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-22 18:57:15 +01:00 |
|
|
Kevin Granger
|
0572fc09e8
|
// tweaks list + customers
|
2013-11-22 18:56:52 +01:00 |
|
|
Jérôme Nadaud
|
1337407131
|
Merge pull request #1019 from djfm/translations
Translations
|
2013-11-22 09:12:55 -08:00 |
|
|
rGaillard
|
b29a30f033
|
// small fix
|
2013-11-22 17:59:32 +01:00 |
|
|
djfm
|
a147806382
|
// Improved texts and UI in AdminImport
|
2013-11-22 15:44:49 +00:00 |
|
|
Jerome Nadaud
|
3fe6608a62
|
// Include datetime picker for all admin controllers
|
2013-11-22 16:41:52 +01:00 |
|