6245b05b6e
// Remove flags from language select
2013-10-09 19:39:05 +02:00
2d9a54c19e
// Remove button icon class
2013-10-09 18:43:22 +02:00
d88857610d
// Toolbar modifs
2013-10-08 18:42:07 +02:00
5b203cf789
// Remove languages select when only one language
2013-10-04 13:51:38 +02:00
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
a1c7dd3ee9
// Add row break to color element
2013-09-26 16:44:26 +02:00
ffb7113153
// Posibility to add a specifici icon to options list
2013-09-25 15:16:00 +02:00
18a621e022
// Multistore invisible description in options
2013-09-23 19:02:22 +02:00
320e1512df
// Multistore checkbox design
2013-09-23 18:03:32 +02:00
f312a055b1
// Multistore bootstrap design
2013-09-20 15:04:43 +02:00
c0fa5f8f79
// Fix hint in options.tpl
2013-09-19 19:39:46 +02:00
e1a3440145
// Add array for hint and desc for options.tpl
2013-09-19 18:56:35 +02:00
eb1531a0b3
// Fix textlang size and textarea input group
2013-09-19 11:23:09 +02:00
3151064daf
//small fix on helper form && option
2013-09-17 12:18:37 +02:00
455904a59b
// Some input fix
2013-09-17 10:13:00 +02:00
80b6d5a570
// fix autosize for textarea in options.tpl
2013-09-16 18:28:57 +02:00
a4103265e5
// Color picker
2013-09-16 18:17:29 +02:00
29db737c10
// Add autosize to textarea
2013-09-12 16:52:55 +02:00
f09347a8be
// update backup BDD, import, and email pages
2013-09-05 14:55:07 +02:00
22d636f93a
// Colored switch, removed "required field" legend, removed duplicate links quick access
2013-09-04 18:14:11 +02:00
84a0f9489c
// add submenu shadow + allow html for tooltip
2013-08-30 17:39:37 +02:00
aab9933ff2
// Fix price option render
2013-08-30 17:27:25 +02:00
7d4c0ad36e
// fix col-offset and btn-primary
2013-08-29 17:04:10 +02:00
f8f2c99d28
// Modules page + Warning
2013-08-26 11:38:10 +02:00
ff16de05de
// fix, design and fun !
2013-08-06 19:06:56 +02:00
b34acf74f2
[-] BO : FixBug Undefined variable title
2013-08-01 17:33:53 +02:00
24bf5e5bdf
[-] BO : FixBug Undefined variable currency
2013-08-01 17:26:07 +02:00
5defc39def
[+] BO Images / Marketing / Spe. Prices Rules
2013-08-01 14:42:43 +02:00
ca253bcda2
// update preferences tab
2013-07-31 17:43:48 +02:00
9debffe910
// update shipping tab
2013-07-31 15:06:59 +02:00
d95a519ace
[+] BO Customers WIP
2013-07-29 19:18:02 +02:00
613c9b66e5
// fix carriers
2013-07-29 16:51:03 +02:00
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
243834ee17
// update shipping tab
2013-07-29 14:14:00 +02:00
1a2b78b00f
[+] BO Invoices
2013-07-26 15:34:11 +02:00
3c035324f4
// update order tab
2013-07-26 12:15:23 +02:00
40f03d0ba1
[+] BO: Form components
2013-06-18 21:03:43 +02:00
385c593129
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
714a5e08cc
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
064ba453e6
// Welcome 2013
2013-01-04 11:19:03 +01:00
8baf87eef5
// Welcome 2013
2013-01-04 11:19:03 +01:00
6445fea198
Merge pull request #69 from PrestaEdit/mails
...
[+] Project: add the possibility to change the default color (#db3484)
2012-12-12 06:59:04 -08:00
ebff913250
Merge pull request #69 from PrestaEdit/mails
...
[+] Project: add the possibility to change the default color (#db3484)
2012-12-12 06:59:04 -08:00
768fcf8f84
Merge pull request #75 from @sebastienhouzet
2012-12-12 11:24:56 +01:00
bfff958b1f
Merge pull request #75 from @sebastienhouzet
2012-12-12 11:24:56 +01:00
a88b23b16f
[+] Project: add the possibility to change the default color (#db3484)
...
Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes)
2012-12-03 16:11:43 +01:00
edd6bf7b7e
[+] Project: add the possibility to change the default color (#db3484)
...
Let the user set the default color in the mail with a color picker (configuration set in Back Office, Themes)
2012-12-03 16:11:43 +01:00
a1db83ef41
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
be946319be
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
Jerome Nadaud