dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,979 Commits 9 Branches 19 Tags
887b68d3f2cd230c490e5c8aa34e1b0b8c2ea74f
Commit Graph
18979 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Augagneur b0ace74155 //small fix 2013-09-16 16:30:13 +02:00
Jerome Nadaud 7643a45d81 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-16 16:12:37 +02:00
Jerome Nadaud 29dad488d4 // Stats list active class 2013-09-16 16:12:23 +02:00
Gregory Roussac 1c58c1ea6b Merge pull request #726 from cinscaen/patch-1 
[-] BO : Move product images in POST method in admin.js
 2013-09-16 07:01:45 -07:00
CINS 852faeab7a Update admin.js 
Lorsqu'un produit possède trop d'images, il est impossible de réordonner celle-ci car la valeur JSON fourni en URL (GET) est beaucoup trop longue. Il faut envoyer les données JSON en POST pour solutionner le problème de longueur.
---------
When a product has many pictures, we can't reorder them. The JSON value is too long in URL (GET). We need to send data with POST to avoid problem.
 2013-09-16 15:57:44 +02:00
Sarah Lorenzini 9dfb573422 // update stats tab 2013-09-16 15:46:21 +02:00
Jerome Nadaud 517e95387c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-16 15:33:04 +02:00
Jerome Nadaud 3107a4c3f0 // Translations 2013-09-16 15:32:49 +02:00
Kevin Granger 7f6255156e // BO orders 2013-09-16 15:20:30 +02:00
Kevin Granger f9334b029b // add .row-margin-bottom 2013-09-16 15:05:19 +02:00
gRoussac 8504574ae1 [-] IN : Could not remove some tabs 2013-09-16 15:02:12 +02:00
Jerome Nadaud 8f7cb72231 // Fix tabstop on language dropdown button 2013-09-16 14:35:28 +02:00
Jerome Nadaud 7e8d119213 // Textarea autosize 2013-09-16 14:25:49 +02:00
Kevin Granger 7c01df9268 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-16 11:45:13 +02:00
Kevin Granger 70b39019bf // kpi orders 2013-09-16 11:45:02 +02:00
Damien Metzger e68c124218 [-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396 2013-09-16 11:42:11 +02:00
gRoussac 08efa4e313 [-] IN : Fix bug #PSCFV-10382 add_module_to_hook retunrning false when hook not exists 2013-09-16 11:12:55 +02:00
Vincent Augagneur 636c4575f7 //added warning domaine on dashboard && prestashop news improve 2013-09-16 10:59:42 +02:00
Vincent Augagneur e0739ea1e0 Merge pull request #720 from makk1ntosh/development 
//Added ui.button as dependency of ui.dialog
 2013-09-16 01:35:25 -07:00
Damien Metzger 0e3d53321a [-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error 2013-09-16 09:56:22 +02:00
Kevin Granger 2af6c30bde // fix nav 2013-09-16 09:50:34 +02:00
Damien Metzger 533003faa0 [-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error 2013-09-16 09:37:58 +02:00
Jerome Nadaud d7c1cd90bf Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-16 09:25:57 +02:00
Jerome Nadaud c0afb55d11 [-] BO : FixBug #PSCFV-9900 Double quote escape problem in delete button link 2013-09-16 09:25:10 +02:00
Gregory Roussac 3b9c125198 Merge pull request #723 from codeurWeb/patch-2 
[+] MO : Blocknewproducts add hookHome
 2013-09-14 08:58:14 -07:00
Julien 08373c0541 [+] Modules : add hookHome 2013-09-14 14:57:00 +02:00
gRoussac 73dd524de8 [-] BO : Could not order in AdminStatuses by ID or template 2013-09-14 00:05:45 +02:00
Kevin Granger 81a783679d // fix nav 2013-09-13 18:35:27 +02:00
gRoussac 10472ef83c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-13 17:57:06 +02:00
gRoussac 6da1228359 [-] BO : Fix bug #PSCFV-8407 can not customize feature column name if needed 2013-09-13 17:56:45 +02:00
Kevin Granger bcfd092a1d // fix nav 2013-09-13 17:48:46 +02:00
Jerome Nadaud be0592d5a2 // Some fix 2013-09-13 17:19:20 +02:00
Jerome Nadaud 74237ff694 // Some fix 2013-09-13 17:11:12 +02:00
makk1ntosh d0ef8cca8f Added ui.button as dependency of ui.dialog 
While developing my own module, i've upgraded installation to latest version of PS and impacted a bug:

$('#something').dialog({...}); caused an error: t().button is not a function.



In my php code i had this:
$this->context->controller->addJqueryUI('ui.dialog');

i found that it doesn't load ui.button dependency.

Added 'ui.button' to classes/Media.php at the end of ui.dialog dependencies and all worked fine.
 2013-09-13 08:02:47 -07:00
Jerome Nadaud 5e2aa392da // Some fix 2013-09-13 15:40:51 +02:00
Jerome Nadaud 97ec6341e8 [-] BO ; Fix bug #PSCFV-10393 manufacturer filter 2013-09-13 15:39:30 +02:00
Jerome Nadaud 7b532d77fd // Fix some bootstrap design 2013-09-13 15:36:27 +02:00
Kevin Granger b58dddf521 // moved search/reset of list header 2013-09-13 15:03:26 +02:00
Kevin Granger 4f3183283f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-13 12:18:43 +02:00
Kevin Granger 4cde899834 // localization 2013-09-13 12:18:27 +02:00
Jerome Nadaud 0ba9704c21 // Fix class index error 2013-09-13 12:17:24 +02:00
Rémi Gaillard 5363e75238 // small fix 2013-09-13 12:13:12 +02:00
Gregory Roussac a3d9643833 Merge pull request #719 from zimmi1/patch-4 
Update Connection.php correction from 717
 2013-09-13 02:59:06 -07:00
zimmi1 4f06b74a29 Update Connection.php correction from 717 
I'm very very sorry, I produced an error with the last commit on this file: there was an error in parenthesis position on line 117. Line 117 should be as line 131.
(But how did I manage to make this wrong ???)
 2013-09-13 11:56:50 +02:00
Jerome Nadaud 2bf17241bd // Fix associated categories tree header 2013-09-13 11:50:27 +02:00
Kevin Granger 968f2a45d5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-09-13 11:41:26 +02:00
Kevin Granger c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
Gregory Roussac 61295e4e21 Merge pull request #717 from zimmi1/patch-2 
[*] CORE : Speeding up sql queries in Connection
 2013-09-13 02:09:25 -07:00
gRoussac d9bc07d030 [-] BO : quote badly decoded in customerThreads 2013-09-13 10:45:07 +02:00
Jerome Nadaud 3eb4d65fc9 [-] BO : Fix Bug #PSCFV-10331 check all from list 2013-09-13 10:26:08 +02:00