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

3350 Commits

Author SHA1 Message Date
jeromenadaud a29fa2dd09 [+] BO Better filters display 2013-08-01 16:59:08 +02:00
Sarah Lorenzini 047ab9d681 // update images controller 2013-08-01 16:45:46 +02:00
Sarah Lorenzini 50a54240b9 // update images controller 2013-08-01 16:43:58 +02:00
Sarah Lorenzini 680497f1e3 // update preferences tab 2013-08-01 16:40:48 +02:00
Kevin Granger 5defc39def [+] BO Images / Marketing / Spe. Prices Rules 2013-08-01 14:42:43 +02:00
Kevin Granger e4878ba393 // I'm not sure as I've never had a look at how that works before ;) 2013-07-31 21:17:03 +02:00
jeromenadaud 50bdfb9a1a [-] BO FixBug Action button in list content 2013-07-31 18:44:20 +02:00
jeromenadaud 017e5ccbc8 [+] BO Pagination, filter and display 2013-07-31 18:37:01 +02:00
Sarah Lorenzini ca253bcda2 // update preferences tab 2013-07-31 17:43:48 +02:00
Sarah Lorenzini 9debffe910 // update shipping tab 2013-07-31 15:06:59 +02:00
Sarah Lorenzini d744b9dbf2 // update localization and modules tabs 2013-07-31 14:47:21 +02:00
Kevin Granger a1cc4d14d0 [+] BO Customers > Customers / Customers > Groups 2013-07-30 18:47:13 +02:00
jeromenadaud 24a70479d3 [-] BO : FixBug Module list template 2013-07-30 18:06:35 +02:00
Sarah Lorenzini 635076a7ad // update localization tab 2013-07-30 17:45:50 +02:00
Sarah Lorenzini faafe4167a // update localization tab 2013-07-30 14:56:39 +02:00
Sarah Lorenzini 816153687c // update localization tab 2013-07-30 12:25:20 +02:00
Kevin Granger 8bafaceb40 [+] BO Customers > Addresses // Helper > Required Fields 2013-07-30 10:35:47 +02:00
Kevin Granger b95478d529 [+] BO Customers Groups WIP 2013-07-29 20:39:52 +02:00
Kevin Granger d95a519ace [+] BO Customers WIP 2013-07-29 19:18:02 +02:00
Kevin Granger 613c9b66e5 // fix carriers 2013-07-29 16:51:03 +02:00
Kevin Granger 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
Kevin Granger ae225dce4c // WIP customer 2013-07-29 16:16:10 +02:00
Sarah Lorenzini b528b7b6fc // update shipping tab 2013-07-29 16:13:07 +02:00
sLorenzini 243834ee17 // update shipping tab 2013-07-29 14:14:00 +02:00
sLorenzini 2ac6ada03d // update order tab 2013-07-29 11:01:48 +02:00
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