 Gregory Roussac
|
cbf2e6b65b
|
Merge pull request #848 from djfm/bootstrap
// correct use of translation functions
|
2013-10-17 06:36:20 -07:00 |
|
|
Jerome Nadaud
|
0393e6bc6d
|
// Date Range Picker improvement
|
2013-10-17 15:28:47 +02:00 |
|
|
djfm
|
fc896f6a48
|
// correct use of translation functions
|
2013-10-17 13:20:00 +00:00 |
|
|
Kevin Granger
|
1097bb56f9
|
// calendar
|
2013-10-17 14:35:51 +02:00 |
|
|
Jerome Nadaud
|
185c518d3d
|
// Force cast on select filter
|
2013-10-17 14:06:48 +02:00 |
|
|
Kevin Granger
|
b391d833d3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 14:01:50 +02:00 |
|
|
Kevin Granger
|
9abb9a9b15
|
// removed version fix bootstrap, please report forms where margin could miss between fields (.row => .form-group)
|
2013-10-17 14:01:26 +02:00 |
|
|
Kevin Granger
|
dc43c0f7d3
|
// fix delete categories
|
2013-10-17 13:50:14 +02:00 |
|
|
Jerome Nadaud
|
99f66e26d0
|
// Change datepicker class
|
2013-10-17 13:24:46 +02:00 |
|
|
Jerome Nadaud
|
1f93d071c2
|
// Add transplant module button to page header toolbar
|
2013-10-17 13:24:01 +02:00 |
|
|
Jerome Nadaud
|
983b4dd617
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 11:41:10 +02:00 |
|
|
Jerome Nadaud
|
cee6c2b2d6
|
// Add class to calendar.tpl
|
2013-10-17 11:40:58 +02:00 |
|
|
Kevin Granger
|
193d3921fa
|
// calendar date range picker compare
|
2013-10-17 11:40:02 +02:00 |
|
|
Jerome Nadaud
|
f9b115a2f8
|
// Date Range picker improvements
|
2013-10-17 11:39:02 +02:00 |
|
|
gRoussac
|
b67a78f9dd
|
[-] Fo : Fix bug #PSCFV-10640, redirect loop when country address is not among active countries in OPC
|
2013-10-17 11:37:45 +02:00 |
|
|
Vincent Augagneur
|
d1ee6e6357
|
//small fix
|
2013-10-17 11:27:30 +02:00 |
|
|
Kevin Granger
|
ca1a03e81d
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 11:22:17 +02:00 |
|
|
Kevin Granger
|
86ef9b5461
|
// calendar
|
2013-10-17 11:22:03 +02:00 |
|
|
Jerome Nadaud
|
6ed7ffc647
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-17 09:37:37 +02:00 |
|
|
Jerome Nadaud
|
1f50e074f7
|
// New order button fix
|
2013-10-17 09:37:19 +02:00 |
|
|
Damien Metzger
|
fba95afdcc
|
// Removed deprecated modules
|
2013-10-17 09:37:01 +02:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|