 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 |
|
|
gRoussac
|
1855ffa584
|
[-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/813
|
2013-11-26 23:18:00 +01:00 |
|
|
gRoussac
|
8d15f5d3e6
|
[-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/814
|
2013-11-26 23:08:03 +01:00 |
|
|
gRoussac
|
5485433df6
|
[-] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/819
|
2013-11-26 22:57:57 +01:00 |
|
|
gRoussac
|
9ccd4504f4
|
[*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/820 + https://github.com/PrestaShop/PrestaShop/commit/5e407db21e3e30a1a5fa94b9558314ffa21af407
|
2013-11-26 22:49:10 +01:00 |
|
|
gRoussac
|
b8012952f7
|
[*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/852
|
2013-11-26 22:32:57 +01:00 |
|
|
gRoussac
|
4c92e8f4c5
|
[*] PDF : Merge of https://github.com/PrestaShop/PrestaShop/pull/873
|
2013-11-26 19:06:50 +01:00 |
|
|
Kevin Granger
|
37d4d4bd5f
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-26 19:03:27 +01:00 |
|
|
Kevin Granger
|
32af46e42c
|
// Import WIP
|
2013-11-26 19:03:15 +01:00 |
|
|
gRoussac
|
13b5762367
|
[-] FO : trailing \t in minified html
|
2013-11-26 18:41:02 +01:00 |
|
|
gRoussac
|
c5b6ec5c3c
|
[+] FO : Missing old default templates
|
2013-11-26 18:09:05 +01:00 |
|
|
rGaillard
|
58eb63e99e
|
// small fix
|
2013-11-26 17:02:13 +01:00 |
|
|
gRoussac
|
7f304fc768
|
[-] FO : Merge of https://github.com/ldecoker/PrestaShop/commit/d3bf4d233005511e08554a7c283e0b992815e01a
|
2013-11-26 16:26:35 +01:00 |
|
|
Rémi Gaillard
|
a71bfa8d4e
|
Merge pull request #1046 from PhpMadman/patch-1
// "show all messages" link linked to tab instead of controller
|
2013-11-26 07:10:28 -08:00 |
|
|
PhpMadman
|
0a5216e35b
|
show all messages link linked to tab
|
2013-11-26 15:56:21 +01:00 |
|
|
Jerome Nadaud
|
dc90bb6227
|
// Force clearstatcache on product image upload
|
2013-11-26 15:46:21 +01:00 |
|
|
gRoussac
|
69c99f49c9
|
[-] BO : Merge of https://github.com/smilesrg/PrestaShop/commit/b7b79ff4614e5be7891f8702acdc46c8303a2fdd
|
2013-11-26 15:27:59 +01:00 |
|
|
Gregory Roussac
|
841f6ec65d
|
Merge pull request #1011 from indesign47/patch-10
[+] BO : AdminSearchConf add import alias
|
2013-11-26 02:35:30 -08:00 |
|
|
Gregory Roussac
|
5153b49eae
|
Merge pull request #1013 from indesign47/patch-12
[-] FO : Contact-form add translation for fields
|
2013-11-26 02:35:07 -08:00 |
|