Rémi Gaillard
618aa24f74
Merge pull request #945 from Javsmile/patch-2
...
// Update productcomments.php
2013-11-18 06:30:59 -08:00
fram
0889ab4eec
// fixed typo in Russian installer
2013-11-18 15:30:05 +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
Rémi Gaillard
4c51570b34
Merge pull request #991 from TMMeilleur/bootstrap
...
// fixed add to wishlist/compare buttons and added product review
2013-11-18 06:22:43 -08:00
Kevin Granger
4f7f8535b5
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-18 15:13:11 +01:00
Kevin Granger
369ac0f664
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/modules/configure.tpl
2013-11-18 15:13:04 +01:00
gRoussac
6633efd27d
[-] BO : Fix bug #PNM-1594, selected value error in helper list
2013-11-18 15:11:49 +01:00
Jerome Nadaud
c4dab5f5a6
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-18 15:04:44 +01:00
Jerome Nadaud
40204ba458
// Live configurator toolbox part 2
2013-11-18 15:04:10 +01:00
gRoussac
8d627aa522
[-] MO : Referralprogram Prevent Exception when badly configured
2013-11-18 14:58:17 +01:00
Damien Metzger
adcc4f2c74
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-18 14:54:47 +01:00
Damien Metzger
b4385c346f
[+] Installer : new demo products (part 1)
2013-11-18 14:53:39 +01:00
TMMeilleur
95b9710eda
fixed add to wishlist/compare buttons and added product review
2013-11-18 15:52:39 +02:00
Jerome Nadaud
2ba5dc18fd
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
modules/themeconfigurator/themeconfigurator.php
2013-11-18 14:49:27 +01:00
Jerome Nadaud and gRoussac
bcc851c98c
// Update image fix
2013-11-18 14:44:23 +01:00
Jerome Nadaud
46dc93fd7e
// Adding update button on to page header toolbar on module
2013-11-18 14:41:49 +01:00
Jerome Nadaud
867eef79cc
// Add live configurator toolbox - Part 1
2013-11-18 14:39:46 +01:00
gRoussac
dbc08d779c
// typo, sorry about this
2013-11-18 14:35:39 +01:00
Jerome Nadaud
239604b70c
// Missing isset on cols and rows
2013-11-18 14:35:15 +01:00
gRoussac
22a9548f83
[-] FO : Fix bug #PSCFV-11043, bad cache id from module template
2013-11-18 14:32:34 +01:00
Jerome Nadaud
ebad56a800
// Fix small error
2013-11-18 14:29:32 +01:00
gRoussac
4771746959
[-) FO : Fix bug #PSCFV-10926, trailing question mark in pagination url
2013-11-18 12:26:08 +01:00
Damien Metzger
89c65536d7
// Added missing configuration vars in the installer
2013-11-18 12:23:50 +01:00
Damien Metzger
5ef4b8eddc
// Installer optimization
2013-11-18 12:12:14 +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
Jérôme Nadaud
8166bb662c
Merge pull request #984 from soware/development
...
Update form.tpl
2013-11-18 01:01:00 -08:00
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
Rémi Gaillard
dlage