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

• a66d2e1ab6 // Fix form name Jerome Nadaud 2013-11-15 09:18:41 +01:00
• c2d956ec7d // Modif after specs change Jerome Nadaud 2013-11-15 08:58:30 +01:00
• 29f65da5ca // Add wish list button to blockwishlist module Jerome Nadaud 2013-11-14 19:54:28 +01:00
• 7fcbf8aa7c Merge pull request #977 from TMMeilleur/bootstrap Rémi Gaillard 2013-11-14 10:28:06 -08:00
• 80957666cf // Hide collapse and expand button when not necessary Jerome Nadaud 2013-11-14 19:21:31 +01:00
• 47d58ff930 [*] FO : set at least a class to body gRoussac 2013-11-14 19:03:12 +01:00
• c5b1834870 [*] FO : Removed unused local variable, phpdoc return tag added Stanislav Yordanov 2013-11-14 19:22:39 +02:00
• 0d1c113be1 updates and fixes 14.11.2013 TMMeilleur 2013-11-14 18:08:05 +02:00
• d06bf10bbb [-] FO : Fix bug #PSCFV-10911, doubles in cart rules highlight gRoussac 2013-11-14 16:35:11 +01:00
• 051ed32133 // Add toggle to datepicker button Jerome Nadaud 2013-11-14 16:05:58 +01:00
• 4a46960112 // Small bootstrap fix Jerome Nadaud 2013-11-14 16:00:22 +01:00
• d0d234f555 // typo, sorry about this gRoussac 2013-11-14 15:58:42 +01:00
• 18a2e026ef // Adding more buttons to module configuration Jerome Nadaud 2013-11-14 15:49:17 +01:00
• e7e514dc77 Removed unused local variable, tab added, phpdoc tags fixed Stanislav Yordanov 2013-11-14 16:41:08 +02:00
• 8f81af0463 // fix on blockcategories Jerome Nadaud 2013-11-14 15:12:08 +01:00
• 19d975a0b4 // typo gRoussac 2013-11-14 14:48:14 +01:00
• 67eeae0fa2 // Set visibility on help button Jerome Nadaud 2013-11-14 14:42:35 +01:00
• 299a8e9e9f // Update attributes group title Jerome Nadaud 2013-11-14 14:13:28 +01:00
• 09b908204b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-14 11:52:34 +01:00
• 87faae9717 // Add top menu to blockcategories Jerome Nadaud 2013-11-14 11:52:24 +01:00
• 6393746f04 [-] BO : 406 when mod_security follow up https://github.com/PrestaShop/PrestaShop/commit/034e6a7e7f391e3a8861248db45a4a376b19633c gRoussac 2013-11-14 11:43:05 +01:00
• 9a0b308846 //remove preactivationLink ajax and move in gamification module Vincent Augagneur 2013-11-14 10:54:29 +01:00
• 63ef0b82e6 // Categories thumbnail images for blocktopmenu Jerome Nadaud 2013-11-14 10:37:07 +01:00
• 232309996b // Fix blocklayered bootstrap Jerome Nadaud 2013-11-14 10:35:02 +01:00
• 27731f3bb2 // Bootstraping blocklayered backoffice and ajax fix Jerome Nadaud 2013-11-13 20:13:42 +01:00
• a0f73d20e5 // backward compatibility remix WIP Kevin Granger 2013-11-13 20:11:22 +01:00
• afaeb15b7d // Define default template dir on tree class Jerome Nadaud 2013-11-13 20:10:13 +01:00
• db99f188a2 [-] BO : AdminImport, execption when creating groups gRoussac 2013-11-13 18:23:41 +01:00
• fe8e349931 Merge pull request #975 from ldecoker/patch-10 Gregory Roussac 2013-11-13 09:14:49 -08:00
• 3f8b76f78c [-][FO] _PS_THEME_MOBILE_OVERRIDE_DIR_ not defined ldecoker 2013-11-13 18:12:59 +01:00
• c9a2410c57 [-] Classes : AdminController - Changed admin-theme.css position Francois Gaillard 2013-11-13 17:48:21 +01:00
• 3b1168a032 Merge pull request #974 from TMMeilleur/bootstrap Rémi Gaillard 2013-11-13 08:43:43 -08:00
• ae596ebcd4 added transforming for mobile view and other small fixes Alexander Grosul 2013-11-13 18:34:34 +02:00
• 947f9bb21c // small isset in productcomments gRoussac 2013-11-13 16:39:33 +01:00
• fa3aa8c9d7 // strict standard Rémi Gaillard 2013-11-13 15:46:06 +01:00
• 83400c691c Merge pull request #973 from djfm/development Rémi Gaillard 2013-11-13 06:34:38 -08:00
• f4601d9680 // default form language Rémi Gaillard 2013-11-13 15:37:58 +01:00
• aa81e2607f // First boostraping pass on blocklayered module Jerome Nadaud 2013-11-13 15:31:30 +01:00
• 899dea47a1 // oups Rémi Gaillard 2013-11-13 15:32:56 +01:00
• 2fe12b965b [-] Core: add possibility to choose the position of your css files Rémi Gaillard 2013-11-13 15:31:29 +01:00
• 28e1a94bb6 // instead instead of insted fram 2013-11-13 15:10:06 +01:00
• ad6367f2bf // updated native translations fram 2013-11-13 14:59:39 +01:00
• 5a8c335d78 [-] FO : Bad value for back when controller name is sent gRoussac 2013-11-13 12:30:39 +01:00
• f7e1229e16 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Rémi Gaillard 2013-11-13 11:58:24 +01:00
• 24a4694000 // small clean Rémi Gaillard 2013-11-13 11:58:11 +01:00
• 4479db88a0 [-) PDF : nowrap on several product prices gRoussac 2013-11-13 11:52:10 +01:00
• 5963871a01 //small fix Vincent Augagneur 2013-11-13 11:40:13 +01:00
• 339c954cb3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-11-13 11:24:51 +01:00
• c4837e65ec [-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination Jerome NadaudandFrancois Gaillard 2013-11-13 11:04:13 +01:00
• 4a9383bbcf // small fix Rémi Gaillard 2013-11-13 11:15:48 +01:00
• 2117c89352 [-] FO : FixBug #PSCFV-9291 - Ecotax increment display price in product combination Jerome Nadaud 2013-11-13 11:04:13 +01:00
• 9f10a851e5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-11-13 10:58:01 +01:00
• 66a9ee03fc Merge pull request #971 from studiokiwik/sk-ps15x-008 Gregory Roussac 2013-11-13 01:42:00 -08:00
• 115c368a89 Merge pull request #970 from alexey-svistunov/bootstrap Rémi Gaillard 2013-11-13 01:29:22 -08:00
• c69688cc11 [-] BO : Fix bug #PSCFV-10990 bad version comparison for ps_versions_compliancy gRoussac 2013-11-13 10:14:21 +01:00
• 26d1ad0668 [-] FO : fix contact-form id_order input when customer is not logged Mikael Blotin 2013-11-13 10:12:31 +01:00
• 746d8de9c7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-11-13 10:09:07 +01:00
• 5d0117c5ed //added configuration in sql request in dashactivity Vincent Augagneur 2013-11-13 10:08:57 +01:00
• 6a99b84452 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-11-13 10:02:28 +01:00
• 2cbf8af2b2 // Cms title Jerome Nadaud 2013-11-13 09:36:58 +01:00
• 582ad68875 added default configuration value for dashproducts Vincent Augagneur 2013-11-13 09:27:48 +01:00
• 55fa826525 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-11-13 09:07:54 +01:00
• e7869f6b19 //added default configuration value for dashactivity Vincent Augagneur 2013-11-13 09:07:44 +01:00
• a7aea1d018 Updating styles alexey-svistunov 2013-11-13 10:01:04 +02:00
• e7abdee44a Merge remote-tracking branch 'upstream/bootstrap' into bootstrap alexey-svistunov 2013-11-13 09:59:11 +02:00
• 6ddf220aee [-] Fo : Call Gmaps on https if required gRoussac 2013-11-12 21:16:09 +01:00
• 9328a3c473 // forgot to commit https://github.com/PrestaShop/PrestaShop/commit/036e2362c97ca00e9066076af1c45fc8f9946d56 gRoussac 2013-11-12 19:17:54 +01:00
• c8dfe1c174 [-] FO : Wordwrap on prices in history gRoussac 2013-11-12 19:17:12 +01:00
• 75df12dd94 [-] Core: Group::getCurrent() return the default customer group of the shop if default customer group is not associated to shop Rémi Gaillard 2013-11-12 18:49:52 +01:00
• 6d7e2055ce Merge pull request #968 from ccauw/patch-12 Gregory Roussac 2013-11-12 09:38:03 -08:00
• 4d327a537f [*] FO : addTextFieldToProduct without Line feed, follow up https://github.com/PrestaShop/PrestaShop/pull/962#issuecomment-28294571 gRoussac 2013-11-12 18:28:42 +01:00
• 4fbc8deaa8 // fix products Kevin Granger 2013-11-12 18:21:36 +01:00
• 747926039a [*] BO : add class on TD in standard List ccauw 2013-11-12 18:01:27 +01:00
• 5e4382eb08 [-] BO : Fix bug #PSCFV-10982 reduction group truncated gRoussac 2013-11-12 17:55:07 +01:00
• 52abf62ae1 //dashactivity config Vincent Augagneur 2013-11-12 17:33:54 +01:00
• 036e2362c9 [+] CORE : Fixed cache_id gRoussac 2013-11-12 17:09:38 +01:00
• fc193d5c8b Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-11-12 16:36:19 +01:00
• 75e6a03591 // small fix Rémi Gaillard 2013-11-12 16:38:34 +01:00
• dd05692400 [-] FO : Fixed errors when calculating most selled products from footer link Fabio Chelly 2013-11-12 16:36:07 +01:00
• b5eb7c5c28 // typo Rémi Gaillard 2013-11-12 16:25:13 +01:00
• f0f3679cbd [*] FO : https on TOS in fancybox, follow up https://github.com/PrestaShop/PrestaShop/pull/956 gRoussac 2013-11-12 15:56:04 +01:00
• 175da3ecf6 Merge pull request #965 from djfm/IETF Rémi Gaillard 2013-11-12 06:05:10 -08:00
• 743c4f4607 [*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'iso' code, allows to distinguish between chinese variants etc. fram 2013-11-12 14:59:36 +01:00
• 4e06b1fdd5 // update Bootstrap 3.0.2 + fix tree header Kevin Granger 2013-11-12 14:50:19 +01:00
• c6e34ee229 //dashproducts added section in tpl Vincent Augagneur 2013-11-12 14:43:08 +01:00
• 249bd5437d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-11-12 14:41:11 +01:00
• cf9da09f98 //remove unused smarty variable Vincent Augagneur 2013-11-12 14:40:58 +01:00
• 40abef8aac Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-11-12 12:32:37 +01:00
• 8be339463d // small fix Rémi Gaillard 2013-11-12 12:36:51 +01:00
• f0f630fb50 [-] FO : #PSCFV-10978 firstname displayed instead of lastname in invoice address gRoussac 2013-11-12 12:32:21 +01:00
• 3f42a381a4 [*] FO : Redirect to address.tpl when !Address::isCountryActiveById gRoussac 2013-11-12 12:12:19 +01:00
• c7fff6b20d // Change edit title on employees controller Jerome Nadaud 2013-11-12 12:05:00 +01:00
• d6df601d0e // Preferences identrifer names Jerome Nadaud 2013-11-12 11:55:54 +01:00
• 0430d09753 // Better php def for Page header title edit and view Jerome Nadaud 2013-11-12 11:36:26 +01:00
• fe387fa8ed // Set Identifier name for search engine Jerome Nadaud 2013-11-12 11:30:26 +01:00
• ec37efdf8b // Add identifier name Jerome Nadaud 2013-11-12 11:30:01 +01:00
• 94817a9371 // ooops Jerome Nadaud 2013-11-12 11:16:31 +01:00
• db0e1e41a9 // Small Fix Jerome Nadaud 2013-11-12 11:10:55 +01:00
• 3f83edc7e1 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-12 11:07:44 +01:00
• 4a6346b295 // adjustment on switch Kevin Granger 2013-11-12 11:07:30 +01:00