Commit Graph
100 Commits
Author SHA1 Message Date
Damien Metzger ab71b813be [-] BO : fixed top right link with the "open in a new tab" button 2013-12-04 17:00:59 +01:00
Damien Metzger fa804b9bf8 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 2013-12-04 16:06:55 +01:00
Damien Metzger 2f088c4ac3 [*] BO : changed dashgoals system 2013-12-04 16:06:42 +01:00
Damien Metzger b657115552 // Fixed bad entities in KPI 2013-12-03 18:12:02 +01:00
Damien Metzger de456e45ec [*] Bo : removed empty filters from the cookie (thus limiting its size) 2013-12-03 11:44:51 +01:00
Damien Metzger 2931ebeeae [-] FO : fixed product comparator when there are no products anymore 2013-12-02 19:21:54 +01:00
Damien Metzger e8088892b5 [-] FO : Added condition to display the phone number only if it is set up in the admin 2013-12-02 19:12:49 +01:00
Damien Metzger 2316bb50ba // Fixed import button in AdminImport 2013-12-02 18:53:51 +01:00
Damien Metzger 703d790910 // Changed hook in update 2013-12-02 17:40:01 +01:00
Damien Metzger c8ca67eef5 // Fixed upgrade to 1.6.0.1 2013-12-02 15:28:02 +01:00
Damien Metzger 62a7a6a94f [-] FO : fixed cart rules cache id #PSCFV-11123 #PSCFV-11175 2013-12-02 10:06:44 +01:00
Damien Metzger 6230c6249e [-] FO : fixed potential error when you delete a best seller #PSCFV-11167 2013-12-02 09:25:41 +01:00
Damien Metzger 7cd38d4461 // Changed base64 to urlencode in import (and fixed filename issue) 2013-11-29 19:24:04 +01:00
Damien Metzger 782975c708 [-] BO : better error display for forgotten password #PSCSX-58 2013-11-29 18:18:55 +01:00
Damien Metzger 4c2190ddc5 [-] Core : integrated modified pull request https://github.com/ExploZe/PrestaShop/commit/40abb0aa72607ddfe912b364d8fc7d65733d2bd8 2013-11-29 17:18:18 +01:00
Damien Metzger e0b28dd57b // AdminOutstanding is now bootstraped 2013-11-29 17:10:22 +01:00
Damien Metzger 90e1a39025 // Rollback previous pull request merge (with a truncate) 2013-11-29 16:49:28 +01:00
Damien Metzger af3f7be5ac Merge pull request #1058 from Dh42/patch-20
[*] MO: blockbanner added title and alt tag to image
2013-11-29 07:36:34 -08:00
Damien Metzger b23acae33e Merge pull request #1057 from Dh42/patch-19
// Blockcategories changed title to use name
2013-11-29 07:36:07 -08:00
Damien Metzger 9dc075ca39 [*] FO : Code cleaning, optimizations, new callstack available in the profiling tools 2013-11-29 14:21:22 +01:00
Damien Metzger e722a5c817 // Dashgoals tooltip improved 2013-11-28 15:03:41 +01:00
Damien Metzger a0a3e95e1c // Remove stacked option to dashgoals 2013-11-28 14:43:04 +01:00
Damien Metzger 51bd377a67 // Dashgoals improvements 2013-11-28 14:29:40 +01:00
Damien Metzger 35fc864e0b // Fixed potential warning 2013-11-28 14:29:40 +01:00
Damien Metzger 8dc4eb5c03 [-] BO : Category code cleaning, fixing, moving and multistore-ing 2013-11-27 17:40:35 +01:00
Damien Metzger 8c4e2a9a93 // Removed useless lines 2013-11-27 17:40:35 +01:00
Damien Metzger 9ad56871de Merge pull request #1004 from djfm/bootstrap
// when adding a translation pack, do not install translations for modules that are not on the disk
2013-11-26 01:31:24 -08:00
Damien Metzger 553568a72d // Change message for permissions in the installer 2013-11-25 17:06:25 +01:00
Damien Metzger acdb7b0c13 // Fixed invisible chars in CSV examples 2013-11-25 16:13:46 +01:00
Damien Metzger 93cbad2a05 [*] BO : replaced age by total spent in the customer list 2013-11-25 14:30:04 +01:00
Damien Metzger b8c77d90b4 [*] BO : Added countries to order list (idea from PhpMadman https://github.com/PrestaShop/PrestaShop/pull/909) 2013-11-25 12:17:40 +01:00
Damien Metzger dec1555b32 // Fixed dashboard simulation mode switch 2013-11-25 11:30:30 +01:00
Damien Metzger 361450aab9 // Fixed entities on KPIs 2013-11-22 16:15:48 +01:00
Damien Metzger db1c3c22fd [-] BO : Cart rules optimization / Attempt to fix #PSCFV-8895 (need to be double-checked) 2013-11-22 15:59:52 +01:00
Damien Metzger 40d15416c5 [-] FO : exclude external css from CCC #PSCFV-10839 2013-11-22 14:37:27 +01:00
Damien Metzger a3e84a33f7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-22 09:50:05 +01:00
Damien Metzger c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +01:00
Damien Metzger 47531534fc // Updated Addons API call in the search 2013-11-21 18:34:42 +01:00
Damien Metzger d89db6de45 // Fixed warning 2013-11-21 17:46:29 +01:00
Damien Metzger 3a02d6f281 [-] BO : Fixed potential errors with untranslated admin tabs #PSCFV-8104 2013-11-21 17:46:28 +01:00
Damien Metzger 8bdc6c9a51 [*] FO : Added getCategory getter in ProductController #PSCFV-8408 2013-11-21 16:01:50 +01:00
Damien Metzger 9c5303df1d // Deactivate customer groups in the install (automatically reactivated if you add a group or set a reduction) 2013-11-21 14:57:55 +01:00
Damien Metzger 26b90d5670 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 2] 2013-11-21 14:44:00 +01:00
Damien Metzger 9f1c39a7d6 [*] FO : Added the possibility to deactivate customer groups management (for performances) [part 1] 2013-11-21 12:32:51 +01:00
Damien Metzger 63f2082da3 [-] FO : fixed tax rules cache 2013-11-20 16:49:48 +01:00
Damien Metzger 4cc99ed9b6 // more image fixes 2013-11-20 16:33:34 +01:00
Damien Metzger 2d60a95fc3 // Fixed slider image 2013-11-20 16:32:14 +01:00
Damien Metzger 8d0b1e9602 [*] BO : Added combination ean13 in the backend search #PSCFV-10436 2013-11-20 16:30:25 +01:00
Damien Metzger a10c8a3874 [-] FO : Fixed meta title entities #PSCFV-10312 2013-11-20 16:21:37 +01:00
Damien Metzger 61b1dd338e // Update blockbestsellers 2013-11-20 10:28:39 +01:00
Damien Metzger 33b8703d24 // Changelog 1.5.6.1 2013-11-20 09:43:06 +01:00
Damien Metzger 3f5963885e // Install multilang 2013-11-19 00:56:53 +01:00
Damien Metzger 54786a6f75 // Install 2013-11-19 00:10:46 +01:00
Damien Metzger 359f408bd1 // Install 2013-11-19 00:05:51 +01:00
Damien Metzger 89e09c32e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 23:55:39 +01:00
Damien Metzger e2c930a165 // Install 2013-11-18 23:55:29 +01:00
Damien Metzger dec5ef7469 // Install 2013-11-18 23:26:41 +01:00
Damien Metzger 51e5163761 // Moulinette for installer attributes 2013-11-18 22:10:22 +01:00
Damien Metzger f4560d0899 // Install 2013-11-18 20:35:42 +01:00
Damien Metzger e4fcb31836 // Install 2013-11-18 20:02:14 +01:00
Damien Metzger a2e1d5ad90 // Fix blockcategory install with new fixtures 2013-11-18 19:29:13 +01:00
Damien Metzger a3e1fdb690 // Install 2013-11-18 19:22:10 +01:00
Damien Metzger 36baadad1a // Set to new fixtures 2013-11-18 18:51:11 +01:00
Damien Metzger 43a54b10bf // Reverted revert 2013-11-18 17:00:23 +01:00
Damien Metzger 1f71090b86 // Timeout increased for translation download #PSCFV-11046 2013-11-18 15:37:34 +01:00
Damien Metzger adcc4f2c74 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-18 14:54:47 +01:00
Damien Metzger b4385c346f [+] Installer : new demo products (part 1) 2013-11-18 14:53:39 +01:00
Damien Metzger 89c65536d7 // Added missing configuration vars in the installer 2013-11-18 12:23:50 +01:00
Damien Metzger 5ef4b8eddc // Installer optimization 2013-11-18 12:12:14 +01:00
Damien Metzger b62952accf [*] BO : Added simulation mode to the dashboard 2013-11-15 18:07:23 +01:00
Damien Metzger a31dbeb68e // Fixed bootstrap mode for modules 2013-11-05 17:29:51 +01:00
Damien Metzger ad7dfca9e1 // RSS date on the dashboard 2013-11-05 16:55:55 +01:00
Damien Metzger 9f1911eeca // Fixed shopping cart line reduction 2013-11-05 16:41:50 +01:00
Damien Metzger ec528fff93 // one more groups improvement 2013-11-05 16:34:03 +01:00
Damien Metzger 161c701ecf // Groups review 2013-11-05 16:30:34 +01:00
Damien Metzger 0bd6b940d2 // Fixed logoq 2013-11-05 16:17:14 +01:00
Damien Metzger 0e4a900d3d // Fixed group display 2013-11-05 16:13:52 +01:00
Damien Metzger e4fe5f6df6 // Fixed htmlentities in KPIs 2013-11-05 16:01:48 +01:00
Damien Metzger 9bc5a52925 Merge pull request #916 from PrestaEdit/patch-58
[-] FO: use 4 images in thumbnails, not 3
2013-11-05 06:20:59 -08:00
Damien Metzger b0ae53f823 // Changed cursor in the module position tab (for drag n drop) 2013-11-05 15:14:58 +01:00
Damien Metzger 9a86f2c32b // And now it works! 2013-11-05 15:02:36 +01:00
Damien Metzger a5552f3f85 // Improved dashgoals configuration (tmp) 2013-11-05 14:44:42 +01:00
Damien Metzger 4c1ad83b18 // "Fixed" strict standard 2013-11-05 10:22:39 +01:00
Damien Metzger 8dc29b20f0 // Code cleaning and dashgoals improvements (part 1 - not finished yet) 2013-11-04 18:52:27 +01:00
Damien Metzger 2a9ebaa6ed Merge pull request #920 from djfm/bootstrap
// English emails
2013-11-04 09:07:41 -08:00
Damien Metzger ac1f142f23 // Moved default_language 2013-11-04 17:08:17 +01:00
Damien Metzger e8c0195ee9 // small fix merge 2013-11-04 17:04:09 +01:00
Damien Metzger 0009556ed5 // Fixed no bootstrap for modules 2013-11-04 16:51:30 +01:00
Damien Metzger 695326bc4e // Filter search BO 2013-11-04 16:51:30 +01:00
Damien Metzger 0ddc0d9f9a Merge pull request #919 from djfm/bootstrap
// installer typography
2013-11-04 07:23:25 -08:00
Damien Metzger d4a6148b64 // Anything but a 404 image 2013-11-04 16:09:55 +01:00
Damien Metzger f7d346ba99 // Added more results link at the end of the BO search 2013-11-04 15:03:48 +01:00
Damien Metzger 2e80ed8de5 // Cleaned conflict 2013-11-04 14:58:17 +01:00
Damien Metzger 27273334e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-04 14:47:16 +01:00
Damien Metzger e7e4376307 // Changed "gender image" to social title in the customer (BO) 2013-11-04 14:45:36 +01:00
Damien Metzger f8256bc15d // Fixed module KPI 2013-11-04 14:39:53 +01:00
Damien Metzger d93ea846a9 // Code cleaning and small fixes 2013-11-04 14:29:31 +01:00
Damien Metzger 178cd7362d // admin search code cleaning 2013-11-04 13:57:27 +01:00
Damien Metzger 0451ca5c73 // Added Addons search 2013-11-04 12:24:55 +01:00
Damien Metzger cfeeda7d9b // Assigned compared products to smarty 2013-11-04 11:00:50 +01:00