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
6633efd27d
[-] BO : Fix bug #PNM-1594, selected value error in helper list
2013-11-18 15:11:49 +01:00
8166bb662c
Merge pull request #984 from soware/development
...
Update form.tpl
2013-11-18 01:01:00 -08: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
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
7526fe4766
// missing trailing semi-column
2013-11-15 11:16:48 +01:00
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
5e4382eb08
[-] BO : Fix bug #PSCFV-10982 reduction group truncated
2013-11-12 17:55:07 +01:00
19da345531
[-] BO : Could not check all modules after ajax call
2013-11-10 21:51:14 +01:00
7eb70486e0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-08 15:54:28 +01:00
ebc3dfee62
[-] BO : Fix css bug #PSCFV-10899, fixed fix-toolbar z-index
2013-11-08 15:54:13 +01:00
c7f1fcb49a
kb was not translatable
2013-11-08 15:33:49 +01:00
1fb8ef823d
[-] BO : Fix bug #PSCFV-10937, bad escaping for var product_prices in prices.tpl
2013-11-06 11:50:52 +01:00
eac7fbb694
[-] BO : Cart was not using order reference, corrected syntax
2013-11-06 11:06:46 +01:00
7226f33f90
[-] BO : Cart was not using order reference
2013-11-05 20:42:57 +01:00
c44b1d617c
[-] BO : Could not change image position
2013-11-04 16:59:03 +01:00
d17515a728
// don't format currency on input
2013-10-31 10:22:38 +01:00
8547f663d1
[-] BO : AdminImport withdraw separator changed in js
2013-10-30 18:46:02 +01:00
78af47e2d3
[-] BO : tagify call twice if field is not translatable
2013-10-29 23:18:34 +01:00
6d5ca9969e
// js error
2013-10-29 17:56:29 +01:00
75cde08776
// update conf message in AdminImport
2013-10-29 16:16:55 +01:00
b605f33359
[-] BO : FixBug #PSCFV-10866 - Tagify system not working
2013-10-29 12:07:30 +01:00
580e201c48
[-] BO : FixBug #PSCFV-9319 - display only valid order id
2013-10-29 11:38:48 +01:00
07222be5dd
// demo mode on ajaxfilemanager
2013-10-29 10:53:00 +01:00
2b67d7072c
// type of logger field
2013-10-29 10:18:29 +01:00
0aca1d4a67
[*] BO : AdminProducts find smallest images
2013-10-29 08:47:41 +01:00
4103339f53
[-] BO : AdminImport, fix bug from https://github.com/indesign47/PrestaShop/commit/84454bbc1c7a315e232245c5e43b300b8f153473#commitcomment-4418502
2013-10-28 11:21:25 +01:00
2dbaa5f73b
[-] BO : Fix bug #10689 , could not set image legend in back office
2013-10-27 22:49:25 +01:00
6f57093f50
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
2013-10-24 18:36:36 +02:00
759fe2f671
// norms
2013-10-24 18:09:21 +02:00
0416aca547
Merge pull request #889 from PhpMadman/PSCFV-10728
...
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
2013-10-24 09:06:43 -07:00
c516035e0e
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
2013-10-24 17:19:28 +02:00
84454bbc1c
[*] BO : AdminImport add img manufacturers-suppliers
2013-10-24 16:16:29 +02:00
971722a13f
// note updated by ajax in admincustomers should be url encoded
2013-10-24 11:56:50 +02:00
5bb4d48ddd
Merge pull request #870 from djfm/development
...
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-22 10:17:11 -07:00
2aa52356ad
[-] BO : Fix bug #PSCFV-10607 one upload name
2013-10-22 09:39:59 +02:00
c1ecf43be8
[-] MO : Fix bug #PSCFV-10775, could not upload .jpeg in TinyMCE
2013-10-21 17:39:20 +02:00
16ffbd8ee5
// norms
2013-10-21 16:46:22 +02:00
61884ec223
// norms
2013-10-21 16:31:56 +02:00
15cd0b9fbc
[-] BO : Report of https://github.com/PrestaShop/PrestaShop/commit/fd86a29c5c369ec5da0f91bbe97c584a00d02d0d
2013-10-21 12:21:49 +02:00
6965bb29c1
[*] BO : Adding a title tag to display the module name on hover like PS 1.4
2013-10-18 18:20:15 +02:00
f1ea9ba5b4
[-] BO : Fix bug #PSCFV-10709 rename root category with slashes in it
2013-10-17 10:53:20 +02:00
dec9ef40a8
Merge pull request #841 from indesign47/patch-10
...
[+] BO : AdminImport add entity Alias
2013-10-15 01:03:33 -07:00
1358c696cd
[-] BO : Fix #PSCFV-10678 warning in chrome
2013-10-14 11:37:15 +02:00
5e407db21e
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
2013-10-14 09:30:45 +00:00
4f9191fe0c
Update form.tpl
2013-10-12 11:45:07 +02:00
246340b78c
[*] BO Module search: Enter key is now disabled in quick search field (field is correctly aligned)
2013-10-09 18:33:41 +02:00
75ffa8c4f8
[*] BO Module search: Enter key is now disabled in quick search field
2013-10-09 18:30:09 +02:00
Jerome Nadaud