 Stanislav Yordanov
|
e7e514dc77
|
Removed unused local variable, tab added, phpdoc tags fixed
|
2013-11-14 16:41:08 +02: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 |
|
|
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 |
|
|
Rémi Gaillard
|
4a9383bbcf
|
// small fix
|
2013-11-13 11:15:48 +01:00 |
|
|
Rémi Gaillard
|
115c368a89
|
Merge pull request #970 from alexey-svistunov/bootstrap
//Frontend updates.
|
2013-11-13 01:29:22 -08:00 |
|
|
Vincent Augagneur
|
746d8de9c7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-13 10:09:07 +01:00 |
|
|
Vincent Augagneur
|
5d0117c5ed
|
//added configuration in sql request in dashactivity
|
2013-11-13 10:08:57 +01:00 |
|
|
Jerome Nadaud
|
2cbf8af2b2
|
// Cms title
|
2013-11-13 09:36:58 +01:00 |
|
|
Vincent Augagneur
|
582ad68875
|
added default configuration value for dashproducts
|
2013-11-13 09:27:48 +01:00 |
|
|
Vincent Augagneur
|
55fa826525
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-13 09:07:54 +01:00 |
|
|
Vincent Augagneur
|
e7869f6b19
|
//added default configuration value for dashactivity
|
2013-11-13 09:07:44 +01:00 |
|
|
alexey-svistunov
|
a7aea1d018
|
Updating styles
|
2013-11-13 10:01:04 +02:00 |
|
|
alexey-svistunov
|
e7abdee44a
|
Merge remote-tracking branch 'upstream/bootstrap' into bootstrap
|
2013-11-13 09:59:11 +02:00 |
|
|
Kevin Granger
|
4fbc8deaa8
|
// fix products
|
2013-11-12 18:21:36 +01:00 |
|
|
Vincent Augagneur
|
52abf62ae1
|
//dashactivity config
|
2013-11-12 17:33:54 +01:00 |
|
|
Kevin Granger
|
4e06b1fdd5
|
// update Bootstrap 3.0.2 + fix tree header
|
2013-11-12 14:50:19 +01:00 |
|
|
Vincent Augagneur
|
c6e34ee229
|
//dashproducts added section in tpl
|
2013-11-12 14:43:08 +01:00 |
|
|
Vincent Augagneur
|
249bd5437d
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-12 14:41:11 +01:00 |
|
|
Vincent Augagneur
|
cf9da09f98
|
//remove unused smarty variable
|
2013-11-12 14:40:58 +01:00 |
|
|
Jerome Nadaud
|
c7fff6b20d
|
// Change edit title on employees controller
|
2013-11-12 12:05:00 +01:00 |
|
|
Jerome Nadaud
|
d6df601d0e
|
// Preferences identrifer names
|
2013-11-12 11:55:54 +01:00 |
|
|
Jerome Nadaud
|
0430d09753
|
// Better php def for Page header title edit and view
|
2013-11-12 11:36:26 +01:00 |
|
|
Jerome Nadaud
|
fe387fa8ed
|
// Set Identifier name for search engine
|
2013-11-12 11:30:26 +01:00 |
|
|
Jerome Nadaud
|
ec37efdf8b
|
// Add identifier name
|
2013-11-12 11:30:01 +01:00 |
|
|
Jerome Nadaud
|
94817a9371
|
// ooops
|
2013-11-12 11:16:31 +01:00 |
|
|
Jerome Nadaud
|
db0e1e41a9
|
// Small Fix
|
2013-11-12 11:10:55 +01:00 |
|
|
Kevin Granger
|
3f83edc7e1
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-12 11:07:44 +01:00 |
|
|
Kevin Granger
|
4a6346b295
|
// adjustment on switch
|
2013-11-12 11:07:30 +01:00 |
|
|
Jerome Nadaud
|
41196f3c5f
|
// General modification for view and edit title
|
2013-11-12 11:06:20 +01:00 |
|
|
Jerome Nadaud
|
44d1ed0982
|
// Add category name to page header title
|
2013-11-12 10:45:17 +01:00 |
|
|
Kevin Granger
|
2a982e96f1
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-12 10:44:08 +01:00 |
|
|
Kevin Granger
|
5ca23d44a6
|
// label with tooltip
|
2013-11-12 10:43:52 +01:00 |
|
|
Jerome Nadaud
|
3931914203
|
// Add Modernizr and Modernizr-loads check and loading for unsuported browsers
|
2013-11-12 09:54:20 +01:00 |
|
|
Alexey Svistunov
|
97d14e5b08
|
Added changes from commit 88aa49e TMMeilleur
|
2013-11-11 11:30:24 +02:00 |
|
|
Rémi Gaillard
|
d7dd85d7d0
|
Merge pull request #955 from alexey-svistunov/bootstrap
Added changes from eb94b51 TMMeilleur/PrestaShop
|
2013-11-08 11:25:25 -08:00 |
|