Kevin Granger
4fbc8deaa8
// fix products
2013-11-12 18:21:36 +01:00
ccauw
747926039a
[*] BO : add class on TD in standard List
...
Back office :
Add a class on TD in list created by getList()
In fields_list array of AdminController, we can add a new parameter('class')
example :
'name' => array(
'title' => $this->l('Name'),
'width' => 150,
'class' => 'ma_classe',
'filter_key' => 'b!name'
),
This parameter can be used for javascript effect, ...
Thanks.
2013-11-12 18:01:27 +01:00
gRoussac
5e4382eb08
[-] BO : Fix bug #PSCFV-10982 reduction group truncated
2013-11-12 17:55:07 +01:00
Kevin Granger
4e06b1fdd5
// update Bootstrap 3.0.2 + fix tree header
2013-11-12 14:50:19 +01:00
gRoussac
19da345531
[-] BO : Could not check all modules after ajax call
2013-11-10 21:51:14 +01:00
Jerome Nadaud
c5b3d20b96
// Fix empty file list on add
2013-11-08 18:05:56 +01:00
Jerome Nadaud
bdc996d13b
// Wrong col size
2013-11-08 17:58:09 +01:00
Jerome Nadaud
217a79eeae
// Unify thumb param in files options
2013-11-08 17:49:56 +01:00
Jerome Nadaud
9065a73998
// Remove flags
2013-11-08 17:21:36 +01:00
Kevin Granger
00a72a5f68
// skin uploader button
2013-11-08 16:56:12 +01:00
Jerome Nadaud
bf67bd56a3
// Add uploader to products controller
2013-11-08 16:29:07 +01:00
Shagshag
c7f1fcb49a
kb was not translatable
2013-11-08 15:33:49 +01:00
Rémi Gaillard
f5c133f6e0
// small fix
2013-11-07 17:50:28 +01:00
Rémi Gaillard
2d609ec93c
// merge fixes
2013-11-07 17:43:26 +01:00
Rémi Gaillard
e3cfacb90e
// link to employee default tab and not index
2013-11-07 17:00:55 +01:00
Jerome Nadaud
01d8376ee7
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-07 16:48:56 +01:00
Jerome Nadaud
18718792be
// Uploader helper part 3
2013-11-07 16:42:00 +01:00
PhpMadman
c6676197e5
// better syntax
2013-11-07 14:57:13 +01:00
PhpMadman
0a31ab8202
added check for empty value
2013-11-07 14:51:05 +01:00
PhpMadman
2f1a82628c
// Fixes "Notice: Undefined index: nb_results in"
2013-11-07 09:00:00 +01:00
Kevin Granger
866e7f831b
// fixs highlight search
2013-11-06 19:26:22 +01:00
Kevin Granger
93717e910b
// Repairs sake of performance on tables with many lines.
2013-11-06 18:15:17 +01:00
Jerome Nadaud
7895f8643e
// Fix missing page header in combinations generator
2013-11-06 14:42:56 +01:00
gRoussac
1fb8ef823d
[-] BO : Fix bug #PSCFV-10937, bad escaping for var product_prices in prices.tpl
2013-11-06 11:50:52 +01:00
PhpMadman
eac7fbb694
[-] BO : Cart was not using order reference, corrected syntax
2013-11-06 11:06:46 +01:00
PhpMadman
7226f33f90
[-] BO : Cart was not using order reference
2013-11-05 20:42:57 +01:00
Kevin Granger
5ec5215919
// UI modules fixs
2013-11-05 18:17:39 +01:00
Vincent Augagneur
37e0556c36
//fixed carrier logo upload
2013-11-05 18:12:53 +01:00
Vincent Augagneur
657c8f415a
//small css fix
2013-11-05 17:01:38 +01:00
Damien Metzger
161c701ecf
// Groups review
2013-11-05 16:30:34 +01:00
Damien Metzger
0e4a900d3d
// Fixed group display
2013-11-05 16:13:52 +01:00
Jerome Nadaud
de8bd97831
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 19:50:48 +01:00
Jerome Nadaud
cf44f8d0b4
// Uploader helper small fix
2013-11-04 19:50:04 +01:00
Damien Metzger
8dc29b20f0
// Code cleaning and dashgoals improvements (part 1 - not finished yet)
2013-11-04 18:52:27 +01:00
Jerome Nadaud
fa68e015b3
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 18:34:51 +01:00
Jerome Nadaud
bf2d54e286
// Add new uploader helper to blockcategories
2013-11-04 18:32:59 +01:00
Jerome Nadaud
d78a268730
// Uploader helper part 2
2013-11-04 18:31:43 +01:00
Jerome Nadaud
5af2ef38a1
// Fix Tagify javascript error
2013-11-04 17:47:27 +01:00
Damien Metzger
ac1f142f23
// Moved default_language
2013-11-04 17:08:17 +01:00
Damien Metzger
e8c0195ee9
// small fix merge
2013-11-04 17:04:09 +01:00
gRoussac
c44b1d617c
[-] BO : Could not change image position
2013-11-04 16:59:03 +01:00
Kevin Granger
f3fa65f9be
// removed admin-ie.css
2013-11-04 16:58:27 +01:00
Kevin Granger
48025838df
// fixs referrers
2013-11-04 16:08:38 +01:00
Kevin Granger
d0c6d86eb9
// fixs for merge
2013-11-04 15:56:24 +01:00
Damien Metzger
f7d346ba99
// Added more results link at the end of the BO search
2013-11-04 15:03:48 +01:00
Damien Metzger
27273334e3
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:47:16 +01:00
Damien Metzger
e7e4376307
// Changed "gender image" to social title in the customer (BO)
2013-11-04 14:45:36 +01:00
Kevin Granger
889a2006ec
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/customer_threads/message.tpl
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/favorites.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/associations.tpl
admin-dev/themes/default/template/controllers/products/combinations.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
classes/ProductSale.php
classes/helper/HelperList.php
controllers/admin/AdminCmsController.php
controllers/admin/AdminCustomersController.php
controllers/admin/AdminMetaController.php
controllers/admin/AdminModulesController.php
controllers/admin/AdminPerformanceController.php
controllers/admin/AdminProductsController.php
controllers/front/ParentOrderController.php
install-dev/theme/views/welcome.phtml
modules/blocknewproducts/blocknewproducts.php
modules/blocktopmenu/blocktopmenu.php
modules/importerosc/importerosc.php
modules/mailalerts/mailalerts.php
modules/shopimporter/shopimporter.php
modules/statsstock/statsstock.php
themes/default/css/product_list.css
2013-11-04 14:43:01 +01:00
Damien Metzger
d93ea846a9
// Code cleaning and small fixes
2013-11-04 14:29:31 +01:00
Damien Metzger
178cd7362d
// admin search code cleaning
2013-11-04 13:57:27 +01:00
Kevin Granger