 Kevin Granger
|
73ec191fb0
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/modules/configure.tpl
|
2013-11-18 10:23:23 +01:00 |
|
|
rGaillard
|
68c8e9da57
|
// move to themeconfigurator
|
2013-11-16 19:24:03 +01:00 |
|
|
Jérôme Nadaud
|
de9e6d72c8
|
// Typo
|
2013-11-16 08:04:59 +01:00 |
|
|
Jérôme Nadaud
|
3a58cb2a91
|
Merge pull request #983 from PrestaEdit/patch-60
//typo
|
2013-11-15 22:13:22 -08:00 |
|
|
PrestaEdit
|
9b787c454f
|
//typo
|
2013-11-16 01:21:56 +01:00 |
|
|
rGaillard
|
8c3eb9b9a4
|
// typo
|
2013-11-15 21:03:17 +01:00 |
|
|
Damien Metzger
|
b62952accf
|
[*] BO : Added simulation mode to the dashboard
|
2013-11-15 18:07:23 +01:00 |
|
|
Rémi Gaillard
|
4bd7164507
|
Merge pull request #982 from TMMeilleur/bootstrap
// added responsive rich menu and small fix in blockbanner
|
2013-11-15 08:47:58 -08:00 |
|
|
TMMeilleur
|
a5d9daff13
|
added responsive rich menu and small fix in blockbanner
|
2013-11-15 18:40:17 +02:00 |
|
|
Jerome Nadaud
|
96def5033f
|
// typo
|
2013-11-15 17:19:12 +01:00 |
|
|
Jerome Nadaud
|
8cd1d623e5
|
// Fix error if default blockbanner image is missing
|
2013-11-15 17:13:50 +01:00 |
|
|
Jerome Nadaud
|
19cfa443d2
|
// fix dashgoals configuration fields size
|
2013-11-15 17:04:55 +01:00 |
|
|
Jerome Nadaud
|
5fb4ac5044
|
// Fix missing last actions button in tracking controller list
|
2013-11-15 16:25:31 +01:00 |
|
|
Jerome Nadaud
|
8d90578cf7
|
// Add anchor to list
|
2013-11-15 16:04:27 +01:00 |
|
|
Jerome Nadaud
|
ece4331622
|
//Fix addsharethis error
|
2013-11-15 15:38:51 +01:00 |
|
|
Jerome Nadaud
|
3af7a59caa
|
// Add version number to addsharethis
|
2013-11-15 15:32:52 +01:00 |
|
|
Jerome Nadaud
|
b5d84a72e0
|
// AddShareThis fix
|
2013-11-15 15:31:01 +01:00 |
|
|
Jerome Nadaud
|
44f89053e4
|
// Invoice search fix
|
2013-11-15 15:00:56 +01:00 |
|
|
Jerome Nadaud
|
9fa2299c6b
|
// Open prestashop.com link in new window
|
2013-11-15 11:56:23 +01:00 |
|
|
Jerome Nadaud
|
d7de507f42
|
// Product comments
|
2013-11-15 11:49:40 +01:00 |
|
|
Jerome Nadaud
|
a66d2e1ab6
|
// Fix form name
|
2013-11-15 09:18:41 +01:00 |
|
|
Jerome Nadaud
|
c2d956ec7d
|
// Modif after specs change
|
2013-11-15 08:58:30 +01:00 |
|
|
Jerome Nadaud
|
29f65da5ca
|
// Add wish list button to blockwishlist module
|
2013-11-14 19:54:28 +01:00 |
|
|
Rémi Gaillard
|
7fcbf8aa7c
|
Merge pull request #977 from TMMeilleur/bootstrap
//updates and fixes 14.11.2013
|
2013-11-14 10:28:06 -08:00 |
|
|
Jerome Nadaud
|
80957666cf
|
// Hide collapse and expand button when not necessary
|
2013-11-14 19:21:31 +01:00 |
|
|
TMMeilleur
|
0d1c113be1
|
updates and fixes 14.11.2013
|
2013-11-14 18:08:05 +02:00 |
|
|
Jerome Nadaud
|
051ed32133
|
// Add toggle to datepicker button
|
2013-11-14 16:05:58 +01:00 |
|
|
Jerome Nadaud
|
4a46960112
|
// Small bootstrap fix
|
2013-11-14 16:00:22 +01:00 |
|
|
Jerome Nadaud
|
18a2e026ef
|
// Adding more buttons to module configuration
|
2013-11-14 15:49:17 +01:00 |
|
|
Jerome Nadaud
|
8f81af0463
|
// fix on blockcategories
|
2013-11-14 15:12:08 +01:00 |
|
|
Jerome Nadaud
|
67eeae0fa2
|
// Set visibility on help button
|
2013-11-14 14:42:35 +01:00 |
|
|
Jerome Nadaud
|
299a8e9e9f
|
// Update attributes group title
|
2013-11-14 14:13:28 +01:00 |
|
|
Jerome Nadaud
|
09b908204b
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-14 11:52:34 +01:00 |
|
|
Jerome Nadaud
|
87faae9717
|
// Add top menu to blockcategories
|
2013-11-14 11:52:24 +01:00 |
|
|
Vincent Augagneur
|
9a0b308846
|
//remove preactivationLink ajax and move in gamification module
|
2013-11-14 10:54:29 +01:00 |
|
|
Jerome Nadaud
|
63ef0b82e6
|
// Categories thumbnail images for blocktopmenu
|
2013-11-14 10:37:07 +01:00 |
|
|
Jerome Nadaud
|
232309996b
|
// Fix blocklayered bootstrap
|
2013-11-14 10:35:02 +01:00 |
|
|
Jerome Nadaud
|
27731f3bb2
|
// Bootstraping blocklayered backoffice and ajax fix
|
2013-11-13 20:13:42 +01:00 |
|
|
Kevin Granger
|
a0f73d20e5
|
// backward compatibility remix WIP
|
2013-11-13 20:11:22 +01:00 |
|
|
Jerome Nadaud
|
afaeb15b7d
|
// Define default template dir on tree class
|
2013-11-13 20:10:13 +01:00 |
|
|
Francois Gaillard
|
c9a2410c57
|
[-] Classes : AdminController - Changed admin-theme.css position
|
2013-11-13 17:48:21 +01:00 |
|
|
Rémi Gaillard
|
3b1168a032
|
Merge pull request #974 from TMMeilleur/bootstrap
// added transforming for mobile view and other small fixes
|
2013-11-13 08:43:43 -08:00 |
|
|
Alexander Grosul
|
ae596ebcd4
|
added transforming for mobile view and other small fixes
|
2013-11-13 18:34:34 +02:00 |
|
|
Rémi Gaillard
|
fa3aa8c9d7
|
// strict standard
|
2013-11-13 15:46:06 +01:00 |
|
|
Jerome Nadaud
|
aa81e2607f
|
// First boostraping pass on blocklayered module
|
2013-11-13 15:31:30 +01:00 |
|
|
Rémi Gaillard
|
899dea47a1
|
// oups
|
2013-11-13 15:32:56 +01:00 |
|
|
Rémi Gaillard
|
2fe12b965b
|
[-] Core: add possibility to choose the position of your css files
|
2013-11-13 15:31:29 +01:00 |
|
|
Rémi Gaillard
|
f7e1229e16
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-13 11:58:24 +01:00 |
|
|
Rémi Gaillard
|
24a4694000
|
// small clean
|
2013-11-13 11:58:11 +01:00 |
|
|
Vincent Augagneur
|
5963871a01
|
//small fix
|
2013-11-13 11:40:13 +01:00 |
|