Kevin Granger
896d8ce494
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-20 11:57:44 +01:00
Jerome Nadaud
7ab256d28f
// Small fix in customer order private note
2013-11-20 11:04:39 +01:00
Kevin Granger
369ac0f664
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
admin-dev/themes/default/template/controllers/modules/configure.tpl
2013-11-18 15:13:04 +01:00
Jerome Nadaud
2ba5dc18fd
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
modules/themeconfigurator/themeconfigurator.php
2013-11-18 14:49:27 +01:00
Jerome Nadaud
46dc93fd7e
// Adding update button on to page header toolbar on module
2013-11-18 14:41:49 +01:00
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
Jérôme Nadaud
8166bb662c
Merge pull request #984 from soware/development
...
Update form.tpl
2013-11-18 01:01:00 -08:00
soware
e5f0bcb916
Update form.tpl
...
I removed the line 109 because the price tab problem and because this line is redundant. The first show (line 95) always is executed.
If the price is saved twice, the second the div #product-tab-content-wait never is hided and show the loading forever.
It is because the line 109 show this tab again, in the sequence: show (line 95), hide (line 213), show (line 109).
This happening just for price tab.
2013-11-16 00:37:47 -02: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
Jerome Nadaud
96def5033f
// typo
2013-11-15 17:19:12 +01:00
Jerome Nadaud
9fa2299c6b
// Open prestashop.com link in new window
2013-11-15 11:56:23 +01:00
gRoussac
152960639f
[-] BO : Product final price can not be hidden on loading tab, report of https://github.com/PrestaShop/PrestaShop/commit/6c6c3b240ee2249b7f99be1a112905cd0edbee46
2013-11-15 11:36:07 +01:00
gRoussac
7526fe4766
// missing trailing semi-column
2013-11-15 11:16:48 +01:00
Jerome Nadaud
80957666cf
// Hide collapse and expand button when not necessary
2013-11-14 19:21:31 +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
Kevin Granger
a0f73d20e5
// backward compatibility remix WIP
2013-11-13 20:11:22 +01:00
Jerome Nadaud
aa81e2607f
// First boostraping pass on blocklayered module
2013-11-13 15:31:30 +01:00
Rémi Gaillard
4a9383bbcf
// small fix
2013-11-13 11:15:48 +01:00
Kevin Granger
4fbc8deaa8
// fix products
2013-11-12 18:21:36 +01:00
gRoussac
5e4382eb08
[-] BO : Fix bug #PSCFV-10982 reduction group truncated
2013-11-12 17:55:07 +01:00
Kevin Granger
4e06b1fdd5
// update Bootstrap 3.0.2 + fix tree header
2013-11-12 14:50:19 +01:00
gRoussac
19da345531
[-] BO : Could not check all modules after ajax call
2013-11-10 21:51:14 +01:00
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
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
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
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
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
Vincent Augagneur
657c8f415a
//small css fix
2013-11-05 17:01:38 +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
Jerome Nadaud
de8bd97831
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 19:50:48 +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
Jerome Nadaud
5af2ef38a1
// Fix Tagify javascript error
2013-11-04 17:47:27 +01:00
Damien Metzger
ac1f142f23
// Moved default_language
2013-11-04 17:08:17 +01:00
Damien Metzger
e8c0195ee9
// small fix merge
2013-11-04 17:04:09 +01:00
gRoussac
c44b1d617c
[-] BO : Could not change image position
2013-11-04 16:59:03 +01:00
Kevin Granger