2129aebac0
Update CONTRIBUTING.md
2013-11-25 14:17:49 +01:00
2eb620267c
Merge pull request #835 from axometeam/patch-20
...
// Fixed potential issue with textarea
2013-11-25 02:35:23 -08:00
a932ba512a
Merge pull request #846 from sebastienhouzet/patch-2
...
[-] MO : Fix add truncate tag in pscleaner
2013-11-25 02:13:06 -08:00
d14fcf169a
[-] IN : bad reset on vars in migrate_orders
2013-11-21 17:10:19 +01:00
d6e52bdecb
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-21 14:20:00 +01:00
3ab28374e6
[-] BO : Remove warning with open_basdir on module list
2013-11-21 14:17:55 +01:00
5f47526ed2
[-] FO : Fixed bug #PSCFV-11076
2013-11-21 12:13:30 +01:00
033bf745cd
Merge pull request #1000 from studiokiwik/sk-ps15x-011
...
"---<br />" string is now removed correctly from the end of customization data text
2013-11-21 00:14:28 -08:00
6d0de6e29e
Merge pull request #1003 from priyank/patch-1
...
[-] FO : Homefeatured adding a position order by clause.
2013-11-20 07:29:19 -08:00
0ff7163cba
Adding a position order by clause.
...
Adding a position order by clause. This way you can manage how the featured products will display on home page. You can manage the order from the PrestaShop backend, and thus you have full control on the display in the frontend.
2013-11-20 20:56:35 +05:30
914f613e7b
[-] FO : Fix bug #PSCFV-11052 no carrier fess whne tax display to false
2013-11-20 15:32:33 +01:00
5ef392aaeb
[-] FO : Fix #PSCFV-11069 remove unused file
2013-11-20 14:44:56 +01:00
0410378bd3
"---<br />" string is now removed correctly from the end of customization data text
2013-11-20 13:30:47 +01:00
1508a8a5d7
"---<br />" string is now removed correctly from the end of customization data text
2013-11-20 11:31:02 +01:00
33b8703d24
// Changelog 1.5.6.1
2013-11-20 09:43:06 +01:00
e02b5d5c11
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
...
Conflicts:
admin-dev/themes/default/template/helpers/list/list_header.tpl
2013-11-18 18:39:25 +01:00
6be883217e
[-] BO : FixBug #PNM-1594 - Double selected option value
2013-11-18 18:36:30 +01:00
10e0205cb8
Merge pull request #992 from djfm/development
...
// fixed typo in Russian installer
2013-11-18 06:40:31 -08:00
4cba2623e5
Merge pull request #926 from djfm/loc_ui
...
//Localization
2013-11-18 06:32:34 -08:00
618aa24f74
Merge pull request #945 from Javsmile/patch-2
...
// Update productcomments.php
2013-11-18 06:30:59 -08:00
0889ab4eec
// fixed typo in Russian installer
2013-11-18 15:30:05 +01:00
6633efd27d
[-] BO : Fix bug #PNM-1594, selected value error in helper list
2013-11-18 15:11:49 +01:00
8d627aa522
[-] MO : Referralprogram Prevent Exception when badly configured
2013-11-18 14:58:17 +01:00
bcc851c98c
// Update image fix
2013-11-18 14:44:23 +01:00
dbc08d779c
// typo, sorry about this
2013-11-18 14:35:39 +01:00
22a9548f83
[-] FO : Fix bug #PSCFV-11043, bad cache id from module template
2013-11-18 14:32:34 +01:00
4771746959
[-) FO : Fix bug #PSCFV-10926, trailing question mark in pagination url
2013-11-18 12:26:08 +01:00
bd241a9c48
[-] BO: product price was changed on changing to advanced stock management #PSCFV-10996
2013-11-18 12:04:09 +01:00
8166bb662c
Merge pull request #984 from soware/development
...
Update form.tpl
2013-11-18 01:01:00 -08:00
113f8d4efb
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-18 09:55:37 +01:00
11296fe464
// Small Fix in truncateString function
2013-11-18 09:55:21 +01:00
017ef4860e
Merge pull request #987 from davyrolink/fixed_toolbar_tpl
...
[*] BO : multiple toolbars save button
2013-11-18 00:54:48 -08:00
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
cef406aef2
[*] FO : DNI can be not required
2013-11-17 23:35:56 +01:00
7e841c4448
[-] FO : Missing sup for DNI field
2013-11-17 22:36:51 +01:00
1cbc765a8f
[-] IN : Bad flag in add_module_to_hook
2013-11-17 20:42:29 +01:00
dlage
692643d7d6
[-] Project : missing ui.menu in jquery_ui_dependencies.
2013-11-16 17:42:54 +00:00
cd58c0968b
Fixed admin toolbar save button javascript actions, problem occurred when there were multiple toolbars on one page
2013-11-16 14:59:37 +01:00
e5f0bcb916
Update form.tpl
...
I removed the line 109 because the price tab problem and because this line is redundant. The first show (line 95) always is executed.
If the price is saved twice, the second the div #product-tab-content-wait never is hided and show the loading forever.
It is because the line 109 show this tab again, in the sequence: show (line 95), hide (line 213), show (line 109).
This happening just for price tab.
2013-11-16 00:37:47 -02:00
7f02c8ca58
[-] WS: Fix bug #PSCFV-10970 use configuration for uploaded images quality
2013-11-15 18:50:28 +01:00
bfed3532bf
[*] BO : AdminPerformances Hide warnings message when not necessary
2013-11-15 16:12:07 +01:00
2962141d51
[-] BO : Fix warning when no memcached servers
2013-11-15 15:39:00 +01:00
73bf2a7db1
[-] BO : Fix #PSCFV-11016 typo
2013-11-15 15:16:02 +01:00
9aa656c9d7
// typo
2013-11-15 15:10:12 +01:00
1140b5e8b5
[*] FO : Fix #PSCFV-8715 add product.attributes in carrier tpl
2013-11-15 15:06:30 +01:00
6a690b255b
[-] BO : Model return html error messagae instead of json while image uploading
2013-11-15 12:20:10 +01:00
152960639f
[-] BO : Product final price can not be hidden on loading tab, report of https://github.com/PrestaShop/PrestaShop/commit/6c6c3b240ee2249b7f99be1a112905cd0edbee46
2013-11-15 11:36:07 +01:00
448a4c9994
Merge pull request #980 from djfm/development
...
// no line breaks in $this->l()
2013-11-15 02:23:39 -08:00
7526fe4766
// missing trailing semi-column
2013-11-15 11:16:48 +01:00
50eee795ed
// Add truncate category description preserving html tags
2013-11-15 11:03:06 +01:00
Jérôme Nadaud
dlage