2f088c4ac3
[*] BO : changed dashgoals system
2013-12-04 16:06:42 +01:00
689fcb005d
small fixes
2013-12-04 10:08:35 +02:00
102b99eb1c
// small fix
2013-12-02 18:15:37 +01:00
c8ca67eef5
// Fixed upgrade to 1.6.0.1
2013-12-02 15:28:02 +01:00
2bdca4668e
Merge pull request #1063 from Shoprunners/patch-1
...
MO:blocklayered
2013-12-02 02:06:03 -08:00
f22fd92a95
[*] MO : blockviewed added title tag to image
2013-12-01 23:22:01 -06:00
8de9a0ecda
[*] MO: blockcontact Adds title tag on link
2013-12-01 21:43:40 -06:00
c813cc5176
[*] MO : Blockrss added title tag to links
2013-11-30 20:03:29 -06:00
7ea1d73d67
MO:blocklayered
...
Added an extra typecheck to fix a bug http://forge.prestashop.com/browse/PNM-1573
2013-11-30 19:54:42 +01:00
90e1a39025
// Rollback previous pull request merge (with a truncate)
2013-11-29 16:49:28 +01:00
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
b23acae33e
Merge pull request #1057 from Dh42/patch-19
...
// Blockcategories changed title to use name
2013-11-29 07:36:07 -08:00
b122291080
fixes 29.11.2013
2013-11-29 17:13:27 +02:00
77e02f054f
[*]MO: blockbanner added title and alt tag to image
2013-11-28 22:39:25 -06:00
9cf3fa2e8a
[*]MO: Blockcategories changed title to use name
...
Changed the title tag to use the name of the link not the description. Using the description will get sites with a lot of content keyword stuffing penalties. See screenshot http://screencast.com/t/SXY93Ax7Sm
2013-11-28 22:17:40 -06:00
fae538c4e4
[MO]Blocktopmenu
...
Adds title tags to links created by module
2013-11-28 12:10:12 -06:00
e722a5c817
// Dashgoals tooltip improved
2013-11-28 15:03:41 +01:00
a0a3e95e1c
// Remove stacked option to dashgoals
2013-11-28 14:43:04 +01:00
51bd377a67
// Dashgoals improvements
2013-11-28 14:29:40 +01:00
484501169a
//added move up/down on selected item on blocktopmenu
2013-11-28 10:52:17 +01:00
56afe10128
//added gapi logo in dashactivity
2013-11-28 10:18:54 +01:00
65106c6a24
[*] MO : Merge of https://github.com/PrestaShop/PrestaShop/pull/721
2013-11-27 19:21:57 +01:00
0eeb353742
// Natives modules moved
2013-11-27 16:23:48 +01:00
ef6dd3bfed
[-] MO : display_column_left not assigned to smarty in modules initContent() + ssl on loyalty front controller
2013-11-27 12:32:01 +01:00
e3f3f8a58f
//oups
2013-11-26 10:25:03 +01:00
690b6b160a
//small js fix
2013-11-26 10:24:19 +01:00
d9e53486a0
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-25 17:56:11 +01:00
a0373eed7a
[-] MO : Dateofdelivery Fix bug #PNM-1773 when a product has an available date
2013-11-25 17:39:46 +01:00
0e3504f3b3
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-25 17:17:15 +01:00
fae1fd58a9
// tweak on switch + admin import
2013-11-25 17:16:59 +01:00
89f794ae5e
// Missing Typo
2013-11-25 17:09:08 +01:00
90d3dff381
[-] MO : Bug fix - Blockwishlist, Product image link in BO
2013-11-25 12:12:57 +01:00
5afde2163b
[+] MO : Add name value when hover color in blocklayered.tpl - Thanks @codeurWeb
2013-11-25 11:10:42 +01:00
d1c9ec8e09
// Changing Typo preserving backward compatibility
2013-11-25 11:02:40 +01:00
bc083ece83
// Manual merge from development branch
2013-11-25 10:25:32 +01:00
1337407131
Merge pull request #1019 from djfm/translations
...
Translations
2013-11-22 09:12:55 -08:00
0716ae1afc
Merge pull request #1018 from indesign47/patch-15
...
[-] MO : bankwire add translation for fields
2013-11-22 09:10:35 -08:00
94242412f2
[-] MO : cheque add translation for fields
2013-11-22 18:02:48 +01:00
01d6d7c279
// clearer message
2013-11-22 16:32:54 +00:00
dabc3d359a
[-] MO : bankwire add translation for fields
2013-11-22 17:30:37 +01:00
1c6a58c902
// English
2013-11-22 16:16:59 +00:00
a3e84a33f7
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-22 09:50:05 +01:00
c095d8f1ca
[-] Core : fixed smarty escape htmlall > html
2013-11-22 09:47:15 +01:00
ee98947e6b
// manual merg of https://github.com/PrestaShop/PrestaShop/commit/0bc1d214324b01606cf08df6a38a51949fc253b7 and
2013-11-21 18:59:28 +01:00
9eefcfd058
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/css/modules.css
admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/prices.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/list/list_header.tpl
classes/Autoload.php
classes/Carrier.php
classes/Product.php
classes/ProductSale.php
classes/Tools.php
classes/Validate.php
classes/tax/TaxRulesTaxManager.php
controllers/admin/AdminPPreferencesController.php
controllers/admin/AdminPerformanceController.php
install-dev/install_version.php
js/admin_carrier_wizard.js
modules/blockcategories/blockcategories.php
modules/blocklayered/blocklayered.php
modules/statsequipment/statsequipment.php
modules/statsproduct/statsproduct.php
modules/watermark/watermark.php
themes/default/address.tpl
themes/default/authentication.tpl
themes/default/category.tpl
themes/default/contact-form.tpl
themes/default/css/history.css
themes/default/header.tpl
themes/default/js/cart-summary.js
themes/default/js/product.js
themes/default/mobile/order-detail.tpl
themes/default/modules/blocksearch/blocksearch.tpl
themes/default/modules/productcomments/productcomments.tpl
themes/default/order-carrier.tpl
themes/default/order-detail.tpl
themes/default/order-opc-new-account.tpl
themes/default/product.tpl
2013-11-21 17:43:51 +01:00
931f309b45
// removed superfluous mail files
2013-11-21 10:26:02 +01:00
033bf745cd
Merge pull request #1000 from studiokiwik/sk-ps15x-011
...
"---<br />" string is now removed correctly from the end of customization data text
2013-11-21 00:14:28 -08:00
a536833f52
// Some bootstrap changes in controllers
2013-11-20 18:44:20 +01:00
f58018b6e4
fixes for compatibility
2013-11-20 19:31:17 +02:00
01428f9a31
added all themes for themeconfigurator
2013-11-20 19:25:12 +02:00
Damien Metzger