 Kevin Granger
|
85f445b7cc
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-29 11:53:52 +01:00 |
|
|
Kevin Granger
|
cc80e82431
|
// import (todo: add the link delete/view on items loaded with js)
|
2013-11-29 11:53:43 +01:00 |
|
|
Gregory Roussac
|
7fa882efca
|
Merge pull request #1056 from Dh42/patch-18
[*] MO : Blocktopmenu add titles to links
|
2013-11-28 10:26:36 -08:00 |
|
|
Kevin Granger
|
1d2f6c9b9d
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-28 19:22:03 +01:00 |
|
|
Kevin Granger
|
0f74646524
|
// import
|
2013-11-28 19:21:55 +01:00 |
|
|
Dh42
|
fae538c4e4
|
[MO]Blocktopmenu
Adds title tags to links created by module
|
2013-11-28 12:10:12 -06:00 |
|
|
Jerome Nadaud
|
9e6868ba97
|
// Change product attachment upload system
|
2013-11-28 19:09:24 +01:00 |
|
|
gRoussac
|
dbd1d17b93
|
// typo sorry
|
2013-11-28 18:39:52 +01:00 |
|
|
gRoussac
|
c254fd6366
|
// added addons module
|
2013-11-28 18:33:18 +01:00 |
|
|
Gregory Roussac
|
0b653fd20a
|
Merge pull request #1055 from Dh42/patch-17
[-] FO : Prevents crawlers from creating carts
|
2013-11-28 08:55:52 -08:00 |
|
|
Gregory Roussac
|
f8fc02ac4b
|
Merge pull request #1054 from Dh42/patch-16
[-] FO : nofollow on TOS
|
2013-11-28 08:54:22 -08:00 |
|
|
Dh42
|
5591f5c399
|
Prevents crawlers from creating carts
Is valid method of using multiple values, http://www.w3.org/TR/html401/struct/links.html#adef-rel
|
2013-11-28 10:46:33 -06:00 |
|
|
Dh42
|
b6023cc9f7
|
Needs to be a non followed url
Is an ajax type link, needs to be no followed for duplicate content reasons.
|
2013-11-28 10:39:29 -06:00 |
|
|
Vincent Augagneur
|
66947b5354
|
//multiple small fix on carrier wizard
|
2013-11-28 17:38:05 +01:00 |
|
|
gRoussac
|
d46feffcf1
|
[*] CORE : Throw Exception when no theme selected only in front office
|
2013-11-28 16:14:30 +01:00 |
|
|
Jerome Nadaud
|
7261490381
|
// Fix Categories image problem
|
2013-11-28 15:35:17 +01:00 |
|
|
gRoussac
|
336e784ca5
|
[*] CORE : Throw Exception when no theme selected
|
2013-11-28 15:32:19 +01:00 |
|
|
Damien Metzger
|
e722a5c817
|
// Dashgoals tooltip improved
|
2013-11-28 15:03:41 +01:00 |
|
|
Jerome Nadaud
|
b66f8ea75a
|
// Allow list disabled categories
|
2013-11-28 14:49:41 +01:00 |
|
|
Damien Metzger
|
a0a3e95e1c
|
// Remove stacked option to dashgoals
|
2013-11-28 14:43:04 +01:00 |
|
|
Kevin Granger
|
18059a24a3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-28 14:35:41 +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 |
|
|
Kevin Granger
|
8848ff08d8
|
// test git
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
controllers/admin/AdminImportController.php
|
2013-11-28 14:29:34 +01:00 |
|
|
gRoussac
|
cb9d00352f
|
[-] BO : Adminimport reset selected csv if not exists
|
2013-11-28 14:19:23 +01:00 |
|
|
Jérôme Nadaud
|
8f5bac0e90
|
Merge pull request #1042 from Dh42/patch-14
Adds currency to rich snippets
|
2013-11-28 03:30:03 -08:00 |
|
|
Kevin Granger
|
6729d97534
|
// import WIP
|
2013-11-28 12:22:39 +01:00 |
|
|
gRoussac
|
8e71c90b4a
|
[*] BO : AdminImport, check choosen csv exists
|
2013-11-28 12:12:08 +01:00 |
|
|
gRoussac
|
88d46bd0b9
|
[*] BO : AdminImport, check choosen scv exists
|
2013-11-28 12:00:41 +01:00 |
|
|
Jerome Nadaud
|
37afb369c3
|
// Fix already defined Core class
|
2013-11-28 11:46:32 +01:00 |
|
|
Jerome Nadaud
|
9b241d5e1d
|
// Add interface restriction in Autoload
|
2013-11-28 11:46:03 +01:00 |
|
|
Vincent Augagneur
|
dde8540a86
|
//carrier wizard logo location fixed
|
2013-11-28 11:27:34 +01:00 |
|
|
gRoussac
|
8370c18fe8
|
[-] CORE : Remove notices on ob clean
|
2013-11-28 11:11:49 +01:00 |
|
|
Vincent Augagneur
|
ddf00b3e98
|
//small fix #PSCSX-50
|
2013-11-28 11:06:46 +01:00 |
|
|
Vincent Augagneur
|
484501169a
|
//added move up/down on selected item on blocktopmenu
|
2013-11-28 10:52:17 +01:00 |
|
|
Vincent Augagneur
|
56afe10128
|
//added gapi logo in dashactivity
|
2013-11-28 10:18:54 +01:00 |
|
|
Jerome Nadaud
|
510b71054a
|
// Add Drag and Drop to uploader helper
|
2013-11-28 09:55:22 +01:00 |
|
|
gRoussac
|
82022c337a
|
[-] FO : CCC do not withdraw \t+ and \s+
|
2013-11-27 19:49:07 +01:00 |
|
|
Kevin Granger
|
cc3a1379d1
|
// Import WIP (still broken for first upload)
|
2013-11-27 19:33:36 +01:00 |
|
|
gRoussac
|
65106c6a24
|
[*] MO : Merge of https://github.com/PrestaShop/PrestaShop/pull/721
|
2013-11-27 19:21:57 +01:00 |
|
|
Jerome Nadaud
|
76f115ac22
|
// Small Fix in Import controller
|
2013-11-27 18:12:45 +01:00 |
|
|
Jerome Nadaud
|
17294618e1
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-27 17:57:31 +01:00 |
|
|
Jerome Nadaud
|
724d52e019
|
// Adding timestamp filename to csv import
|
2013-11-27 17:57:19 +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 |
|
|
rGaillard
|
621ad532d7
|
// typo
|
2013-11-27 17:00:13 +01:00 |
|
|
Jerome Nadaud
|
b58e8b6bb7
|
// One step csv uploader
|
2013-11-27 16:35:58 +01:00 |
|
|
gRoussac
|
5e718394e3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-27 16:27:04 +01:00 |
|
|
gRoussac
|
068b7100c4
|
[*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854 again
|
2013-11-27 16:26:22 +01:00 |
|
|
Francois Gaillard
|
0eeb353742
|
// Natives modules moved
|
2013-11-27 16:23:48 +01:00 |
|