Jerome Nadaud
|
c5b3d20b96
|
// Fix empty file list on add
|
2013-11-08 18:05:56 +01:00 |
|
Jerome Nadaud
|
bdc996d13b
|
// Wrong col size
|
2013-11-08 17:58:09 +01:00 |
|
Jerome Nadaud
|
217a79eeae
|
// Unify thumb param in files options
|
2013-11-08 17:49:56 +01:00 |
|
Jerome Nadaud
|
9065a73998
|
// Remove flags
|
2013-11-08 17:21:36 +01:00 |
|
Kevin Granger
|
00a72a5f68
|
// skin uploader button
|
2013-11-08 16:56:12 +01:00 |
|
Jerome Nadaud
|
bf67bd56a3
|
// Add uploader to products controller
|
2013-11-08 16:29:07 +01:00 |
|
Kevin Granger
|
b214ea68ff
|
// mobile nav
|
2013-11-08 16:18:28 +01:00 |
|
gRoussac
|
7eb70486e0
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-11-08 15:54:28 +01:00 |
|
gRoussac
|
ebc3dfee62
|
[-] BO : Fix css bug #PSCFV-10899, fixed fix-toolbar z-index
|
2013-11-08 15:54:13 +01:00 |
|
Shagshag
|
c7f1fcb49a
|
kb was not translatable
|
2013-11-08 15:33:49 +01:00 |
|
Kevin Granger
|
42af175d22
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-07 21:49:11 +01:00 |
|
Kevin Granger
|
9c4ee27f20
|
// mobile nav WIP
|
2013-11-07 21:48:55 +01:00 |
|
Jerome Nadaud
|
4d1a4393a9
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-07 17:58:32 +01:00 |
|
Jerome Nadaud
|
8a4c036655
|
// Fix cache problem
|
2013-11-07 17:58:17 +01:00 |
|
Rémi Gaillard
|
f5c133f6e0
|
// small fix
|
2013-11-07 17:50:28 +01:00 |
|
Rémi Gaillard
|
2d609ec93c
|
// merge fixes
|
2013-11-07 17:43:26 +01:00 |
|
Rémi Gaillard
|
e3cfacb90e
|
// link to employee default tab and not index
|
2013-11-07 17:00:55 +01:00 |
|
Jerome Nadaud
|
01d8376ee7
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-07 16:48:56 +01:00 |
|
Jerome Nadaud
|
18718792be
|
// Uploader helper part 3
|
2013-11-07 16:42:00 +01:00 |
|
PhpMadman
|
c6676197e5
|
// better syntax
|
2013-11-07 14:57:13 +01:00 |
|
PhpMadman
|
0a31ab8202
|
added check for empty value
|
2013-11-07 14:51:05 +01:00 |
|
Kevin Granger
|
3eb9a7e772
|
// update bootstrap + add enquire.js
|
2013-11-07 14:19:23 +01:00 |
|
PhpMadman
|
2f1a82628c
|
// Fixes "Notice: Undefined index: nb_results in"
|
2013-11-07 09:00:00 +01:00 |
|
Kevin Granger
|
866e7f831b
|
// fixs highlight search
|
2013-11-06 19:26:22 +01:00 |
|
Kevin Granger
|
93717e910b
|
// Repairs sake of performance on tables with many lines.
|
2013-11-06 18:15:17 +01:00 |
|
Jerome Nadaud
|
7895f8643e
|
// Fix missing page header in combinations generator
|
2013-11-06 14:42:56 +01:00 |
|
gRoussac
|
1fb8ef823d
|
[-] BO : Fix bug #PSCFV-10937, bad escaping for var product_prices in prices.tpl
|
2013-11-06 11:50:52 +01:00 |
|
PhpMadman
|
eac7fbb694
|
[-] BO : Cart was not using order reference, corrected syntax
|
2013-11-06 11:06:46 +01:00 |
|
PhpMadman
|
7226f33f90
|
[-] BO : Cart was not using order reference
|
2013-11-05 20:42:57 +01:00 |
|
Kevin Granger
|
5ec5215919
|
// UI modules fixs
|
2013-11-05 18:17:39 +01:00 |
|
Vincent Augagneur
|
37e0556c36
|
//fixed carrier logo upload
|
2013-11-05 18:12:53 +01:00 |
|
Kevin Granger
|
b68d8c5d4a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-05 17:15:51 +01:00 |
|
Kevin Granger
|
332101614a
|
// moved nv.d3.css to vendor directory
|
2013-11-05 17:15:36 +01:00 |
|
Vincent Augagneur
|
657c8f415a
|
//small css fix
|
2013-11-05 17:01:38 +01:00 |
|
Kevin Granger
|
2581acd505
|
// fix tooltip carrier wizard
|
2013-11-05 16:52:41 +01:00 |
|
Kevin Granger
|
e702af6a67
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/css/admin-theme.css
|
2013-11-05 16:42:09 +01:00 |
|
Kevin Granger
|
533ebc0f6d
|
// backward CSS
|
2013-11-05 16:40:21 +01:00 |
|
Damien Metzger
|
161c701ecf
|
// Groups review
|
2013-11-05 16:30:34 +01:00 |
|
Damien Metzger
|
0e4a900d3d
|
// Fixed group display
|
2013-11-05 16:13:52 +01:00 |
|
Damien Metzger
|
b0ae53f823
|
// Changed cursor in the module position tab (for drag n drop)
|
2013-11-05 15:14:58 +01:00 |
|
Kevin Granger
|
eb383e580e
|
// Organize css/sass + backward compatibility WIP
|
2013-11-05 12:32:41 +01:00 |
|
Jerome Nadaud
|
de8bd97831
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-04 19:50:48 +01:00 |
|
Jerome Nadaud
|
cf44f8d0b4
|
// Uploader helper small fix
|
2013-11-04 19:50:04 +01:00 |
|
Kevin Granger
|
fbc93e5632
|
// moved admin css and backward compatibility css to admin theme css directory
|
2013-11-04 19:48:53 +01:00 |
|
Damien Metzger
|
8dc29b20f0
|
// Code cleaning and dashgoals improvements (part 1 - not finished yet)
|
2013-11-04 18:52:27 +01:00 |
|
Jerome Nadaud
|
fa68e015b3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-11-04 18:34:51 +01:00 |
|
Jerome Nadaud
|
bf2d54e286
|
// Add new uploader helper to blockcategories
|
2013-11-04 18:32:59 +01:00 |
|
Kevin Granger
|
8aedd4eb04
|
// Cleaned CSS files
|
2013-11-04 18:31:59 +01:00 |
|
Jerome Nadaud
|
d78a268730
|
// Uploader helper part 2
|
2013-11-04 18:31:43 +01:00 |
|
Jerome Nadaud
|
5af2ef38a1
|
// Fix Tagify javascript error
|
2013-11-04 17:47:27 +01:00 |
|