Damien Metzger
6974a88b59
Merge pull request #782 from 202-ecommerce/development
...
[*] FO : Added new Maintenance Hook
2013-10-02 06:07:42 -07:00
Rémi Gaillard
f4cadbdfd6
Merge pull request #770 from urecheatu007/development
...
[-] LO: updated localization pack for Romania / romanian - added states
2013-10-02 05:47:17 -07:00
thoma202
1ccc25f56c
Merge branch 'development' of github.com:202-ecommerce/PrestaShop into development
2013-10-02 14:38:44 +02:00
thoma202
eb7655e318
[+] Added hook in maintenance page
2013-10-02 11:58:35 +02:00
Rémi Gaillard
99f325dc3c
// validation of carrierwizard
2013-10-02 11:24:08 +02:00
gRoussac
f4c2bacea3
[-] CORE : Cart rules not ordered by priority for PaymentModule
2013-10-01 16:17:23 +02:00
gRoussac
626ccf0985
[-] CORE : Partial fix bug #PSCFV-10534 bad total_products_wt calculated without other cart rules
2013-10-01 14:46:40 +02:00
Gregory Roussac
a76a7273ea
Merge pull request #776 from kpodemski/patch-5
...
[*] FO: We let style selected category in CSS on blockcategories
2013-10-01 03:04:54 -07:00
Krystian Podemski
9e4b6c020f
[*] FO: We let style selected category in CSS on blockcategories
...
It's good to have this by default.
2013-10-01 12:02:19 +02:00
gRoussac
f30bc80485
[-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop
2013-10-01 10:48:17 +02:00
Jerome Nadaud
340f6cebe4
[-] FO : FixBug #PSCFV-10542 - Category description view problem
2013-10-01 10:20:33 +02:00
Jerome Nadaud
452e07ab0b
[-] BO : FixBug #PSCFV-10477 - Error message not shown on delete module without permissions
2013-09-30 19:26:49 +02:00
Jerome Nadaud
1b9472cc37
[-] BO : FixBug #PSCFV-10291 - Remove temporary image on install
2013-09-30 19:01:11 +02:00
Jerome Nadaud
b7ff8d634a
[-] BO : FixBug #PSCFV-10317 - Attributes value not shown on features sorted by position.
2013-09-30 17:23:12 +02:00
Jerome Nadaud
f983e0eaf1
[-] BO : FixBug #PSCFV-10380 - Missing lang file existence verification.
2013-09-30 16:25:58 +02:00
Jerome Nadaud
6bb1fa6a4d
// Missing '?' on regex
2013-09-30 14:59:27 +02:00
Jerome Nadaud
05eafdb14f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-09-30 14:57:46 +02:00
Jerome Nadaud
cfc41ec4ef
[+] BO : Add remove module override on constant - PSCFV-10430
2013-09-30 14:57:30 +02:00
Gregory Roussac
6822373378
Merge pull request #772 from codeurWeb/patch-5
...
[*] FO : add GET pre-selection of id_contact in contact-form.tpl
2013-09-30 05:56:09 -07:00
Julien
dd5cd33bb4
[-] BO : fix pre-selection of id_contact in contact-form.tpl
2013-09-30 14:38:06 +02:00
Cosmin Hutanu
7eddca6d15
update localization pack for romania - added states
2013-09-30 13:06:19 +03:00
Cosmin Hutanu
f9ad0d1b79
Merge pull request #3 from PrestaShop/development
...
update from prestashop/development
2013-09-30 02:47:52 -07:00
Jerome Nadaud
e040c096d1
[-] BO : Remove customers group view list link
2013-09-30 10:34:54 +02:00
Gregory Roussac
3e85622972
Merge pull request #767 from enumag/patch-3
...
[-] BO : Fix #PSCFV-10520 id_attribute_group can not be null
2013-09-30 00:47:12 -07:00
Jáchym Toušek
5ebc2e5e91
[-] BO : Fix #PSCFV-10520
2013-09-29 14:43:14 +02:00
Jerome Nadaud
c2b9ff40ef
[-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list
2013-09-27 19:20:46 +02:00
Gregory Roussac
40617c0a81
Merge pull request #761 from nuzelac/patch-1
...
[-] BO : fix multilingual field validity in AdminProductsController
2013-09-27 09:50:03 -07:00
Nino Uzelac
ca01b58262
fix multilingual field validity in AdminProductsController
2013-09-27 18:22:07 +02:00
Fabio Chelly
9d94337c9b
[-] MO sendtoafriend: The method used to check all required input fields could lead to errors
2013-09-27 16:08:00 +02:00
Jerome Nadaud
6449ecfb32
[-] BO : Force invoice footer text to 1 ligne
2013-09-27 14:41:50 +02:00
Fabio Chelly
345d4cdbcf
[-] MO productcomments: prevents guests to add comments when guest comment is disabled in backoffice
2013-09-27 11:27:58 +02:00
Gregory Roussac
19fb32545d
Merge pull request #749 from enumag/patch-1
...
[-] FO : Fixed products without images
2013-09-27 00:56:46 -07:00
Jáchym Toušek
30367e6427
[-] FO : Fixed products without images
2013-09-26 22:21:18 +02:00
Cosmin Hutanu
81ec2822ec
Merge pull request #2 from PrestaShop/development
...
update from prestashop/development
2013-09-26 05:52:17 -07:00
Rémi Gaillard
252ab56d75
// error message in double
2013-09-26 13:47:42 +02:00
Gregory Roussac
37f928ade9
Merge pull request #746 from Mainmich/patch-1
...
[-] MO : Blocklayered Fix pagination incompatibility
2013-09-25 09:45:51 -07:00
Mainmich
a6e67b078e
Fix pagination incompatibility
...
Javascript function paginateButton does not work with "p" GET parameter in first position, regex only takes &p and not ?p.
2013-09-25 18:33:58 +02:00
Gregory Roussac
5245038ea1
Merge pull request #745 from djfm/localization_packs
...
[*] TR : Localization packs
2013-09-25 06:58:59 -07:00
djfm
91d495a4a8
[*] LO : Added states to Japanese localization pack
2013-09-25 13:31:45 +00:00
djfm
81e66233d8
[*] LO : Updated many localization packs
2013-09-25 13:11:52 +00:00
Fabio Chelly
1800c6589c
Merge remote-tracking branch 'origin/development' into development
2013-09-25 14:43:42 +02:00
Fabio Chelly
bdd84771b7
[-] MO productcomments and loyalty: loyalty doesn't disconnect current user anymore
2013-09-25 14:43:30 +02:00
Gregory Roussac
931d240ca1
Merge pull request #743 from dlage/modules_update
...
[*] BO : Show modules update button even if module is not installed but not notices
2013-09-24 11:33:48 -07:00
dlage
81ca3ac1f9
BO: Modules - show update button even if module is not installed but don't
...
warn for modules with updates available but not installed.
2013-09-24 17:42:43 +01:00
Rémi Gaillard
5e7dbea970
//
2013-09-24 17:22:50 +02:00
Rémi Gaillard
beb0a74135
// use ObjectModel::validateField on validaterules
2013-09-24 17:12:28 +02:00
gRoussac
3d477c62eb
// remove notice
2013-09-24 16:03:39 +02:00
Gregory Roussac
4c399875d9
Merge pull request #737 from codeurWeb/patch-3
...
[-] BO : fix postProcess override on AdminImportController
2013-09-24 01:54:18 -07:00
Gregory Roussac
92b987c0f8
Merge pull request #736 from codeurWeb/patch-2
...
[-] BO : fix ovverride of constructor when PS_ADVANCED_STOCK_MANAGEMENT is off
2013-09-24 01:40:16 -07:00
Julien
6acebca8fa
[-] BO : fix postProcess override on AdminImportController
...
When we override the constucteur of AdminImport to add an import type and PS_ADVANCED_STOCK_MANAGEMENT is off, switch index is undefined for "Supply Orders" and "Supply Order Details".
Default case of switch is never used.
2013-09-23 21:04:55 +02:00