rGaillard
102b99eb1c
// small fix
2013-12-02 18:15:37 +01:00
Damien Metzger
90e1a39025
// Rollback previous pull request merge (with a truncate)
2013-11-29 16:49:28 +01:00
Dh42
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
Damien Metzger
c095d8f1ca
[-] Core : fixed smarty escape htmlall > html
2013-11-22 09:47:15 +01:00
Jerome Nadaud
ebad56a800
// Fix small error
2013-11-18 14:29:32 +01:00
Jerome Nadaud
c2d956ec7d
// Modif after specs change
2013-11-15 08:58:30 +01:00
Jerome Nadaud
8f81af0463
// fix on blockcategories
2013-11-14 15:12:08 +01:00
Jerome Nadaud
87faae9717
// Add top menu to blockcategories
2013-11-14 11:52:24 +01:00
Jerome Nadaud
01d8376ee7
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-07 16:48:56 +01:00
Jerome Nadaud
b51b388eaa
// Blockcategories thumnail uploader fix
2013-11-07 16:44:55 +01:00
Vincent Augagneur
d27fe93daa
//modules added ->bootstrap = true;
2013-11-05 18:08:01 +01:00
Jerome Nadaud
fa68e015b3
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 18:34:51 +01:00
Jerome Nadaud
bf2d54e286
// Add new uploader helper to blockcategories
2013-11-04 18:32:59 +01:00
Damien Metzger
9a1b45a8e6
// Fixed warning and prepared next commit
2013-10-31 15:09:14 +01:00
Damien Metzger
ff2954b1d2
[*] FO : Changed category block behavior inside categories
2013-10-31 12:20:59 +01:00
Vincent Augagneur
f82322e426
//typo
2013-10-24 16:51:55 +02:00
Gregory Roussac
c72c44f153
Merge pull request #877 from djfm/bootstrap
...
// English
2013-10-23 08:46:16 -07:00
djfm
52622e6be2
// English
2013-10-23 15:33:15 +00:00
Jerome Nadaud
2c94e6c042
// Add level depth restriction on blockcategories
2013-10-22 19:13:10 +02:00
Jerome Nadaud
dfa59fa8f7
// Fix blockcategories
2013-10-22 19:04:11 +02:00
Jerome Nadaud
67fc91e2c9
// Categories thumbnails
2013-10-22 17:43:10 +02:00
Vincent Augagneur
8144935d76
//btn-primary => btn btn-default thanks @Shipow
2013-10-22 09:12:01 +02:00
Kevin Granger
67dc7aac04
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
admin-dev/themes/default/template/controllers/modules/filters.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
classes/Category.php
classes/controller/AdminController.php
controllers/admin/AdminAttributesGroupsController.php
controllers/admin/AdminFeaturesController.php
controllers/admin/AdminImportController.php
controllers/admin/AdminLogsController.php
install-dev/install_version.php
install-dev/langs/ru/data/tab.xml
js/admin_carrier_wizard.js
modules/loyalty/loyalty.php
2013-10-14 12:21:29 +02:00
Krystian Podemski
9e4b6c020f
[*] FO: We let style selected category in CSS on blockcategories
...
It's good to have this by default.
2013-10-01 12:02:19 +02:00
vAugagneur
07c03ecf6d
//blockcategories is now using bootstrap design
2013-09-20 11:18:30 +02:00
Damien Metzger
f9fdcb1103
[-] FO : fixed html tags that should not appear in blockcategories
2013-08-13 16:22:38 +02:00
Rémi Gaillard
5ba3fda95f
[-] FO: Add the protocol content to the cache id of modules #PSCFV-8810
2013-04-17 18:14:58 +02:00
Rémi Gaillard
26bdf77308
// And now use smarty cache groups for cache ids to be more efficient
2013-04-05 11:57:52 +02:00
gRoussac
052d17c30d
[-] MO : Fix bug #PSCFV-8399 dictinct categegories in module blockcategories
2013-03-28 16:08:12 +01:00
Rémi Gaillard
dfd2b8f604
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
fram
ed947bc123
// changed English strings, especially focusing on colons harmonization
2013-03-12 19:39:30 +01:00
Rémi Gaillard
41069dc231
[-] MO: Clear blockcategories_footer.tpl cache
2013-02-11 16:30:04 +01:00
Rémi Gaillard
039879fcf4
// small fix
2013-01-07 19:59:00 +01:00
Rémi Gaillard
cd89916a20
[*] MO: Add smarty cache on some modules
2013-01-07 17:09:36 +01:00
djfm
385c593129
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
François Gaillard
064ba453e6
// Welcome 2013
2013-01-04 11:19:03 +01:00
vAugagneur
2e90e12293
//Merge branch release
2013-01-02 09:56:20 +01:00
Rémi Gaillard
37f9d31c0a
[-] FO: Fix retrocompatibility for modules and old themes
2012-12-31 12:06:28 +01:00
vAugagneur
a35469768f
//added translation
2012-12-28 09:27:12 +01:00
vAugagneur
76b435b639
//revert all config.xml
2012-12-06 11:41:52 +01:00
sLorenzini
2191eec919
[-] FO: improvement on h4/h5 edits (id become class)
2012-12-06 10:06:56 +01:00
Sarah Lorenzini
31efb947ab
// change h4, h5
2012-12-04 17:15:49 +01:00
vAugagneur
a1db83ef41
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
lLefevre
007f4d31f6
// #PSCFV-5017 : update bad licenses in all files
2012-10-17 13:19:18 +00:00
lLefevre
946dd2caf7
// Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files
2012-10-17 10:13:43 +00:00
lLefevre
04fc63c2b6
// #PSCFV-5017 : update bad licenses in all files
2012-10-17 09:35:11 +00:00
lLefevre
779cf350af
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
2012-10-17 09:29:43 +00:00
lLefevre
046b51ab99
// #PSCFV-5017 : update bad licenses in all files
2012-10-17 06:18:59 +00:00
lLefevre
9239de5dac
[-] BO : fix #PSCFV-4933 : add recursively index.php file
2012-10-12 12:17:04 +00:00
vAugagneur
6e911cd932
[-] MO : fixed bug #PSCFV-4456
2012-10-01 12:35:59 +00:00
