 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 |
|
|
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
|
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 |
|
|
Damien Metzger
|
087d0d8206
|
// Fields resizing
|
2013-10-25 11:25:13 +02:00 |
|
|
Damien Metzger
|
0ca5a24e84
|
// Added field (bootstrap) size in helper form
|
2013-10-25 10:16:39 +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 |
|
|
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 |
|
|
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 |
|
|
Kevin Granger
|
7a8cdf3913
|
// admin create order WIP
|
2013-10-23 18:54:44 +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 |
|
|
Jerome Nadaud
|
45ea4aefad
|
// Fix Combinations ajax problem
|
2013-10-23 10:50:18 +02:00 |
|
|
Damien Metzger
|
9d3f3d1876
|
// Fixed warning in admin customer tpl
|
2013-10-23 09:32:48 +02:00 |
|
|
Gregory Roussac
|
5bb4d48ddd
|
Merge pull request #870 from djfm/development
[*] LO : Fixed a few bugs with currency formats in Back-Office orders
|
2013-10-22 10:17:11 -07:00 |
|
|
Jerome Nadaud
|
67fc91e2c9
|
// Categories thumbnails
|
2013-10-22 17:43:10 +02:00 |
|
|
Jerome Nadaud
|
a7c7bc68a3
|
// Fix products form content
|
2013-10-22 13:38:47 +02:00 |
|
|
Kevin Granger
|
aa95454c4e
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/images/content.tpl
|
2013-10-22 10:07:03 +02:00 |
|
|
Kevin Granger
|
eb82297f45
|
// small fixs
|
2013-10-22 10:04:45 +02:00 |
|
|
gRoussac
|
2aa52356ad
|
[-] BO : Fix bug #PSCFV-10607 one upload name
|
2013-10-22 09:39:59 +02:00 |
|
|
Jerome Nadaud
|
3ba337f19a
|
// Image preference bootstraping
|
2013-10-22 09:25:05 +02:00 |
|
|
Jerome Nadaud
|
f336cc599b
|
// Btn-primary replacement
|
2013-10-21 18:56:41 +02:00 |
|
|
Damien Metzger
|
bf6c57063c
|
// Fixed dashboard style
|
2013-10-21 18:18:48 +02:00 |
|
|
gRoussac
|
7c7fe5dc0b
|
// small change
|
2013-10-21 12:39:48 +02:00 |
|
|
gRoussac
|
15cd0b9fbc
|
[-] BO : Report of https://github.com/PrestaShop/PrestaShop/commit/fd86a29c5c369ec5da0f91bbe97c584a00d02d0d
|
2013-10-21 12:21:49 +02:00 |
|
|
Jerome Nadaud
|
9c4b975cfc
|
//Module uploader bootstraping
|
2013-10-21 11:31:50 +02:00 |
|
|
Jerome Nadaud
|
81042db718
|
// CSV import uploader bootstraping
|
2013-10-21 11:24:56 +02:00 |
|
|
Vincent Augagneur
|
fd86a29c5c
|
//small fix
|
2013-10-21 09:50:20 +02:00 |
|
|
Kevin Granger
|
067eecdc70
|
// small fix
|
2013-10-18 19:07:03 +02:00 |
|
|
Kevin Granger
|
04b4e548f3
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-18 18:38:17 +02:00 |
|
|
Kevin Granger
|
5f52a9e171
|
// fix products
|
2013-10-18 18:38:02 +02:00 |
|