483dbd7b53
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
# By Sarah Lorenzini (1) and sLorenzini (1)
# Via Sarah Lorenzini
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop :
// update shipping tab
// update shipping tab
Conflicts:
admin-dev/themes/default/template/helpers/options/options.tpl
2013-07-29 16:21:31 +02:00
ae225dce4c
// WIP customer
2013-07-29 16:16:10 +02:00
b528b7b6fc
// update shipping tab
2013-07-29 16:13:07 +02:00
101d9283ae
// update wizard
2013-07-29 15:12:50 +02:00
243834ee17
// update shipping tab
2013-07-29 14:14:00 +02:00
c1b0d32d32
[-] Carrier Wizard: fix
2013-07-29 13:57:31 +02:00
0de4642d09
[*] BO : Proposition : IMPROVEMENT Admin Modules Positions
...
You can see in action over there :
http://www.youtube.com/watch?v=e7KXuCU3RIM
2013-07-29 12:35:02 +01:00
2ac6ada03d
// update order tab
2013-07-29 11:01:48 +02:00
94de4d3d2f
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
# By Jérôme Nadaud
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop :
[-] BO : Order template misplaced empty form
[+] BO : Handler invoice date generation button
2013-07-26 18:55:18 +02:00
9f9c0ef416
[+] BO Orders
2013-07-26 18:54:28 +02:00
0ef7578f26
[-] BO : Order template misplaced empty form
2013-07-26 18:43:40 +02:00
c0cf92cbdf
[+] BO: Add a wizard to create and edit your carriers
2013-07-26 18:27:21 +02:00
c1e4b812f9
// update "create order" tab
2013-07-26 16:33:52 +02:00
1a2b78b00f
[+] BO Invoices
2013-07-26 15:34:11 +02:00
3287ff5300
[+] BO : Product attachment "For"
2013-07-26 15:32:04 +02:00
7db1fb89ec
[+] BO : Products customization "For"
2013-07-26 15:09:14 +02:00
5c52ba31e9
[+] BO : Products quantities "For" and small template fix
2013-07-26 15:03:29 +02:00
3c035324f4
// update order tab
2013-07-26 12:15:23 +02:00
8b7c29dd18
[+] BO Scenes - Tags - Attachments
2013-07-26 11:12:50 +02:00
72b046d5f0
[+] BO Manufacturers
2013-07-26 10:21:23 +02:00
9e5bbac559
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
# By Jérôme Nadaud (4) and sLorenzini (1)
# Via Jérôme Nadaud
* 'bootstrap' of https://github.com/PrestaShop/PrestaShop :
[-] BO : BugFix Cancel modification button error
[+] BO : Product "For" and combination button
// update order tab
[+] BO : Product "For"
[+] BO : Product "For" and new carriers select list
Conflicts:
admin-dev/themes/default/css/admin-theme.css
2013-07-25 19:21:59 +02:00
9308c5c527
no message
2013-07-25 19:18:54 +02:00
07000c1f66
[-] BO : BugFix Cancel modification button error
2013-07-25 18:15:41 +02:00
ce5355415b
[+] BO : Product "For" and combination button
2013-07-25 17:53:09 +02:00
832f5cf0dd
// update order tab
2013-07-25 16:53:18 +02:00
76c87044de
[+] BO : Product "For"
2013-07-25 16:44:52 +02:00
cc1fddd52d
[+] BO : Product "For" and new carriers select list
2013-07-25 16:24:43 +02:00
488cf0919a
// BO attributes
2013-07-25 15:51:41 +02:00
f8ff755067
[+] BO : Product "For"
2013-07-25 14:50:10 +02:00
3f83dd9222
[+] BO : Product "For"
2013-07-25 14:33:14 +02:00
d6b38635f9
[+] BO : Product "For"
2013-07-25 14:02:36 +02:00
b5ae321ea5
// fix input + switch
2013-07-25 11:55:27 +02:00
21cf113c44
twice class attribute in color input
2013-07-25 10:26:53 +02:00
312ad4eb37
// update order tab
2013-07-25 09:41:31 +02:00
edc2113330
// fix merge
2013-07-24 17:02:23 +02:00
77f80b1774
// Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
...
Conflicts:
.gitignore
admin-dev/themes/default/css/admin.css
admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/modules/page.tpl
admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
admin-dev/themes/default/template/controllers/orders/_documents.tpl
admin-dev/themes/default/template/controllers/orders/_shipping.tpl
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/helpers/view/view.tpl
admin-dev/themes/default/template/controllers/payment/restrictions.tpl
admin-dev/themes/default/template/controllers/products/images.tpl
admin-dev/themes/default/template/controllers/products/informations.tpl
admin-dev/themes/default/template/header.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
admin-dev/themes/default/template/helpers/modules_list/list.tpl
classes/Tools.php
controllers/admin/AdminCartRulesController.php
controllers/admin/AdminProductsController.php
css/admin.css
2013-07-24 17:01:23 +02:00
063fd9941c
Merge pull request #189 from PrestaEdit/patch-12
...
[*] BO: use lang for input file
2013-07-24 03:10:00 -07:00
f7d1743c8a
// fix tags in helper
2013-07-24 11:42:47 +02:00
1c71dc54dc
Merge pull request #556 from piotrmocko/patch-2
...
[-] Bo : Payment currency restriction incorret type of input for radio
2013-07-23 10:21:20 -07:00
5b804d3628
// update order tab
2013-07-23 17:54:47 +02:00
3b213a505c
Merge pull request #583 from djfm/development
...
[*] TR : Small localization fixes & correction in templates so that translation regexes work OK
2013-07-23 00:59:31 -07:00
f194aec8c5
// update module and orders tab
2013-07-22 17:56:24 +02:00
0f7d59ad26
[-] BO : FixBug #PSCFV-9878 Wrong login tab order
2013-07-22 17:07:57 +02:00
9d16eb1d1b
// BO fix + work on helpers + compass/codekit config
2013-07-22 16:43:16 +02:00
d79365fe4d
// small fix
2013-07-22 11:54:35 +02:00
b8d272a459
// fix entities
2013-07-22 11:39:15 +02:00
3c59c5e779
//replaced all js='1' with js=1 so that the translation regexes don't fail
2013-07-22 09:34:18 +00:00
288c0d3ca8
// Css cleaning
2013-07-19 18:41:15 +02:00
5646e682bc
[-] BO : FIxBug Correct image language in product
2013-07-19 15:21:06 +02:00
0b4512dbcb
// some work on style sheets
2013-07-18 18:51:24 +02:00
Kevin Granger