gRoussac
7f02c8ca58
[-] WS: Fix bug #PSCFV-10970 use configuration for uploaded images quality
2013-11-15 18:50:28 +01:00
gRoussac
bfed3532bf
[*] BO : AdminPerformances Hide warnings message when not necessary
2013-11-15 16:12:07 +01:00
gRoussac
2962141d51
[-] BO : Fix warning when no memcached servers
2013-11-15 15:39:00 +01:00
gRoussac
73bf2a7db1
[-] BO : Fix #PSCFV-11016 typo
2013-11-15 15:16:02 +01:00
gRoussac
9aa656c9d7
// typo
2013-11-15 15:10:12 +01:00
gRoussac
1140b5e8b5
[*] FO : Fix #PSCFV-8715 add product.attributes in carrier tpl
2013-11-15 15:06:30 +01:00
gRoussac
6a690b255b
[-] BO : Model return html error messagae instead of json while image uploading
2013-11-15 12:20:10 +01:00
gRoussac
152960639f
[-] BO : Product final price can not be hidden on loading tab, report of 6c6c3b240e
2013-11-15 11:36:07 +01:00
Gregory Roussac
448a4c9994
Merge pull request #980 from djfm/development
...
// no line breaks in $this->l()
2013-11-15 02:23:39 -08:00
gRoussac
7526fe4766
// missing trailing semi-column
2013-11-15 11:16:48 +01:00
Jerome Nadaud
50eee795ed
// Add truncate category description preserving html tags
2013-11-15 11:03:06 +01:00
gRoussac
97be96ede8
[-] MO : Missinag closing href
2013-11-15 10:54:50 +01:00
gRoussac
0b47ef1b3b
[-] BO : test on xml string follow up https://github.com/PrestaShop/PrestaShop/pull/690#issuecomment-28542506
2013-11-15 10:51:46 +01:00
fram
ba15d975bc
// no line breaks in $this->l()
2013-11-15 10:44:01 +01:00
gRoussac
47d58ff930
[*] FO : set at least a class to body
2013-11-14 19:03:12 +01:00
gRoussac
d06bf10bbb
[-] FO : Fix bug #PSCFV-10911, doubles in cart rules highlight
2013-11-14 16:35:11 +01:00
gRoussac
d0d234f555
// typo, sorry about this
2013-11-14 15:58:42 +01:00
gRoussac
19d975a0b4
// typo
2013-11-14 14:48:14 +01:00
gRoussac
6393746f04
[-] BO : 406 when mod_security follow up 034e6a7e7f
2013-11-14 11:43:05 +01:00
gRoussac
db99f188a2
[-] BO : AdminImport, execption when creating groups
2013-11-13 18:23:41 +01:00
Gregory Roussac
fe8e349931
Merge pull request #975 from ldecoker/patch-10
...
[-] FO : _PS_THEME_MOBILE_OVERRIDE_DIR_ not defined
2013-11-13 09:14:49 -08:00
ldecoker
3f8b76f78c
[-][FO] _PS_THEME_MOBILE_OVERRIDE_DIR_ not defined
...
When there is no mobile theme provided with the current theme, the variable _PS_THEME_MOBILE_OVERRIDE_DIR_ is not defined. We so get the following error in apache logs:
"PHP Notice: Use of undefined constant _PS_THEME_MOBILE_OVERRIDE_DIR_ - assumed '_PS_THEME_MOBILE_OVERRIDE_DIR_' in FrontController.php"
2013-11-13 18:12:59 +01:00
gRoussac
947f9bb21c
// small isset in productcomments
2013-11-13 16:39:33 +01:00
Rémi Gaillard
83400c691c
Merge pull request #973 from djfm/development
...
//translations
2013-11-13 06:34:38 -08:00
Rémi Gaillard
f4601d9680
// default form language
2013-11-13 15:37:58 +01:00
fram
28e1a94bb6
// instead instead of insted
2013-11-13 15:10:06 +01:00
fram
ad6367f2bf
// updated native translations
2013-11-13 15:06:47 +01:00
gRoussac
5a8c335d78
[-] FO : Bad value for back when controller name is sent
2013-11-13 12:30:39 +01:00
gRoussac
4479db88a0
[-) PDF : nowrap on several product prices
2013-11-13 11:52:10 +01:00
Francois Gaillard
339c954cb3
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-13 11:24:51 +01:00
Jerome Nadaud
c4837e65ec
[-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination
2013-11-13 11:24:25 +01:00
Jerome Nadaud
2117c89352
[-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination
2013-11-13 11:04:13 +01:00
Jerome Nadaud
9f10a851e5
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-13 10:58:01 +01:00
Gregory Roussac
66a9ee03fc
Merge pull request #971 from studiokiwik/sk-ps15x-008
...
[-] FO : fix contact-form id_order input when customer is not logged
2013-11-13 01:42:00 -08:00
gRoussac
c69688cc11
[-] BO : Fix bug #PSCFV-10990 bad version comparison for ps_versions_compliancy
2013-11-13 10:14:21 +01:00
Mikael Blotin
26d1ad0668
[-] FO : fix contact-form id_order input when customer is not logged
2013-11-13 10:12:31 +01:00
Jerome Nadaud
6a99b84452
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-13 10:02:28 +01:00
gRoussac
6ddf220aee
[-] Fo : Call Gmaps on https if required
2013-11-12 21:16:09 +01:00
gRoussac
9328a3c473
// forgot to commit 036e2362c9
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
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
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
