Commit Graph

Select branches

Hide Pull Requests

1.5

1.6

bootstrap

carrierwizard

development

export_excel

ignore_stock_without_combination

master

patch-1

1.5.0.0

1.5.0.1

1.5.0.13

1.5.0.15

1.5.0.17

1.5.0.2

1.5.0.3

1.5.0.5

1.5.0.9

1.5.1.0

1.5.2.0

1.5.3.0

1.5.3.1

1.5.4.0

1.5.4.1

1.5.5.0

1.5.6.0

1.5.6.1

1.6.0.1

Mono Color

• 322654cacf //small fix with mode catalog and cart button Vincent Augagneur 2013-09-17 14:54:38 +02:00
• f7855f2a3a // Always more KPIs Damien Metzger 2013-09-17 12:47:00 +02:00
• a0be556795 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jérôme Nadaud 2013-09-17 12:33:48 +02:00
• 47341ce0bb // Attributes generator Jérôme Nadaud 2013-09-17 12:33:06 +02:00
• a53080eefc // fix bug css Kevin Granger 2013-09-17 12:32:36 +02:00
• 3151064daf //small fix on helper form && option Vincent Augagneur 2013-09-17 12:18:37 +02:00
• 5c04e5564c // tags + fixed-width Kevin Granger 2013-09-17 11:59:57 +02:00
• e6e8efc19a [-] FO: Fix Product::getAttributesGroups() minimal_quantity/weight/available_date should be multishop Rémi Gaillard 2013-09-17 11:58:12 +02:00
• 6ee6317fee // orderby position Rémi Gaillard 2013-09-17 11:07:29 +02:00
• 0ab792cc6e // Change tagify class Jérôme Nadaud 2013-09-17 10:52:21 +02:00
• c0c4af988f // Added net profits / visitor as a KPI Damien Metzger 2013-09-17 10:47:54 +02:00
• 70f284ad88 [+] BO : new graph engine nvd3 (still need some development - will replace the other engines) Damien Metzger 2013-09-17 10:24:31 +02:00
• 455904a59b // Some input fix Jérôme Nadaud 2013-09-17 10:13:00 +02:00
• e08d2a8361 // fix Kevin Granger 2013-09-17 10:00:33 +02:00
• ab5dd91359 // Localization Jérôme Nadaud 2013-09-17 09:18:56 +02:00
• 57ed337030 // Fix autosize for products attachment tab textarea Jerome Nadaud 2013-09-16 18:57:11 +02:00
• 2d5bd901f4 [*] CORE : Refactoring Tools::copy() as copy with context > PHP 5.3 gRoussac 2013-09-16 18:51:06 +02:00
• 8934f9c7ed [*] BO : Connected the first KPIs to real data Damien Metzger 2013-09-16 18:40:22 +02:00
• 80b6d5a570 // fix autosize for textarea in options.tpl Jerome Nadaud 2013-09-16 18:28:57 +02:00
• a4103265e5 // Color picker Jerome Nadaud 2013-09-16 18:17:29 +02:00
• 4ef7bd0b77 // update stats tab Sarah Lorenzini 2013-09-16 17:49:57 +02:00
• 7b06758e22 // Fix carrier header and button link Jerome Nadaud 2013-09-16 17:23:01 +02:00
• b9b4265517 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-09-16 17:18:56 +02:00
• 15dd1cf96f [-] BO : Fix bugPSCFV-10249 images copy when unix path gRoussac 2013-09-16 17:16:11 +02:00
• c7a777163c //small fix Vincent Augagneur 2013-09-16 17:14:08 +02:00
• fce87cf66a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-09-16 17:05:39 +02:00
• 235af94a92 // Fix Page header toolbar Jerome Nadaud 2013-09-16 17:05:27 +02:00
• b0ace74155 //small fix Vincent Augagneur 2013-09-16 16:30:13 +02:00
• 7643a45d81 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-09-16 16:12:37 +02:00
• 29dad488d4 // Stats list active class Jerome Nadaud 2013-09-16 16:12:23 +02:00
• 1c58c1ea6b Merge pull request #726 from cinscaen/patch-1 Gregory Roussac 2013-09-16 07:01:45 -07:00
• 852faeab7a Update admin.js CINS 2013-09-16 15:57:44 +02:00
• 9dfb573422 // update stats tab Sarah Lorenzini 2013-09-16 15:42:08 +02:00
• 517e95387c Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-09-16 15:33:04 +02:00
• 3107a4c3f0 // Translations Jerome Nadaud 2013-09-16 15:32:49 +02:00
• 7f6255156e // BO orders Kevin Granger 2013-09-16 15:20:30 +02:00
• f9334b029b // add .row-margin-bottom Kevin Granger 2013-09-16 15:05:19 +02:00
• 8504574ae1 [-] IN : Could not remove some tabs gRoussac 2013-09-16 15:02:12 +02:00
• 8f7cb72231 // Fix tabstop on language dropdown button Jerome Nadaud 2013-09-16 14:35:28 +02:00
• 7e8d119213 // Textarea autosize Jerome Nadaud 2013-09-16 14:25:49 +02:00
• 7c01df9268 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-09-16 11:45:13 +02:00
• 70b39019bf // kpi orders Kevin Granger 2013-09-16 11:45:02 +02:00
• e68c124218 [-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396 Damien Metzger 2013-09-16 11:40:29 +02:00
• 08efa4e313 [-] IN : Fix bug #PSCFV-10382 add_module_to_hook retunrning false when hook not exists gRoussac 2013-09-16 11:12:55 +02:00
• 636c4575f7 //added warning domaine on dashboard && prestashop news improve Vincent Augagneur 2013-09-16 10:59:42 +02:00
• e0739ea1e0 Merge pull request #720 from makk1ntosh/development Vincent Augagneur 2013-09-16 01:35:25 -07:00
• 0e3d53321a [-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error Damien Metzger 2013-09-16 09:37:39 +02:00
• 2af6c30bde // fix nav Kevin Granger 2013-09-16 09:50:34 +02:00
• 533003faa0 [-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error Damien Metzger 2013-09-16 09:37:39 +02:00
• d7c1cd90bf Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-09-16 09:25:57 +02:00
• c0afb55d11 [-] BO : FixBug #PSCFV-9900 Double quote escape problem in delete button link Jerome Nadaud 2013-09-16 09:25:10 +02:00
• 3b9c125198 Merge pull request #723 from codeurWeb/patch-2 Gregory Roussac 2013-09-14 08:58:14 -07:00
• 08373c0541 [+] Modules : add hookHome Julien 2013-09-14 14:57:00 +02:00
• 73dd524de8 [-] BO : Could not order in AdminStatuses by ID or template gRoussac 2013-09-14 00:05:45 +02:00
• 81a783679d // fix nav Kevin Granger 2013-09-13 18:35:27 +02:00
• 10472ef83c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-09-13 17:57:06 +02:00
• 6da1228359 [-] BO : Fix bug #PSCFV-8407 can not customize feature column name if needed gRoussac 2013-09-13 17:56:45 +02:00
• bcfd092a1d // fix nav Kevin Granger 2013-09-13 17:48:46 +02:00
• be0592d5a2 // Some fix Jerome Nadaud 2013-09-13 17:19:20 +02:00
• 74237ff694 // Some fix Jerome Nadaud 2013-09-13 17:11:12 +02:00
• d0ef8cca8f Added ui.button as dependency of ui.dialog makk1ntosh 2013-09-13 08:02:47 -07:00
• 5e2aa392da // Some fix Jerome Nadaud 2013-09-13 15:40:51 +02:00
• 97ec6341e8 [-] BO ; Fix bug #PSCFV-10393 manufacturer filter Jerome Nadaud 2013-09-13 15:39:30 +02:00
• 7b532d77fd // Fix some bootstrap design Jerome Nadaud 2013-09-13 15:36:27 +02:00
• b58dddf521 // moved search/reset of list header Kevin Granger 2013-09-13 15:03:26 +02:00
• 4f3183283f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-09-13 12:18:43 +02:00
• 4cde899834 // localization Kevin Granger 2013-09-13 12:18:27 +02:00
• 0ba9704c21 // Fix class index error Jerome Nadaud 2013-09-13 12:17:24 +02:00
• 5363e75238 // small fix Rémi Gaillard 2013-09-13 12:13:12 +02:00
• a3d9643833 Merge pull request #719 from zimmi1/patch-4 Gregory Roussac 2013-09-13 02:59:06 -07:00
• 4f06b74a29 Update Connection.php correction from 717 zimmi1 2013-09-13 11:56:50 +02:00
• 2bf17241bd // Fix associated categories tree header Jerome Nadaud 2013-09-13 11:50:27 +02:00
• 968f2a45d5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-09-13 11:41:26 +02:00
• c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-09-13 11:41:14 +02:00
• 61295e4e21 Merge pull request #717 from zimmi1/patch-2 Gregory Roussac 2013-09-13 02:09:25 -07:00
• d9bc07d030 [-] BO : quote badly decoded in customerThreads gRoussac 2013-09-13 10:45:07 +02:00
• 3eb4d65fc9 [-] BO : Fix Bug #PSCFV-10331 check all from list Jerome Nadaud 2013-09-13 10:26:08 +02:00
• 452f41df8d Speeding up sql queries zimmi1 2013-09-13 10:05:30 +02:00
• f20fa55308 // Fix filter by category checkbox Jerome Nadaud 2013-09-13 09:49:07 +02:00
• ce74aeb357 // nav Kevin Granger 2013-09-13 09:35:36 +02:00
• d914982961 // Rounded sales on dashboard Damien Metzger 2013-09-12 19:26:28 +02:00
• 7d9f9a7bfc // Fix CMS missing Page header toolbar Jerome Nadaud 2013-09-12 19:21:53 +02:00
• 3cf4dc76b5 // Fix missing localizations page header toolbar Jerome Nadaud 2013-09-12 18:54:28 +02:00
• 06a178b8fe // Replaced screencast option by menu option Damien Metzger 2013-09-12 18:23:44 +02:00
• f20a3eb9b5 // Fixed most viewed conversion rate Damien Metzger 2013-09-12 18:15:22 +02:00
• 26babfc8f9 // Binded most viewed products on analytics Damien Metzger 2013-09-12 17:17:53 +02:00
• 481dc3d307 // Dashboard is almost complete Damien Metzger 2013-09-12 16:03:29 +02:00
• 278cd952e2 // Gapi choose between 1.3 and 3.0 versions Damien Metzger 2013-09-12 15:38:57 +02:00
• 14a9d914d8 // Fix module uninstall button Jerome Nadaud 2013-09-12 18:23:27 +02:00
• db4b69d10c [-] BO : Customer message twice encoded gRoussac 2013-09-12 18:03:30 +02:00
• 81b6ec93f9 // Add count down to text input Jerome Nadaud 2013-09-12 17:59:25 +02:00
• 039955e6a1 // Fix bug customer list in multistore Jerome Nadaud 2013-09-12 16:59:25 +02:00
• 29db737c10 // Add autosize to textarea Jerome Nadaud 2013-09-12 16:52:55 +02:00
• ba6699a378 // Fix Admin access Jerome Nadaud 2013-09-12 15:55:14 +02:00
• c105486fa3 // Tree bugs Jerome Nadaud 2013-09-12 15:22:47 +02:00
• 5095b45e47 [-] BO : Fix bug, orders states not ordered by order state name gRoussac 2013-09-12 15:09:21 +02:00
• 30591b7c28 // Typo Rémi Gaillard 2013-09-12 15:04:47 +02:00
• f9b1f0ab5e [*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists() Rémi Gaillard 2013-09-12 15:03:23 +02:00
• bc221b993b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-09-12 14:55:58 +02:00
• 873eee8ad0 // Tree list bug Jerome Nadaud 2013-09-12 14:55:45 +02:00