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

• ee98947e6b // manual merg of https://github.com/PrestaShop/PrestaShop/commit/0bc1d214324b01606cf08df6a38a51949fc253b7 and gRoussac 2013-11-21 18:59:28 +01:00
• 47531534fc // Updated Addons API call in the search Damien Metzger 2013-11-21 18:34:25 +01:00
• f7ad627b4d // fix pagination Tax Rules Group Kevin Granger 2013-11-21 18:28:25 +01:00
• d89db6de45 // Fixed warning Damien Metzger 2013-11-21 17:31:38 +01:00
• 3a02d6f281 [-] BO : Fixed potential errors with untranslated admin tabs #PSCFV-8104 Damien Metzger 2013-11-21 16:11:49 +01:00
• 5976a471a7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-21 17:43:59 +01:00
• 9eefcfd058 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-21 17:43:51 +01:00
• d14fcf169a [-] IN : bad reset on vars in migrate_orders gRoussac 2013-11-21 17:10:19 +01:00
• 8bdc6c9a51 [*] FO : Added getCategory getter in ProductController #PSCFV-8408 Damien Metzger 2013-11-21 16:01:34 +01:00
• 6431f559d7 // tree header improvement WIP Kevin Granger 2013-11-21 15:01:54 +01:00
• 9c5303df1d // Deactivate customer groups in the install (automatically reactivated if you add a group or set a reduction) Damien Metzger 2013-11-21 14:57:55 +01:00
• 26b90d5670 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 2] Damien Metzger 2013-11-21 14:44:00 +01:00
• d6e52bdecb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-11-21 14:20:00 +01:00
• 3ab28374e6 [-] BO : Remove warning with open_basdir on module list gRoussac 2013-11-21 14:17:55 +01:00
• 9f1c39a7d6 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 1] Damien Metzger 2013-11-21 12:32:35 +01:00
• 794f729c5d // Show more info content if <= 4 Jerome Nadaud 2013-11-21 12:23:54 +01:00
• b10d50ef09 // fixs on horizontal nav + add icon on footer links Kevin Granger 2013-11-21 12:15:21 +01:00
• 5f47526ed2 [-] FO : Fixed bug #PSCFV-11076 Fabio Chelly 2013-11-21 12:13:30 +01:00
• 9229d6cb52 // Features and attributes title and buttons Jerome Nadaud 2013-11-21 12:10:15 +01:00
• 2e16a1e5d4 // Better products attributes list button handle Jerome Nadaud 2013-11-21 11:25:09 +01:00
• fbe7f236cb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-21 11:06:21 +01:00
• d49f29f79d // Remove subtitle from orders view Jerome Nadaud 2013-11-21 11:06:08 +01:00
• a6e1309a33 Merge pull request #1008 from djfm/cleanup Kevin Granger 2013-11-21 01:41:15 -08:00
• 931f309b45 // removed superfluous mail files fram 2013-11-21 10:24:20 +01:00
• 5a9bb5106f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap fram 2013-11-21 10:16:47 +01:00
• 89f400d3fc // Remove unnecessary button from shipping options Jerome Nadaud 2013-11-21 10:12:53 +01:00
• 24daa6fa05 // Changing add new title button label Jerome Nadaud 2013-11-21 10:04:03 +01:00
• d2c600a5e3 //updated .gitignore Vincent Augagneur 2013-11-21 09:51:22 +01:00
• 0b47dbca21 // Adding footer to customer requiered fields Jerome Nadaud 2013-11-21 09:46:27 +01:00
• 2df142eb89 // Align actions button in customner view Jerome Nadaud 2013-11-21 09:35:44 +01:00
• 033bf745cd Merge pull request #1000 from studiokiwik/sk-ps15x-011 Jérôme Nadaud 2013-11-21 00:14:28 -08:00
• d4afcec83f Merge pull request #1005 from djfm/css Kevin Granger 2013-11-20 12:10:22 -08:00
• 104ae93936 // tweak nav sidebar Kevin Granger 2013-11-20 19:25:11 +01:00
• a536833f52 // Some bootstrap changes in controllers Jerome Nadaud 2013-11-20 18:44:20 +01:00
• c2e3e1295c Merge pull request #1006 from TMMeilleur/bootstrap Rémi Gaillard 2013-11-20 09:37:56 -08:00
• f58018b6e4 fixes for compatibility TMMeilleur 2013-11-20 19:31:17 +02:00
• 01428f9a31 added all themes for themeconfigurator TMMeilleur 2013-11-20 19:25:12 +02:00
• a5cc9efa76 // Languages boostraping Jerome Nadaud 2013-11-20 18:20:19 +01:00
• 5bd2439e43 // css in AdminTranslationsController fram 2013-11-20 18:03:58 +01:00
• a3282025cf //referralprogram retro compat 1.5 when using helper form in module configuration Vincent Augagneur 2013-11-20 18:05:56 +01:00
• 6ec8e4e70e mailalerts retro compat 1.5 when using helper form in module configuration Vincent Augagneur 2013-11-20 17:57:58 +01:00
• 64cfe559f1 //loyalty retro compat 1.5 when using helper form in module configuration Vincent Augagneur 2013-11-20 17:56:11 +01:00
• fc5b3b1d29 // Localization bootstraping Jerome Nadaud 2013-11-20 17:52:05 +01:00
• 64e84ff296 // when adding a translation pack, do not install translations for modules that are not on the disk fram 2013-11-20 17:35:09 +01:00
• 5b6cfa3cdb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-20 17:29:46 +01:00
• 12f3a150a7 // bootraping of import csv view Jerome Nadaud 2013-11-20 17:29:35 +01:00
• 9e2dac8ece //fix css login Kevin Granger 2013-11-20 17:24:52 +01:00
• 63f2082da3 [-] FO : fixed tax rules cache Damien Metzger 2013-11-20 16:49:48 +01:00
• 4cc99ed9b6 // more image fixes Damien Metzger 2013-11-20 16:33:34 +01:00
• 2d60a95fc3 // Fixed slider image Damien Metzger 2013-11-20 16:32:14 +01:00
• 8d0b1e9602 [*] BO : Added combination ean13 in the backend search #PSCFV-10436 Damien Metzger 2013-11-20 16:30:07 +01:00
• 6d0de6e29e Merge pull request #1003 from priyank/patch-1 Gregory Roussac 2013-11-20 07:29:19 -08:00
• df4cc9d876 Merge pull request #1002 from TMMeilleur/bootstrap Rémi Gaillard 2013-11-20 07:28:51 -08:00
• 0ff7163cba Adding a position order by clause. Priyank Bolia 2013-11-20 20:56:35 +05:30
• 8eb5f76df9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-20 16:24:15 +01:00
• dc29fae59d // reorganize some css and stuff on backward compatibility Kevin Granger 2013-11-20 16:24:01 +01:00
• a10c8a3874 [-] FO : Fixed meta title entities #PSCFV-10312 Damien Metzger 2013-11-20 16:21:12 +01:00
• c61d1bc309 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-20 16:20:56 +01:00
• e5d03f4e7c // Csv import fix hide checkbox Jerome Nadaud 2013-11-20 16:11:37 +01:00
• 0b3c08acbe // Add language iso code to language select Jerome Nadaud 2013-11-20 15:37:25 +01:00
• 914f613e7b [-] FO : Fix bug #PSCFV-11052 no carrier fess whne tax display to false gRoussac 2013-11-20 15:32:33 +01:00
• db081111a6 fixed banners style TMMeilleur 2013-11-20 16:24:05 +02:00
• 8148d5696d [-] BO : fixed bug #PSCSX-25 - carrier wizard summary design and missing infos Vincent Augagneur 2013-11-20 15:20:44 +01:00
• e2aa776a64 // update cms controller title Jerome Nadaud 2013-11-20 15:19:07 +01:00
• 0299f3f0cd [-] BO : fixed bug #PSCSX-32 class-danger on mail send error Vincent Augagneur 2013-11-20 14:56:31 +01:00
• 62a149ebe6 [-] BO : FixBug #PSCSX-33 Misplaced save button Jerome Nadaud 2013-11-20 14:50:31 +01:00
• 5ef392aaeb [-] FO : Fix #PSCFV-11069 remove unused file gRoussac 2013-11-20 14:44:56 +01:00
• 0410378bd3 "---<br />" string is now removed correctly from the end of customization data text Quentin Montant 2013-11-20 13:30:47 +01:00
• dbf98d3722 // Put suffix after input field Jerome Nadaud 2013-11-20 12:02:15 +01:00
• 896d8ce494 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-20 11:57:44 +01:00
• 1508a8a5d7 "---<br />" string is now removed correctly from the end of customization data text Quentin Montant 2013-11-20 11:31:02 +01:00
• 7ab256d28f // Small fix in customer order private note Jerome Nadaud 2013-11-20 11:04:39 +01:00
• 61b1dd338e // Update blockbestsellers Damien Metzger 2013-11-20 10:28:39 +01:00
• 33b8703d24 // Changelog 1.5.6.1 1.5.6.1 Damien Metzger 2013-11-20 09:43:06 +01:00
• 29e7169a92 // Change logo size Jérôme Nadaud 2013-11-19 08:43:17 +01:00
• 3f5963885e // Install multilang 1.6.0.1 Damien Metzger 2013-11-19 00:56:53 +01:00
• 54786a6f75 // Install Damien Metzger 2013-11-19 00:10:46 +01:00
• 359f408bd1 // Install Damien Metzger 2013-11-19 00:05:51 +01:00
• 60be5a7989 // themeconfigurator fix Jerome Nadaud 2013-11-18 23:56:19 +01:00
• 89e09c32e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Damien Metzger 2013-11-18 23:55:39 +01:00
• e2c930a165 // Install Damien Metzger 2013-11-18 23:55:29 +01:00
• 1b96c590bb // fix stock available on install Jerome Nadaud 2013-11-18 23:53:47 +01:00
• 3580dc016a Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-18 23:46:48 +01:00
• dec5ef7469 // Install Damien Metzger 2013-11-18 23:24:52 +01:00
• e99332c012 // Pics Lucas CERDAN 2013-11-18 22:55:17 +01:00
• b2c656e51a // small font fix Jerome Nadaud 2013-11-18 22:32:33 +01:00
• 4001a99414 Fixtures product Lucas CERDAN 2013-11-18 22:19:39 +01:00
• 2c687ba090 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-18 22:16:38 +01:00
• 639a56421a // Themeconfigurator Jerome Nadaud 2013-11-18 22:16:26 +01:00
• 51e5163761 // Moulinette for installer attributes Damien Metzger 2013-11-18 22:10:00 +01:00
• fb0118e456 Merge pull request #996 from TMMeilleur/bootstrap Jérôme Nadaud 2013-11-18 11:53:22 -08:00
• f2b5e6de51 // Themeconfigurator and homeslider Jerome Nadaud 2013-11-18 20:49:52 +01:00
• c451ee1bd8 // Fixtures Lucas CERDAN 2013-11-18 20:44:55 +01:00
• f4560d0899 // Install Damien Metzger 2013-11-18 20:35:26 +01:00
• bde8d02c81 Fixtures: category_product Lucas CERDAN 2013-11-18 20:25:55 +01:00
• e4fcb31836 // Install Damien Metzger 2013-11-18 20:01:58 +01:00
• 3dd7a17f6f // Some fixtures Jerome Nadaud 2013-11-18 19:53:44 +01:00
• fac6a5f8b2 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Lucas CERDAN 2013-11-18 19:31:56 +01:00
• 0824a61551 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Lucas CERDAN 2013-11-18 19:29:32 +01:00
• a2e1d5ad90 // Fix blockcategory install with new fixtures Damien Metzger 2013-11-18 19:28:49 +01:00