dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,570 Commits 9 Branches 19 Tags
94de4d3d2f35403b5de1c10a4a02503f11ca1c2b
Commit Graph

1672 Commits

Author SHA1 Message Date
Kevin Granger
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
Kevin Granger
9f9c0ef416 [+] BO Orders 2013-07-26 18:54:28 +02:00
Jérôme Nadaud
0ef7578f26 [-] BO : Order template misplaced empty form 2013-07-26 18:43:40 +02:00
sLorenzini
c1e4b812f9 // update "create order" tab 2013-07-26 16:33:52 +02:00
Kevin Granger
1a2b78b00f [+] BO Invoices 2013-07-26 15:34:11 +02:00
Jérôme Nadaud
3287ff5300 [+] BO : Product attachment "For" 2013-07-26 15:32:04 +02:00
Jérôme Nadaud
7db1fb89ec [+] BO : Products customization "For" 2013-07-26 15:09:14 +02:00
Jérôme Nadaud
5c52ba31e9 [+] BO : Products quantities "For" and small template fix 2013-07-26 15:03:29 +02:00
sLorenzini
3c035324f4 // update order tab 2013-07-26 12:15:23 +02:00
Kevin Granger
8b7c29dd18 [+] BO Scenes - Tags - Attachments 2013-07-26 11:12:50 +02:00
Kevin Granger
72b046d5f0 [+] BO Manufacturers 2013-07-26 10:21:23 +02:00
Kevin Granger
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
Kevin Granger
9308c5c527 no message 2013-07-25 19:18:54 +02:00
Jérôme Nadaud
07000c1f66 [-] BO : BugFix Cancel modification button error 2013-07-25 18:15:41 +02:00
Jérôme Nadaud
ce5355415b [+] BO : Product "For" and combination button 2013-07-25 17:53:09 +02:00
sLorenzini
832f5cf0dd // update order tab 2013-07-25 16:53:18 +02:00
Jérôme Nadaud
76c87044de [+] BO : Product "For" 2013-07-25 16:44:52 +02:00
Jérôme Nadaud
cc1fddd52d [+] BO : Product "For" and new carriers select list 2013-07-25 16:24:43 +02:00
Kevin Granger
488cf0919a // BO attributes 2013-07-25 15:51:41 +02:00
Jérôme Nadaud
f8ff755067 [+] BO : Product "For" 2013-07-25 14:50:10 +02:00
Jérôme Nadaud
3f83dd9222 [+] BO : Product "For" 2013-07-25 14:33:14 +02:00
Jérôme Nadaud
d6b38635f9 [+] BO : Product "For" 2013-07-25 14:02:36 +02:00
Kevin Granger
b5ae321ea5 // fix input + switch 2013-07-25 11:55:27 +02:00
sLorenzini
312ad4eb37 // update order tab 2013-07-25 09:41:31 +02:00
Kevin Granger
edc2113330 // fix merge 2013-07-24 17:02:23 +02:00
Kevin Granger
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
Kevin Granger
f7d1743c8a // fix tags in helper 2013-07-24 11:42:47 +02:00
Gregory Roussac
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
sLorenzini
5b804d3628 // update order tab 2013-07-23 17:54:47 +02:00
Gregory Roussac
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
sLorenzini
f194aec8c5 // update module and orders tab 2013-07-22 17:56:24 +02:00
Jérôme Nadaud
0f7d59ad26 [-] BO : FixBug #PSCFV-9878 Wrong login tab order 2013-07-22 17:07:57 +02:00
Kevin Granger
9d16eb1d1b // BO fix + work on helpers + compass/codekit config 2013-07-22 16:43:16 +02:00
Rémi Gaillard
d79365fe4d // small fix 2013-07-22 11:54:35 +02:00
Rémi Gaillard
b8d272a459 // fix entities 2013-07-22 11:39:15 +02:00
djfm
3c59c5e779 //replaced all js='1' with js=1 so that the translation regexes don't fail 2013-07-22 09:34:18 +00:00
Kevin Granger
288c0d3ca8 // Css cleaning 2013-07-19 18:41:15 +02:00
Jérôme Nadaud
5646e682bc [-] BO : FIxBug Correct image language in product 2013-07-19 15:21:06 +02:00
Kevin Granger
0b4512dbcb // some work on style sheets 2013-07-18 18:51:24 +02:00
Gregory Roussac
ffb62426d8 Merge pull request #516 from PrestaEdit/patch-41 
[*] BO: more than one image in HelperForm
 2013-07-17 07:44:26 -07:00
Kevin Granger
02921dc9d0 [+] Helper form WIP 2013-07-16 19:23:46 +02:00
sLorenzini
66f64c1baa // update order tab 2013-07-15 17:58:23 +02:00
gRoussac
1a056d5e33 [-] BO : Fix bug #PSCFV-9310 bad type for input in helper thankx @Piotr Moćko 2013-07-15 14:47:38 +02:00
sLorenzini
27571f4d06 //update module tab 2013-07-15 12:02:03 +02:00
sLorenzini
0c4a5bd984 // update module tab positions & payment 2013-07-15 11:55:06 +02:00
Kevin Granger
b8babdadb3 // products wip 2013-07-12 19:17:51 +02:00
Damien Metzger
22b73a7339 [*] BO : upgraded cover icon management in product > images 2013-07-12 18:43:49 +02:00
Gregory Roussac
5083cd6b5e Merge pull request #466 from PrestaEdit/patch-39 
[*] BO: hook displayAdminForm / add param fieldset
 2013-07-12 08:56:42 -07:00
sLorenzini
4919d6d81a // update positions module tab 2013-07-12 17:48:07 +02:00
Gregory Roussac
5b6c6a3ce9 Merge pull request #561 from BigZ/patch-5 
[-] PDF : Get correct prefix for invoices
 2013-07-12 08:44:24 -07:00