 Damien Metzger
|
8d0b1e9602
|
[*] BO : Added combination ean13 in the backend search #PSCFV-10436
|
2013-11-20 16:30:25 +01:00 |
|
|
Quentin Montant
|
0410378bd3
|
"---<br />" string is now removed correctly from the end of customization data text
|
2013-11-20 13:30:47 +01:00 |
|
|
Quentin Montant
|
1508a8a5d7
|
"---<br />" string is now removed correctly from the end of customization data text
|
2013-11-20 11:31:02 +01:00 |
|
|
Kevin Granger
|
3580dc016a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-18 23:46:48 +01:00 |
|
|
Damien Metzger
|
f4560d0899
|
// Install
|
2013-11-18 20:35:42 +01:00 |
|
|
Rémi Gaillard
|
f4194bedd9
|
Merge pull request #978 from StanProg/bootstrap
// FO : Removed unused local variable, tabs added, phpdoc tags
|
2013-11-18 06:27:46 -08:00 |
|
|
TMMeilleur
|
95b9710eda
|
fixed add to wishlist/compare buttons and added product review
|
2013-11-18 15:52:39 +02:00 |
|
|
gRoussac
|
4771746959
|
[-) FO : Fix bug #PSCFV-10926, trailing question mark in pagination url
|
2013-11-18 12:26:08 +01:00 |
|
|
rGaillard
|
bd241a9c48
|
[-] BO: product price was changed on changing to advanced stock management #PSCFV-10996
|
2013-11-18 12:04:09 +01:00 |
|
|
Kevin Granger
|
73ec191fb0
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/modules/configure.tpl
|
2013-11-18 10:23:23 +01:00 |
|
|
Jerome Nadaud
|
11296fe464
|
// Small Fix in truncateString function
|
2013-11-18 09:55:21 +01:00 |
|
|
Gregory Roussac
|
21319ca32c
|
Merge pull request #988 from dlage/fix_jquery_ui_autocomplete
[-] Project : missing ui.menu in jquery_ui_dependencies.
|
2013-11-17 14:44:47 -08:00 |
|
|
gRoussac
|
cef406aef2
|
[*] FO : DNI can be not required
|
2013-11-17 23:35:56 +01:00 |
|
 dlage
|
692643d7d6
|
[-] Project : missing ui.menu in jquery_ui_dependencies.
|
2013-11-16 17:42:54 +00:00 |
|
|
gRoussac
|
7f02c8ca58
|
[-] WS: Fix bug #PSCFV-10970 use configuration for uploaded images quality
|
2013-11-15 18:50:28 +01:00 |
|
|
Jerome Nadaud
|
8d90578cf7
|
// Add anchor to list
|
2013-11-15 16:04:27 +01:00 |
|
|
gRoussac
|
2962141d51
|
[-] BO : Fix warning when no memcached servers
|
2013-11-15 15:39:00 +01:00 |
|
|
Jerome Nadaud
|
44f89053e4
|
// Invoice search fix
|
2013-11-15 15:00:56 +01:00 |
|
|
gRoussac
|
6a690b255b
|
[-] BO : Model return html error messagae instead of json while image uploading
|
2013-11-15 12:20:10 +01:00 |
|
|
Jerome Nadaud
|
50eee795ed
|
// Add truncate category description preserving html tags
|
2013-11-15 11:03:06 +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 |
|
|
Jerome Nadaud
|
80957666cf
|
// Hide collapse and expand button when not necessary
|
2013-11-14 19:21:31 +01:00 |
|
|
Stanislav Yordanov
|
c5b1834870
|
[*] FO : Removed unused local variable, phpdoc return tag added
|
2013-11-14 19:22:39 +02: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 |
|
|
Jerome Nadaud
|
18a2e026ef
|
// Adding more buttons to module configuration
|
2013-11-14 15:49:17 +01:00 |
|
|
Stanislav Yordanov
|
e7e514dc77
|
Removed unused local variable, tab added, phpdoc tags fixed
|
2013-11-14 16:41:08 +02:00 |
|
|
Kevin Granger
|
a0f73d20e5
|
// backward compatibility remix WIP
|
2013-11-13 20:11:22 +01:00 |
|
|
Jerome Nadaud
|
afaeb15b7d
|
// Define default template dir on tree class
|
2013-11-13 20:10:13 +01:00 |
|
|
Francois Gaillard
|
c9a2410c57
|
[-] Classes : AdminController - Changed admin-theme.css position
|
2013-11-13 17:48:21 +01:00 |
|
|
Rémi Gaillard
|
fa3aa8c9d7
|
// strict standard
|
2013-11-13 15:46:06 +01:00 |
|
|
Rémi Gaillard
|
f4601d9680
|
// default form language
|
2013-11-13 15:37:58 +01:00 |
|
|
Rémi Gaillard
|
899dea47a1
|
// oups
|
2013-11-13 15:32:56 +01:00 |
|
|
Rémi Gaillard
|
2fe12b965b
|
[-] Core: add possibility to choose the position of your css files
|
2013-11-13 15:31:29 +01:00 |
|
|
Vincent Augagneur
|
5963871a01
|
//small fix
|
2013-11-13 11:40:13 +01:00 |
|
|
gRoussac
|
c69688cc11
|
[-] BO : Fix bug #PSCFV-10990 bad version comparison for ps_versions_compliancy
|
2013-11-13 10:14:21 +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 |
|
|
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 |
|
|
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
|
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 |
|
|
Rémi Gaillard
|
8be339463d
|
// small fix
|
2013-11-12 12:36:51 +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
|
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 |
|
|
Jerome Nadaud
|
41196f3c5f
|
// General modification for view and edit title
|
2013-11-12 11:06:20 +01:00 |
|