Commit Graph

978 Commits

Author SHA1 Message Date
Kevin Granger c12ce3dd29 // Products 2013-07-12 17:27:25 +02:00
sLorenzini 160857bdc3 // update css module tab 2013-07-12 14:30:44 +02:00
Kevin Granger 84c0ccbae6 // products TPL 2013-07-11 18:58:44 +02:00
sLorenzini 40967e6525 // update modules list tab 2013-07-11 17:27:11 +02:00
Kevin Granger f042d704d2 // field translatable + tpl products + fixs 2013-07-10 19:39:35 +02:00
sLorenzini f847c821ed // update tab modules bootsrap 2013-07-10 18:19:03 +02:00
sLorenzini 8b33ac5aca // quantities product modified + line bootsrap added in order, categories and attributes group controllers 2013-07-10 12:21:22 +02:00
Kevin Granger ec466b8c70 // Porting more product tpl 2013-07-09 19:10:56 +02:00
Kevin Granger 1f33638f32 [+] BO Wip BS -> Products + fix 2013-07-05 18:36:42 +02:00
Kevin Granger 0ad4b44866 // Refactor helper list + fixs 2013-07-02 18:55:43 +02:00
Kevin Granger d583cf25d2 // Bootstrap3 - Cart_rules > information.tpl + header + Font Awesome + Switch 2013-06-28 19:35:32 +02:00
Kevin Granger aa8d6d5872 //Porting more components to bootstrap 2013-06-21 17:47:05 +02:00
Kevin Granger 40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
Kevin Granger 3bdf86e634 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-06-17 19:19:28 +02:00
Kevin Granger 993690801e // Small changes with layout an css 2013-06-17 18:49:45 +02:00
gRoussac aea53e034a [*] BO : Enable current subtab active class 2013-06-17 18:27:07 +02:00
Damien Metzger aefc22bb10 [-] BO : fixed quote issue with magic quote in customization in adminorders #PSCFV-9311 2013-06-17 11:40:35 +02:00
Kevin Granger 6648fd3e97 // Reset Bootstrap for backward compatibility 2013-06-14 19:25:18 +02:00
Damien Metzger 12e13e275f [-] BO : fixed ajax in permissions tab #PSCFV-7442 2013-06-14 11:20:38 +02:00
Vincent Augagneur ff63e0a28c [-] BO : fixed bug #PSCFV-9405 - Delete file of downloadable product when cancel 2013-06-14 11:17:07 +02:00
Rémi Gaillard 7a91d4b4dd // small fix on toolbar 2013-06-13 19:23:58 +02:00
Kevin Granger b0eaf8124c [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:19:50 +02:00
Kevin Granger 86ef69c9ba [*] BO : Init Bootstrap (Sass) BO 2013-06-13 18:03:34 +02:00
Vincent Augagneur 518998ded2 //added bootstrap in BO 2013-06-13 16:35:14 +02:00
Damien Metzger ecf59957ba [-] FO : fixed pdf template #PSCFV-9430 2013-06-13 11:18:03 +02:00
Damien Metzger aa41d6b762 // No escape in JS links 2013-06-07 12:33:44 +02:00
Damien Metzger ca64179950 // W3C 2013-06-06 15:27:29 +02:00
gRoussac ea5405a917 [-] CORE : Report of https://github.com/PrestaShop/PrestaShop-1.4/commit/ec8deb289185daa03cd11d239797bbe5bdbaecd0 2013-05-27 19:06:59 +02:00
Daniel c63ca0cdf8 Update _shipping.tpl
Added target="_blank" so when clicking on the tracking link, the user do not risk "loosing" the order by closing the tracking page by misstake.
2013-05-17 11:48:47 +08:00
gRoussac 9b615244b1 [-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable 2013-05-15 11:31:55 +02:00
sLorenzini dc2b69f699 // BO: Improve product display on supplier page 2013-04-30 11:09:08 +02:00
Damien Metzger e56ec2f234 // BO : Changed product display on supplier page 2013-04-29 18:34:34 +02:00
Damien Metzger 1921668596 [-] BO : Fixed display when you translate modules without theme selected 2013-04-25 17:47:07 +02:00
Francois Gaillard 8d735b333f // Release branch merged 2013-04-25 17:00:56 +02:00
gRoussac 91ab0362db [-] BO : Fix bug witth shop address and no state in country 2013-04-25 10:12:23 +02:00
Damien Metzger 7a76b8b6a0 // Removed deprecated block for new installs 2013-04-25 09:03:32 +02:00
gRoussac 7081e6d0d0 [-] BO : Fix bug for csv export 2013-04-24 17:29:36 +02:00
Damien Metzger 9eb84825a6 // Fix module translation in the core 2013-04-23 20:25:28 +02:00
Damien Metzger c191b36fb6 // Fixed Chrome issue with cart rules 2013-04-23 15:30:17 +02:00
Vincent Augagneur 5e9ba185ef Merge pull request #390 from ccauw/patch-7
[*] BO : Add block "override_form_extra" in helper
2013-04-23 05:20:43 -07:00
Damien Metzger d8313760ec // Remove "core" for the themes translations in the translation tool 2013-04-23 12:37:09 +02:00
Damien Metzger 7ce6502600 // Changed translation tool behavior with dev mode and overrides 2013-04-23 11:21:10 +02:00
vAugagneur 3d6d97af5f [*] BO : added new button on manufacturers view 2013-04-22 14:56:59 +02:00
Damien Metzger e7b22ad8d4 // Fixed a few UI bugs in the stats 2013-04-22 11:57:36 +02:00
Vincent Augagneur c643abcfa2 Merge pull request #123 from rynge/admin_category_breadcrumbs
[-] BO : Fixed a problem with the breadcrumbs in the admin category edit...
2013-04-22 01:18:15 -07:00
gRoussac 6e1f99f4b2 [-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper 2013-04-19 10:34:20 +02:00
ldecoker a40f61e922 ";" in wrong place
Should be after display but inside quotes
2013-04-16 18:34:20 +03:00
ccauw 205e21ba16 [*] BO : Add block "override_form_extra" in helper
[*] BO : Add block "override_form_extra" in list_header.tpl


{if !$simple_header}

<form method="post" action="{$action}" class="form">



	{block name="override_form_extra"}{/block}




In AdminXxxxController, If we display list which are filtered by "variable" like

index.php?controller=AdminXxxx&variable=val&token=...

When using pagination or columns filters, the controller is called without our variable.

There are two methods to retrieve our variable: cookie or form Post.

To use the second opportunity, we need to put hidden input "variable" in the form.

So we need à block in the form to override.
2013-04-16 16:21:23 +03:00
vAugagneur e271524cc4 Merged Pull request #302 - Thanks to @kpodemski 2013-04-16 11:48:17 +02:00
vAugagneur 621ca4a29b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-16 11:35:33 +02:00