 Vincent Augagneur
|
2f34af4646
|
//remove debug
|
2013-10-17 09:26:47 +02:00 |
|
|
Kevin Granger
|
89d7b9ab96
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 09:24:59 +02:00 |
|
|
Kevin Granger
|
334d0a01bd
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/helpers/calendar/calendar.tpl
|
2013-10-17 09:24:09 +02:00 |
|
|
Jerome Nadaud
|
a85b931765
|
// Adding compare options
|
2013-10-16 19:07:23 +02:00 |
|
|
Kevin Granger
|
561c036240
|
// calendar
|
2013-10-16 19:03:02 +02:00 |
|
|
Jerome Nadaud
|
6a7990869a
|
// Range datepicker special compare actions
|
2013-10-16 18:26:00 +02:00 |
|
|
Jerome Nadaud
|
6ed8afd1be
|
// Fix names
|
2013-10-16 16:36:05 +02:00 |
|
|
Jerome Nadaud
|
c7f8b30e88
|
// Add compare system to daterange picker
|
2013-10-16 16:30:41 +02:00 |
|
|
gRoussac
|
3ba5905042
|
[-] BO : Could not order by reserved words like 'key'
|
2013-10-16 16:25:40 +02:00 |
|
|
Vincent Augagneur
|
37712f0193
|
//when a module is disabled, first option is enable
|
2013-10-16 16:20:51 +02:00 |
|
|
Vincent Augagneur
|
22df963c72
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-16 16:09:51 +02:00 |
|
|
Vincent Augagneur
|
c684fa13cb
|
//module anchor now use instant search to filter module list
|
2013-10-16 16:09:44 +02:00 |
|
|
Rémi Gaillard
|
7c096d9769
|
// small fix
|
2013-10-16 15:48:52 +02:00 |
|
|
Damien Metzger
|
9492557284
|
// Removed administrator account from the installer, replaced by the superadministrator account
|
2013-10-16 15:40:30 +02:00 |
|
|
Damien Metzger
|
8cfdad9def
|
// Removed currently unused table in the dashboard
|
2013-10-16 15:25:53 +02:00 |
|
|
Rémi Gaillard
|
e493305c47
|
// merge problem
|
2013-10-16 15:08:39 +02:00 |
|
|
Jerome Nadaud
|
dfd00bb064
|
// Add stats date in install
|
2013-10-16 14:44:49 +02:00 |
|
|
Kevin Granger
|
f225fb5f2c
|
// replaced class .row with class .form-group inside forms
|
2013-10-16 14:19:26 +02:00 |
|
|
Vincent Augagneur
|
3e269f211c
|
//blockadvertising now use boostrap design
|
2013-10-16 14:15:22 +02:00 |
|
|
Vincent Augagneur
|
d67be9431a
|
//blocktopmenu now use bootstrap design
|
2013-10-16 13:55:58 +02:00 |
|
|
Kevin Granger
|
bc5b807a7b
|
// graph update
|
2013-10-16 12:18:27 +02:00 |
|
|
Damien Metzger
|
f284777fc4
|
// Removed the trailing (Addons) after the name of the native modules
|
2013-10-16 11:59:36 +02:00 |
|
|
Damien Metzger
|
7c5ff8073f
|
// Code cleaning
|
2013-10-16 11:47:59 +02:00 |
|
|
gRoussac
|
8f9fc10221
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-16 11:45:31 +02:00 |
|
|
gRoussac
|
62aaf16d60
|
[*] FO : New hooks for home tabs
|
2013-10-16 11:44:55 +02:00 |
|
|
Damien Metzger
|
a51f41ca09
|
// Fixed dashboard best sellers
|
2013-10-16 11:42:42 +02:00 |
|
|
Rémi Gaillard
|
2e65214c39
|
// manually merge of modules search
|
2013-10-16 11:36:40 +02:00 |
|
|
Kevin Granger
|
486e6c1b66
|
// datepicker
|
2013-10-16 10:55:47 +02:00 |
|
|
Rémi Gaillard
|
22fd1b84c4
|
Merge pull request #847 from MustangZhong/patch-1
[-] WS: Missing field on Cart::getWsCartRows()
|
2013-10-16 00:58:16 -07:00 |
|
|
Damien Metzger
|
04999f7624
|
// Small fixes
|
2013-10-16 09:43:38 +02:00 |
|
|
Jerome Nadaud
|
476bf72bcc
|
// Ooops
|
2013-10-16 09:21:49 +02:00 |
|
|
MustangZhong
|
ad27dbe8d1
|
Update Cart.php
The field "id_address_delivery" is missing in getWsCartRows.
Since id_address_delivery is required in the web service field definition.
|
2013-10-16 10:14:14 +08:00 |
|
|
Kevin Granger
|
be2ea4ca77
|
// login
|
2013-10-15 20:04:19 +02:00 |
|
|
Rémi Gaillard
|
6ee538c710
|
// fix on ps_cleaner
|
2013-10-15 19:53:59 +02:00 |
|
|
Jerome Nadaud
|
dcbe3cb8e8
|
// Small datapicker fix
|
2013-10-15 19:16:23 +02:00 |
|
|
Jerome Nadaud
|
3aa6976e31
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-15 19:14:51 +02:00 |
|
|
Jerome Nadaud
|
04e760512f
|
// Fix month overlapping on datapicker
|
2013-10-15 19:14:45 +02:00 |
|
|
Rémi Gaillard
|
1b8526cd05
|
// fix ajax on module list
|
2013-10-15 18:35:04 +02:00 |
|
|
Kevin Granger
|
8dce01e633
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-15 18:20:40 +02:00 |
|
|
Jerome Nadaud
|
aefd5947d2
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-15 18:12:28 +02:00 |
|
|
Jerome Nadaud
|
ed2e9bee70
|
// Small datepicker fix
|
2013-10-15 18:12:01 +02:00 |
|
|
Kevin Granger
|
0e7a7f8be4
|
// replace fieldset with div for responsive table
|
2013-10-15 18:09:53 +02:00 |
|
|
Damien Metzger
|
953f4c4686
|
// Fixed login social links
|
2013-10-15 18:08:57 +02:00 |
|
|
Jerome Nadaud
|
a85c1d7933
|
// Add index.php files to dashboard folder
|
2013-10-15 18:05:02 +02:00 |
|
|
Jerome Nadaud
|
2157311f11
|
// Some improvement for range datepicker
|
2013-10-15 18:04:28 +02:00 |
|
|
gRoussac
|
237b950eb6
|
[-] FO : #PSCFV-10640 again, bad assignement
|
2013-10-15 16:35:58 +02:00 |
|
|
Jerome Nadaud
|
6c6c3b240e
|
// Fix bug display final price when country have no display tax
|
2013-10-15 15:06:38 +02:00 |
|
|
gRoussac
|
7ae9832992
|
// small cast
|
2013-10-15 14:56:25 +02:00 |
|
|
gRoussac
|
81497be5ab
|
[-] Fo : Fix bug #PSCFV-10640, redirect loop when country address is not among active countries in OPC
|
2013-10-15 14:53:44 +02:00 |
|
|
Jerome Nadaud
|
5fd6b9aac6
|
// Add overflow-y to module payments
|
2013-10-15 14:53:31 +02:00 |
|