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

124 Commits

Author SHA1 Message Date
Kevin Granger
3f2ce54efd // gamification + multishop wip 2013-12-03 15:21:13 +01:00
Kevin Granger
fae1fd58a9 // tweak on switch + admin import 2013-11-25 17:16:59 +01:00
Damien Metzger
c095d8f1ca [-] Core : fixed smarty escape htmlall > html 2013-11-22 09:47:15 +01:00
Jerome Nadaud
0b3c08acbe // Add language iso code to language select 2013-11-20 15:37:25 +01:00
Jerome Nadaud
dbf98d3722 // Put suffix after input field 2013-11-20 12:02:15 +01:00
Jerome Nadaud
52795495bd //Starting Uploader helper 2013-10-25 14:19:51 +02:00
Jerome Nadaud
fb167d94f9 // Remove duplicate class 2013-10-21 19:13:19 +02:00
Jerome Nadaud
766e409476 // Wrong end block position 2013-10-21 18:34:03 +02:00
Kevin Granger
f225fb5f2c // replaced class .row with class .form-group inside forms 2013-10-16 14:19:26 +02:00
Kevin Granger
0e7a7f8be4 // replace fieldset with div for responsive table 2013-10-15 18:09:53 +02:00
Jerome Nadaud
6245b05b6e // Remove flags from language select 2013-10-09 19:39:05 +02:00
Jerome Nadaud
2d9a54c19e // Remove button icon class 2013-10-09 18:43:22 +02:00
Jerome Nadaud
d88857610d // Toolbar modifs 2013-10-08 18:42:07 +02:00
Jerome Nadaud
5b203cf789 // Remove languages select when only one language 2013-10-04 13:51:38 +02:00
Kevin Granger
8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/products/suppliers.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminGroupsController.php
	controllers/admin/AdminManufacturersController.php
 2013-09-30 11:01:23 +02:00
Jerome Nadaud
a1c7dd3ee9 // Add row break to color element 2013-09-26 16:44:26 +02:00
Jerome Nadaud
ffb7113153 // Posibility to add a specifici icon to options list 2013-09-25 15:16:00 +02:00
Jerome Nadaud
18a621e022 // Multistore invisible description in options 2013-09-23 19:02:22 +02:00
Jerome Nadaud
320e1512df // Multistore checkbox design 2013-09-23 18:03:32 +02:00
Jerome Nadaud
f312a055b1 // Multistore bootstrap design 2013-09-20 15:04:43 +02:00
Jerome Nadaud
c0fa5f8f79 // Fix hint in options.tpl 2013-09-19 19:39:46 +02:00
Jerome Nadaud
e1a3440145 // Add array for hint and desc for options.tpl 2013-09-19 18:56:35 +02:00
Jerome Nadaud
eb1531a0b3 // Fix textlang size and textarea input group 2013-09-19 11:23:09 +02:00
Vincent Augagneur
3151064daf //small fix on helper form && option 2013-09-17 12:18:37 +02:00
Jérôme Nadaud
455904a59b // Some input fix 2013-09-17 10:13:00 +02:00
Jerome Nadaud
80b6d5a570 // fix autosize for textarea in options.tpl 2013-09-16 18:28:57 +02:00
Jerome Nadaud
a4103265e5 // Color picker 2013-09-16 18:17:29 +02:00
Jerome Nadaud
29db737c10 // Add autosize to textarea 2013-09-12 16:52:55 +02:00
Sarah Lorenzini
f09347a8be // update backup BDD, import, and email pages 2013-09-05 14:55:07 +02:00
Kevin Granger
22d636f93a // Colored switch, removed "required field" legend, removed duplicate links quick access 2013-09-04 18:14:11 +02:00
Kevin Granger
84a0f9489c // add submenu shadow + allow html for tooltip 2013-08-30 17:39:37 +02:00
Jerome Nadaud
aab9933ff2 // Fix price option render 2013-08-30 17:27:25 +02:00
Kevin Granger
7d4c0ad36e // fix col-offset and btn-primary 2013-08-29 17:04:10 +02:00
Kevin Granger
f8f2c99d28 // Modules page + Warning 2013-08-26 11:38:10 +02:00
Kevin Granger
ff16de05de // fix, design and fun ! 2013-08-06 19:06:56 +02:00
jeromenadaud
b34acf74f2 [-] BO : FixBug Undefined variable title 2013-08-01 17:33:53 +02:00
jeromenadaud
24bf5e5bdf [-] BO : FixBug Undefined variable currency 2013-08-01 17:26:07 +02:00
Kevin Granger
5defc39def [+] BO Images / Marketing / Spe. Prices Rules 2013-08-01 14:42:43 +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
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
sLorenzini
243834ee17 // update shipping tab 2013-07-29 14:14:00 +02:00
Kevin Granger
1a2b78b00f [+] BO Invoices 2013-07-26 15:34:11 +02:00
sLorenzini
3c035324f4 // update order tab 2013-07-26 12:15:23 +02:00
Kevin Granger
40f03d0ba1 [+] BO: Form components 2013-06-18 21:03:43 +02:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00