gRoussac
9328a3c473
// forgot to commit https://github.com/PrestaShop/PrestaShop/commit/036e2362c97ca00e9066076af1c45fc8f9946d56
2013-11-12 19:17:54 +01:00
gRoussac
c8dfe1c174
[-] FO : Wordwrap on prices in history
2013-11-12 19:17:12 +01:00
Rémi Gaillard
75df12dd94
[-] Core: Group::getCurrent() return the default customer group of the shop if default customer group is not associated to shop
2013-11-12 18:49:52 +01:00
Gregory Roussac
6d7e2055ce
Merge pull request #968 from ccauw/patch-12
...
[*] BO : add class on TD in standard List
2013-11-12 09:38:03 -08:00
gRoussac
4d327a537f
[*] FO : addTextFieldToProduct without Line feed, follow up https://github.com/PrestaShop/PrestaShop/pull/962#issuecomment-28294571
2013-11-12 18:28:42 +01:00
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
Vincent Augagneur
52abf62ae1
//dashactivity config
2013-11-12 17:33:54 +01:00
gRoussac
036e2362c9
[+] CORE : Fixed cache_id
2013-11-12 17:09:38 +01:00
Fabio Chelly
fc193d5c8b
Merge remote-tracking branch 'origin/development' into development
2013-11-12 16:36:19 +01:00
Rémi Gaillard
75e6a03591
// small fix
2013-11-12 16:38:34 +01:00
Fabio Chelly
dd05692400
[-] FO : Fixed errors when calculating most selled products from footer link
2013-11-12 16:36:07 +01:00
Rémi Gaillard
b5eb7c5c28
// typo
2013-11-12 16:25:13 +01:00
gRoussac
f0f3679cbd
[*] FO : https on TOS in fancybox, follow up https://github.com/PrestaShop/PrestaShop/pull/956
2013-11-12 15:56:04 +01:00
Rémi Gaillard
175da3ecf6
Merge pull request #965 from djfm/IETF
...
[*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'is...
2013-11-12 06:05:10 -08:00
fram
743c4f4607
[*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'iso' code, allows to distinguish between chinese variants etc.
2013-11-12 14:59:36 +01:00
Kevin Granger
4e06b1fdd5
// update Bootstrap 3.0.2 + fix tree header
2013-11-12 14:50:19 +01:00
Vincent Augagneur
c6e34ee229
//dashproducts added section in tpl
2013-11-12 14:43:08 +01:00
Vincent Augagneur
249bd5437d
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-12 14:41:11 +01:00
Vincent Augagneur
cf9da09f98
//remove unused smarty variable
2013-11-12 14:40:58 +01:00
gRoussac
40abef8aac
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-12 12:32:37 +01:00
Rémi Gaillard
8be339463d
// small fix
2013-11-12 12:36:51 +01:00
gRoussac
f0f630fb50
[-] FO : #PSCFV-10978 firstname displayed instead of lastname in invoice address
2013-11-12 12:32:21 +01:00
gRoussac
3f42a381a4
[*] FO : Redirect to address.tpl when !Address::isCountryActiveById
2013-11-12 12:12:19 +01:00
Jerome Nadaud
c7fff6b20d
// Change edit title on employees controller
2013-11-12 12:05:00 +01:00
Jerome Nadaud
d6df601d0e
// Preferences identrifer names
2013-11-12 11:55:54 +01:00
Jerome Nadaud
0430d09753
// Better php def for Page header title edit and view
2013-11-12 11:36:26 +01:00
Jerome Nadaud
fe387fa8ed
// Set Identifier name for search engine
2013-11-12 11:30:26 +01:00
Jerome Nadaud
ec37efdf8b
// Add identifier name
2013-11-12 11:30:01 +01:00
Jerome Nadaud
94817a9371
// ooops
2013-11-12 11:16:31 +01:00
Jerome Nadaud
db0e1e41a9
// Small Fix
2013-11-12 11:10:55 +01:00
Kevin Granger
3f83edc7e1
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-12 11:07:44 +01:00
Kevin Granger
4a6346b295
// adjustment on switch
2013-11-12 11:07:30 +01:00
Jerome Nadaud
41196f3c5f
// General modification for view and edit title
2013-11-12 11:06:20 +01:00
Gregory Roussac
0e1898be09
Merge pull request #963 from djfm/sprintf
...
// do not use sprintf in installer when it is useless
2013-11-12 01:45:39 -08:00
Jerome Nadaud
44d1ed0982
// Add category name to page header title
2013-11-12 10:45:17 +01:00
Kevin Granger
2a982e96f1
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-12 10:44:08 +01:00
Kevin Granger
5ca23d44a6
// label with tooltip
2013-11-12 10:43:52 +01:00
gRoussac
c1969028f2
[-] FO : Customized meesage with carriage return follow up #962
2013-11-12 10:41:19 +01:00
Jerome Nadaud
3931914203
// Add Modernizr and Modernizr-loads check and loading for unsuported browsers
2013-11-12 09:54:20 +01:00
Gregory Roussac
cd83ec93c7
Merge pull request #961 from joseantgv/patch-4
...
[-] MO : Whishlist, innerhtml in html jquery
2013-11-12 00:42:04 -08:00
fram
ab730dc3da
// do not use sprintf when it is useless
2013-11-12 09:21:05 +01:00
joseantgv
7523828a7a
Update ajax-wishlist.js
...
innerHtml can not execute javascript from "data". If someone modify php files returned from jquery function and includes a script, it's not executed.
2013-11-11 16:58:52 +01:00
gRoussac
e2d8a33a81
[*] FO : Cache on getDiscountsCustomer, follow up https://github.com/PrestaShop/PrestaShop/pull/960
2013-11-11 14:02:11 +01:00
gRoussac
a7869a1f06
[*] CORE : Remove duplicate SQL queries
2013-11-11 13:41:23 +01:00
Alexey Svistunov
97d14e5b08
Added changes from commit 88aa49e TMMeilleur
2013-11-11 11:30:24 +02:00
gRoussac
de404706d9
[*] CORE : Profiling hide non doubles
2013-11-11 02:09:50 +01:00
gRoussac
3f9338e13d
[*] CORE : Cache store for isAssociatedToShop::isAssociatedToShop
2013-11-11 01:59:10 +01:00
gRoussac
38da826671
[-] FO : getTaxCalculator bad cache key again // sorry about that
2013-11-11 01:37:20 +01:00
gRoussac