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

• 72b6b3d482 Fixtures (en) Lucas CERDAN 2013-11-18 19:25:19 +01:00
• 4f2ef4a638 // Update fixture in blockcms Jerome Nadaud 2013-11-18 19:26:30 +01:00
• a3e1fdb690 // Install Damien Metzger 2013-11-18 19:21:56 +01:00
• 770d48cf3c Fixtures (en) : category_product Lucas CERDAN 2013-11-18 19:15:10 +01:00
• b6c5cd7c63 replace new css files location to modules/themeconfigurator/css Alexander Grosul 2013-11-18 20:07:24 +02:00
• 36baadad1a // Set to new fixtures Damien Metzger 2013-11-18 18:51:11 +01:00
• e02b5d5c11 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-11-18 18:39:25 +01:00
• c78252f64b Fixtures images Lucas CERDAN 2013-11-18 18:38:24 +01:00
• 6be883217e [-] BO : FixBug #PNM-1594 - Double selected option value Jerome Nadaud 2013-11-18 18:36:30 +01:00
• 5ca7f683ac // Fixture (en): add description to categories Lucas CERDAN 2013-11-18 18:09:40 +01:00
• 7755cd8d3e Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap rGaillard 2013-11-18 17:46:20 +01:00
• 5c1f8871fc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap rGaillard 2013-11-18 17:46:05 +01:00
• 57b329ca74 // Remove other fonts Jerome Nadaud 2013-11-18 17:46:05 +01:00
• 9197498c3c // delete useless module rGaillard 2013-11-18 17:45:53 +01:00
• 339fb86f4b // oops Jerome Nadaud 2013-11-18 17:42:26 +01:00
• 04bc320080 // Small fix Jerome Nadaud 2013-11-18 17:41:16 +01:00
• 09a558485a New fixtures (en) Lucas CERDAN 2013-11-18 17:13:45 +01:00
• c14b9e619d Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-18 17:21:41 +01:00
• 938ef4fe39 // small fix Jerome Nadaud 2013-11-18 17:12:35 +01:00
• 43a54b10bf // Reverted revert Damien Metzger 2013-11-18 17:00:12 +01:00
• 5d0b188eed // small fix rGaillard 2013-11-18 16:19:02 +01:00
• 10e0205cb8 Merge pull request #992 from djfm/development Rémi Gaillard 2013-11-18 06:40:31 -08:00
• a1d34e4ad2 Merge pull request #993 from djfm/bootstrap Rémi Gaillard 2013-11-18 06:40:02 -08:00
• 1f71090b86 // Timeout increased for translation download #PSCFV-11046 Damien Metzger 2013-11-18 15:37:21 +01:00
• 522e95223f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-18 15:35:17 +01:00
• 89c9f182b3 // Small fix in live configurator toolbox Jerome Nadaud 2013-11-18 15:35:03 +01:00
• 1dd0064cb2 // fixed typo in Russian installer fram 2013-11-18 15:30:05 +01:00
• 4cba2623e5 Merge pull request #926 from djfm/loc_ui Rémi Gaillard 2013-11-18 06:32:34 -08:00
• 618aa24f74 Merge pull request #945 from Javsmile/patch-2 Rémi Gaillard 2013-11-18 06:30:59 -08:00
• 0889ab4eec // fixed typo in Russian installer fram 2013-11-18 15:30:05 +01:00
• f4194bedd9 Merge pull request #978 from StanProg/bootstrap Rémi Gaillard 2013-11-18 06:27:46 -08:00
• 4c51570b34 Merge pull request #991 from TMMeilleur/bootstrap Rémi Gaillard 2013-11-18 06:22:43 -08:00
• 4f7f8535b5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-18 15:13:11 +01:00
• 369ac0f664 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-18 15:13:04 +01:00
• 6633efd27d [-] BO : Fix bug #PNM-1594, selected value error in helper list gRoussac 2013-11-18 15:11:49 +01:00
• c4dab5f5a6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-18 15:04:44 +01:00
• 40204ba458 // Live configurator toolbox part 2 Jerome Nadaud 2013-11-18 15:04:10 +01:00
• 8d627aa522 [-] MO : Referralprogram Prevent Exception when badly configured gRoussac 2013-11-18 14:58:17 +01:00
• adcc4f2c74 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Damien Metzger 2013-11-18 14:54:47 +01:00
• b4385c346f [+] Installer : new demo products (part 1) Damien Metzger 2013-11-18 14:53:39 +01:00
• 95b9710eda fixed add to wishlist/compare buttons and added product review TMMeilleur 2013-11-18 15:52:39 +02:00
• 2ba5dc18fd Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-18 14:49:27 +01:00
• bcc851c98c // Update image fix Jerome NadaudandgRoussac 2013-10-18 17:50:36 +02:00
• 46dc93fd7e // Adding update button on to page header toolbar on module Jerome Nadaud 2013-11-18 14:41:49 +01:00
• 867eef79cc // Add live configurator toolbox - Part 1 Jerome Nadaud 2013-11-18 14:39:46 +01:00
• dbc08d779c // typo, sorry about this gRoussac 2013-11-18 14:35:39 +01:00
• 239604b70c // Missing isset on cols and rows Jerome Nadaud 2013-11-18 14:35:15 +01:00
• 22a9548f83 [-] FO : Fix bug #PSCFV-11043, bad cache id from module template gRoussac 2013-11-18 14:32:34 +01:00
• ebad56a800 // Fix small error Jerome Nadaud 2013-11-18 14:29:32 +01:00
• 4771746959 [-) FO : Fix bug #PSCFV-10926, trailing question mark in pagination url gRoussac 2013-11-18 12:26:08 +01:00
• 89c65536d7 // Added missing configuration vars in the installer Damien Metzger 2013-11-18 12:23:50 +01:00
• 5ef4b8eddc // Installer optimization Damien Metzger 2013-11-18 12:12:14 +01:00
• bd241a9c48 [-] BO: product price was changed on changing to advanced stock management #PSCFV-10996 rGaillard 2013-11-18 12:04:09 +01:00
• 73ec191fb0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-18 10:23:23 +01:00
• 8166bb662c Merge pull request #984 from soware/development Jérôme Nadaud 2013-11-18 01:01:00 -08:00
• 113f8d4efb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-11-18 09:55:37 +01:00
• 11296fe464 // Small Fix in truncateString function Jerome Nadaud 2013-11-18 09:55:21 +01:00
• 017ef4860e Merge pull request #987 from davyrolink/fixed_toolbar_tpl Gregory Roussac 2013-11-18 00:54:48 -08:00
• 21319ca32c Merge pull request #988 from dlage/fix_jquery_ui_autocomplete Gregory Roussac 2013-11-17 14:44:47 -08:00
• cef406aef2 [*] FO : DNI can be not required gRoussac 2013-11-17 23:35:56 +01:00
• 7e841c4448 [-] FO : Missing sup for DNI field gRoussac 2013-11-17 22:36:51 +01:00
• 1cbc765a8f [-] IN : Bad flag in add_module_to_hook gRoussac 2013-11-17 20:42:29 +01:00
• 68c8e9da57 // move to themeconfigurator rGaillard 2013-11-16 19:24:03 +01:00
• 692643d7d6 [-] Project : missing ui.menu in jquery_ui_dependencies. dlage 2013-11-16 17:42:54 +00:00
• cd58c0968b Fixed admin toolbar save button javascript actions, problem occurred when there were multiple toolbars on one page Davy Rolink 2013-11-16 14:59:37 +01:00
• f83c22281b [-] BO: Fix stock when combinations are removed. ignore_stock_without_combination dlage 2013-11-16 12:36:38 +00:00
• de9e6d72c8 // Typo Jérôme Nadaud 2013-11-16 08:04:59 +01:00
• 3a58cb2a91 Merge pull request #983 from PrestaEdit/patch-60 Jérôme Nadaud 2013-11-15 22:13:22 -08:00
• e5f0bcb916 Update form.tpl soware 2013-11-16 00:37:47 -02:00
• 9b787c454f //typo PrestaEdit 2013-11-16 01:21:56 +01:00
• 8c3eb9b9a4 // typo rGaillard 2013-11-15 21:03:17 +01:00
• 7f02c8ca58 [-] WS: Fix bug #PSCFV-10970 use configuration for uploaded images quality development gRoussac 2013-11-15 18:50:28 +01:00
• b62952accf [*] BO : Added simulation mode to the dashboard Damien Metzger 2013-11-15 18:07:07 +01:00
• 4bd7164507 Merge pull request #982 from TMMeilleur/bootstrap Rémi Gaillard 2013-11-15 08:47:58 -08:00
• a5d9daff13 added responsive rich menu and small fix in blockbanner TMMeilleur 2013-11-15 18:40:17 +02:00
• 5106a5f1e3 // Fix products controller title Jerome Nadaud 2013-11-15 17:25:12 +01:00
• 96def5033f // typo Jerome Nadaud 2013-11-15 17:19:12 +01:00
• 8cd1d623e5 // Fix error if default blockbanner image is missing Jerome Nadaud 2013-11-15 17:13:50 +01:00
• 19cfa443d2 // fix dashgoals configuration fields size Jerome Nadaud 2013-11-15 17:04:55 +01:00
• 5fb4ac5044 // Fix missing last actions button in tracking controller list Jerome Nadaud 2013-11-15 16:25:31 +01:00
• bfed3532bf [*] BO : AdminPerformances Hide warnings message when not necessary gRoussac 2013-11-15 16:12:07 +01:00
• 8d90578cf7 // Add anchor to list Jerome Nadaud 2013-11-15 16:04:27 +01:00
• 2962141d51 [-] BO : Fix warning when no memcached servers gRoussac 2013-11-15 15:39:00 +01:00
• ece4331622 //Fix addsharethis error Jerome Nadaud 2013-11-15 15:38:51 +01:00
• 3af7a59caa // Add version number to addsharethis Jerome Nadaud 2013-11-15 15:32:52 +01:00
• b5d84a72e0 // AddShareThis fix Jerome Nadaud 2013-11-15 15:31:01 +01:00
• 73bf2a7db1 [-] BO : Fix #PSCFV-11016 typo gRoussac 2013-11-15 15:16:02 +01:00
• 9aa656c9d7 // typo gRoussac 2013-11-15 15:10:12 +01:00
• 1140b5e8b5 [*] FO : Fix #PSCFV-8715 add product.attributes in carrier tpl gRoussac 2013-11-15 15:06:30 +01:00
• 44f89053e4 // Invoice search fix Jerome Nadaud 2013-11-15 15:00:56 +01:00
• 6a690b255b [-] BO : Model return html error messagae instead of json while image uploading gRoussac 2013-11-15 12:20:10 +01:00
• 9fa2299c6b // Open prestashop.com link in new window Jerome Nadaud 2013-11-15 11:56:23 +01:00
• d7de507f42 // Product comments Jerome Nadaud 2013-11-15 11:49:40 +01:00
• 152960639f [-] BO : Product final price can not be hidden on loading tab, report of https://github.com/PrestaShop/PrestaShop/commit/6c6c3b240ee2249b7f99be1a112905cd0edbee46 gRoussac 2013-11-15 11:36:07 +01:00
• 448a4c9994 Merge pull request #980 from djfm/development Gregory Roussac 2013-11-15 02:23:39 -08:00
• 7526fe4766 // missing trailing semi-column gRoussac 2013-11-15 11:16:48 +01:00
• 50eee795ed // Add truncate category description preserving html tags Jerome Nadaud 2013-11-15 11:03:06 +01:00
• 97be96ede8 [-] MO : Missinag closing href gRoussac 2013-11-15 10:54:50 +01:00
• 0b47ef1b3b [-] BO : test on xml string follow up https://github.com/PrestaShop/PrestaShop/pull/690#issuecomment-28542506 gRoussac 2013-11-15 10:51:46 +01:00
• ba15d975bc // no line breaks in $this->l() fram 2013-11-15 10:42:13 +01:00