Jerome Nadaud
113f8d4efb
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-11-18 09:55:37 +01:00
Jerome Nadaud
11296fe464
// Small Fix in truncateString function
2013-11-18 09:55:21 +01:00
Gregory Roussac
017ef4860e
Merge pull request #987 from davyrolink/fixed_toolbar_tpl
...
[*] BO : multiple toolbars save button
2013-11-18 00:54:48 -08: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
gRoussac
7e841c4448
[-] FO : Missing sup for DNI field
2013-11-17 22:36:51 +01:00
gRoussac
1cbc765a8f
[-] IN : Bad flag in add_module_to_hook
2013-11-17 20:42:29 +01:00
rGaillard
68c8e9da57
// move to themeconfigurator
2013-11-16 19:24:03 +01:00
dlage
692643d7d6
[-] Project : missing ui.menu in jquery_ui_dependencies.
2013-11-16 17:42:54 +00:00
Davy Rolink
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
Jérôme Nadaud
de9e6d72c8
// Typo
2013-11-16 08:04:59 +01:00
Jérôme Nadaud
3a58cb2a91
Merge pull request #983 from PrestaEdit/patch-60
...
//typo
2013-11-15 22:13:22 -08:00
soware
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
PrestaEdit
9b787c454f
//typo
2013-11-16 01:21:56 +01:00
rGaillard
8c3eb9b9a4
// typo
2013-11-15 21:03:17 +01:00
gRoussac
7f02c8ca58
[-] WS: Fix bug #PSCFV-10970 use configuration for uploaded images quality
2013-11-15 18:50:28 +01:00
Damien Metzger
b62952accf
[*] BO : Added simulation mode to the dashboard
2013-11-15 18:07:23 +01:00
Rémi Gaillard
4bd7164507
Merge pull request #982 from TMMeilleur/bootstrap
...
// added responsive rich menu and small fix in blockbanner
2013-11-15 08:47:58 -08:00
TMMeilleur
a5d9daff13
added responsive rich menu and small fix in blockbanner
2013-11-15 18:40:17 +02:00
Jerome Nadaud
5106a5f1e3
// Fix products controller title
2013-11-15 17:25:12 +01:00
Jerome Nadaud
96def5033f
// typo
2013-11-15 17:19:12 +01:00
Jerome Nadaud
8cd1d623e5
// Fix error if default blockbanner image is missing
2013-11-15 17:13:50 +01:00
Jerome Nadaud
19cfa443d2
// fix dashgoals configuration fields size
2013-11-15 17:04:55 +01:00
Jerome Nadaud
5fb4ac5044
// Fix missing last actions button in tracking controller list
2013-11-15 16:25:31 +01:00
gRoussac
bfed3532bf
[*] BO : AdminPerformances Hide warnings message when not necessary
2013-11-15 16:12:07 +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
ece4331622
//Fix addsharethis error
2013-11-15 15:38:51 +01:00
Jerome Nadaud
3af7a59caa
// Add version number to addsharethis
2013-11-15 15:32:52 +01:00
Jerome Nadaud
b5d84a72e0
// AddShareThis fix
2013-11-15 15:31:01 +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
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
9fa2299c6b
// Open prestashop.com link in new window
2013-11-15 11:56:23 +01:00
Jerome Nadaud
d7de507f42
// Product comments
2013-11-15 11:49:40 +01:00
gRoussac
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
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
Jerome Nadaud
a66d2e1ab6
// Fix form name
2013-11-15 09:18:41 +01:00
Jerome Nadaud
c2d956ec7d
// Modif after specs change
2013-11-15 08:58:30 +01:00
Jerome Nadaud
29f65da5ca
// Add wish list button to blockwishlist module
2013-11-14 19:54:28 +01:00
Rémi Gaillard
7fcbf8aa7c
Merge pull request #977 from TMMeilleur/bootstrap
...
//updates and fixes 14.11.2013
2013-11-14 10:28:06 -08:00
Jerome Nadaud
80957666cf
// Hide collapse and expand button when not necessary
2013-11-14 19:21:31 +01:00
gRoussac
47d58ff930
[*] FO : set at least a class to body
2013-11-14 19:03:12 +01:00
Jerome Nadaud
dlage