 gRoussac
|
2dbaa5f73b
|
[-] BO : Fix bug #10689, could not set image legend in back office
|
2013-10-27 22:49:25 +01:00 |
|
|
Damien Metzger
|
6f04df8409
|
// Fixed icon
|
2013-10-25 19:06:03 +02:00 |
|
|
Damien Metzger
|
39f6a2354a
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
classes/helper/HelperForm.php
classes/helper/HelperUploader.php
|
2013-10-25 18:58:07 +02:00 |
|
|
Damien Metzger
|
03857c0576
|
[*] BO : you can know download the previous file near the upload file input
|
2013-10-25 18:55:25 +02:00 |
|
|
Jerome Nadaud
|
8be88324f9
|
// Add internet explorer 9 Compat
|
2013-10-25 18:13:25 +02:00 |
|
|
Jerome Nadaud
|
5ea880b793
|
// XHTML norm
|
2013-10-25 17:37:08 +02:00 |
|
|
Rémi Gaillard
|
c67e71ca59
|
// layout fix
|
2013-10-25 17:30:10 +02:00 |
|
|
Kevin Granger
|
50bc046671
|
// fix panel header tree actions (search + button)
|
2013-10-25 17:24:49 +02:00 |
|
|
Rémi Gaillard
|
180b180aee
|
// small changes
|
2013-10-25 16:24:57 +02:00 |
|
|
Jerome Nadaud
|
f472f3e848
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-25 15:55:39 +02:00 |
|
|
Jerome Nadaud
|
f89c8ed008
|
// Fix HelperUploader images params
|
2013-10-25 15:54:53 +02:00 |
|
|
Damien Metzger
|
aa322e4777
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/css/admin-theme.css
|
2013-10-25 15:22:01 +02:00 |
|
|
Damien Metzger
|
e8d5dc8a62
|
[*] BO : search results improvements (no unaccessible tabs, better display, better information)
|
2013-10-25 15:19:03 +02:00 |
|
|
Kevin Granger
|
339f428c23
|
// fix login - (tabindex, loading, ellipsis)
|
2013-10-25 14:58:10 +02:00 |
|
|
Jerome Nadaud
|
08baa71a05
|
// Fix on color field in list
|
2013-10-25 14:29:30 +02:00 |
|
|
Jerome Nadaud
|
8d1765f2df
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
controllers/admin/AdminCategoriesController.php
|
2013-10-25 14:29:02 +02:00 |
|
|
Jerome Nadaud
|
bff1ad8833
|
// Some changes to integrate uploader helper
|
2013-10-25 14:20:42 +02:00 |
|
|
Jerome Nadaud
|
52795495bd
|
//Starting Uploader helper
|
2013-10-25 14:19:51 +02:00 |
|
|
Damien Metzger
|
087d0d8206
|
// Fields resizing
|
2013-10-25 11:25:13 +02:00 |
|
|
Kevin Granger
|
ddf65f3b97
|
// toolbar nav fixs
|
2013-10-25 10:33:45 +02:00 |
|
|
Damien Metzger
|
0ca5a24e84
|
// Added field (bootstrap) size in helper form
|
2013-10-25 10:16:39 +02:00 |
|
|
Jerome Nadaud
|
139ee8f62d
|
// Move back button to left
|
2013-10-25 09:29:42 +02:00 |
|
|
Jerome Nadaud
|
3850cc94d5
|
// Align save button to right
|
2013-10-25 09:18:00 +02:00 |
|
|
Kevin Granger
|
acfc3bc266
|
// fixe buttons group wrap
|
2013-10-24 19:34:25 +02:00 |
|
|
Damien Metzger
|
cd5fa81025
|
// Fixed boulette
|
2013-10-24 19:29:22 +02:00 |
|
|
Damien Metzger
|
4cb7bd9137
|
// Changed label
|
2013-10-24 19:19:20 +02:00 |
|
|
Damien Metzger
|
8748b0d240
|
// Small improvements
|
2013-10-24 19:12:50 +02:00 |
|
|
Jerome Nadaud
|
6f57093f50
|
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
|
2013-10-24 18:36:36 +02:00 |
|
|
gRoussac
|
759fe2f671
|
// norms
|
2013-10-24 18:09:21 +02:00 |
|
|
Damien Metzger
|
5ff406cdb8
|
// css
|
2013-10-24 18:09:11 +02:00 |
|
|
Gregory Roussac
|
0416aca547
|
Merge pull request #889 from PhpMadman/PSCFV-10728
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
|
2013-10-24 09:06:43 -07:00 |
|
|
Damien Metzger
|
f6dd4a9ee4
|
// Code review
|
2013-10-24 17:49:18 +02:00 |
|
|
PhpMadman
|
c516035e0e
|
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
|
2013-10-24 17:19:28 +02:00 |
|
|
Damien Metzger
|
df639337af
|
// Code cleaning and small fixes
|
2013-10-24 17:04:55 +02:00 |
|
|
Damien Metzger
|
d2ff076eb1
|
// Removed useless alert
|
2013-10-24 16:43:41 +02:00 |
|
|
indesign47
|
84454bbc1c
|
[*] BO : AdminImport add img manufacturers-suppliers
|
2013-10-24 16:16:29 +02:00 |
|
|
Rémi Gaillard
|
691e45a168
|
// delete useless file
|
2013-10-24 15:23:03 +02:00 |
|
|
Rémi Gaillard
|
971722a13f
|
// note updated by ajax in admincustomers should be url encoded
|
2013-10-24 11:56:50 +02:00 |
|
|
Rémi Gaillard
|
4bfd8dee11
|
// note updated by ajax in admincustomers should be url encoded
|
2013-10-24 11:51:48 +02:00 |
|
|
Damien Metzger
|
e17dd1fdde
|
// theme installation
|
2013-10-24 09:49:46 +02:00 |
|
|
Kevin Granger
|
7a8cdf3913
|
// admin create order WIP
|
2013-10-23 18:54:44 +02:00 |
|
|
Sarah Lorenzini
|
7a23c169d6
|
// update css mail template
|
2013-10-23 17:58:28 +02:00 |
|
|
Jerome Nadaud
|
16dfea95e3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-23 16:49:05 +02:00 |
|
|
Jerome Nadaud
|
a27f8bc999
|
// Fix Stats datepicker
|
2013-10-23 16:48:55 +02:00 |
|
|
Damien Metzger
|
9930c375c7
|
// Dashgoals :)
|
2013-10-23 15:37:43 +02:00 |
|
|
Jerome Nadaud
|
ff3455be78
|
// Products combinations form bootstraping
|
2013-10-23 15:03:28 +02:00 |
|
|
Jerome Nadaud
|
c30d103410
|
// Check if exist children opt. in employees
|
2013-10-23 14:49:22 +02:00 |
|
|
Jerome Nadaud
|
0bf6410773
|
//Fix save and stay combinations problem
|
2013-10-23 12:10:36 +02:00 |
|
|
Rémi Gaillard
|
8662ef12b4
|
// small changes on orders view
|
2013-10-23 11:59:28 +02:00 |
|
|
Kevin Granger
|
5ee716ff9e
|
// fix admin edit countries
|
2013-10-23 11:18:31 +02:00 |
|