8868271c07
// push changes
2013-09-05 18:37:25 +02:00
73524c7a4c
// update maintenance and email pages
2013-09-05 14:16:06 +02:00
009536d3f4
//small fix on version compare for install module
2013-09-05 10:33:15 +02:00
6e3d24b567
// add push
2013-09-04 19:33:05 +02:00
b4ecaf3ddb
// Carrier Wizard with bootstrap WIP
2013-09-04 15:38:45 +02:00
7d61be252f
[+] BO : Get categories in nested array
2013-09-03 15:27:58 +02:00
d10a339542
//kevin special commit
2013-09-02 14:47:47 +02:00
4a7e68ae05
// Modules list fix
2013-08-28 10:18:43 +02:00
ed0037c435
[+] BO : New page header toolbar
2013-08-27 18:21:27 +02:00
3005ca39f2
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/modules_positions/form.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
admin-dev/themes/default/template/controllers/products/shipping.tpl
admin-dev/themes/default/template/controllers/shipping/content.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
admin-dev/themes/default/template/toolbar.tpl
classes/helper/HelperList.php
controllers/admin/AdminCategoriesController.php
controllers/admin/AdminManufacturersController.php
controllers/admin/AdminModulesPositionsController.php
controllers/admin/AdminPerformanceController.php
controllers/admin/AdminStockInstantStateController.php
css/admin.css
js/admin-products.js
js/admin.js
2013-08-21 09:14:10 +02:00
17be1e7528
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-08-20 16:40:14 +02:00
44655ecdef
// breaking things
2013-08-20 16:38:31 +02:00
00e1b7c0eb
[-] BO : FixBug language in label for
2013-08-20 09:36:00 +02:00
415ca83b62
// Code cleaning
2013-08-19 15:23:43 +02:00
1a81191c09
// Code cleaning
2013-08-19 15:14:05 +02:00
a7f6e91ac0
[-] BO : FixBug #PSCFV-9329 Alias problem in order by
2013-08-19 10:35:43 +02:00
0e353fe655
[-] BO : Fix bug to check filter values
2013-08-13 15:42:00 +02:00
5e2a3e3c13
[+] BO : Modal module list
2013-08-13 15:22:18 +02:00
1af9fdd1b2
[-] BO : Module list new action buttons
2013-08-13 12:28:07 +02:00
2aa4237bb2
[+] BO : Add otf/woff type to htaccess generator
2013-08-13 10:57:06 +02:00
a0d870c4eb
[+] BO : Button action list improvements
2013-08-13 10:10:24 +02:00
ce20d55e77
ProductDownload::getNewFilename() little optimisation
...
Avoid recursion
2013-08-12 04:28:58 +02:00
ecfe61972b
[+] BO : Change action link for button
2013-08-09 16:07:07 +02:00
cbc7b9567a
[-] FO : Do not redirect on 301 when POST request
2013-08-09 10:20:42 +02:00
1c6eb93951
[-] BO : Check if function mb_encode_mimeheader exist in case some user uninstall it
2013-08-07 17:08:01 +02:00
44f7356d44
[-] BO : FixBug message charset problem in mail
2013-08-07 16:40:40 +02:00
bf355e934e
Merge pull request #634 from PhpMadman/RefSort
...
[*] FO : Sort by Product reference
2013-08-06 09:13:06 -07:00
5be8e169f5
// Fixed totally unexplicable behavior
2013-08-06 17:40:49 +02:00
2303677ebf
// Rollback a modification in object model
2013-08-06 16:52:13 +02:00
a1cf8d462f
// Keep remote file retrieval in the right order
2013-08-06 16:42:10 +02:00
6a54f6efd5
[*] BO: Add reference to FrontController
2013-08-06 15:32:30 +02:00
3839dbee9a
/ Add check in object model
2013-08-06 15:06:46 +02:00
81e4a5f635
[*] BO : Do not insert duplicates in poruct_carrier, thanks @edamart
2013-08-06 11:19:34 +02:00
c0bc3bda29
// Bug fix template override & admin templates
2013-08-06 11:13:49 +02:00
1b93d251aa
Merge pull request #630 from rimas-kudelis/development
...
[*] CORE :ProductCore::addSupplierReference() if a reference already exists update it
2013-08-06 01:51:34 -07:00
f557f24df4
// Fixed module cache key (with the country)
2013-08-06 10:41:58 +02:00
83740496de
Update more properties of supplier reference in ProductCore::addSupplierReference() if a reference already exists.
2013-08-06 11:28:42 +03:00
0139e3f877
Update WebserviceRequest.php
...
The deleted method calls $this->resourceConfiguration, which is never initialized in specific web services, so if we use the "display" parameter, the webservice returns an error
2013-08-06 10:22:45 +02:00
5f0ef76731
Merge pull request #626 from davyrolink/upstream
...
[-] CORE : id_address_invoice was not updated, updateAddressId method
2013-08-05 14:13:54 -07:00
f3361fbedf
Bug fix: id_address_invoice was not updated, updateAddressId method of the Cart class
2013-08-05 22:53:54 +02:00
9f13b9f7b1
Merge pull request #474 from madef/master
...
[*] Project : Add paging to Collections
2013-08-05 09:52:16 -07:00
9ca9928c58
[-] CORE : Fix for field validation in ObjectModel::validateFieldsLang() when default lang value not set, thanks @rimas-kudelis
2013-08-05 17:17:22 +02:00
5cd75f23ff
[-] CORE : Cast product price to float instead of int when adding supplier reference, thanks @rimas-kudelis
2013-08-05 17:05:07 +02:00
58b5028147
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-05 16:25:57 +02:00
176c6a8767
[-] Classes : ModuleFrontController updated. Thank you @codeurWeb
2013-08-05 16:25:52 +02:00
48f041f035
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-05 16:12:04 +02:00
b81c021144
[-] BO : FixBug #PSCFV-8311 pagination, filter and order with multilist
2013-08-05 16:11:48 +02:00
3317ab878d
[-] WS: add id_address_delivery on cart products association
2013-08-05 15:53:40 +02:00
db951f5b76
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-05 15:37:20 +02:00
f217061e27
[-] Classes : ModuleFrontController & templates overrides fixed
2013-08-05 15:37:16 +02:00
Rémi Gaillard