 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 |
|
|
gRoussac
|
2b210e0732
|
[*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/854
|
2013-11-27 16:20:20 +01:00 |
|
|
Jerome Nadaud
|
cc8f4696b1
|
// Small Fix in product image upload
|
2013-11-27 15:56:15 +01:00 |
|
|
gRoussac
|
dd99d13dc4
|
[*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/766
|
2013-11-27 15:42:11 +01:00 |
|
|
Kevin Granger
|
8f51fee67a
|
// load jquery-timeago.js
|
2013-11-27 15:15:30 +01:00 |
|
|
Kevin Granger
|
6d9f71a8db
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-27 14:39:41 +01:00 |
|
|
Kevin Granger
|
e1ae484c10
|
// add jquery.timeago.js + jquery. validatio,.js
|
2013-11-27 14:39:09 +01:00 |
|
|
Kevin Granger
|
66f8b55fc2
|
// import WIP (broken for now)
|
2013-11-27 14:35:47 +01:00 |
|
|
Rémi Gaillard
|
9bc020ce9e
|
Merge pull request #1051 from TMMeilleur/bootstrap
// fixes 27.11.2013
|
2013-11-27 05:13:46 -08:00 |
|
|
TMMeilleur
|
44549d650f
|
fixes 27.11.2013
|
2013-11-27 14:02:26 +02:00 |
|
|
gRoussac
|
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 |
|
|
Kevin Granger
|
dd36a9e8b7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-27 11:35:41 +01:00 |
|
|
gRoussac
|
6959e71bec
|
[*] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/729
|
2013-11-27 00:09:41 +01:00 |
|
|
gRoussac
|
10dac5a45b
|
[-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/816
|
2013-11-27 00:06:44 +01:00 |
|
|
gRoussac
|
5f5b9bd1de
|
[-] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/718
|
2013-11-26 23:43:49 +01:00 |
|
|
gRoussac
|
5d511c1ac7
|
// remove notice in ModuleGraph.php
|
2013-11-26 23:39:28 +01:00 |
|
|
gRoussac
|
ef466ac47c
|
[+] CORE : Merg of https://github.com/PrestaShop/PrestaShop/pull/775
|
2013-11-26 23:33:24 +01:00 |
|