 Kevin Granger
|
ddf65f3b97
|
// toolbar nav fixs
|
2013-10-25 10:33:45 +02:00 |
|
|
Damien Metzger
|
0ca5a24e84
|
// Added field (bootstrap) size in helper form
|
2013-10-25 10:16:39 +02:00 |
|
|
Jerome Nadaud
|
139ee8f62d
|
// Move back button to left
|
2013-10-25 09:29:42 +02:00 |
|
|
Jerome Nadaud
|
3850cc94d5
|
// Align save button to right
|
2013-10-25 09:18:00 +02:00 |
|
|
Kevin Granger
|
acfc3bc266
|
// fixe buttons group wrap
|
2013-10-24 19:34:25 +02:00 |
|
|
Damien Metzger
|
cd5fa81025
|
// Fixed boulette
|
2013-10-24 19:29:22 +02:00 |
|
|
Damien Metzger
|
4cb7bd9137
|
// Changed label
|
2013-10-24 19:19:20 +02:00 |
|
|
Damien Metzger
|
8748b0d240
|
// Small improvements
|
2013-10-24 19:12:50 +02:00 |
|
|
Jerome Nadaud
|
279cb99a4e
|
// Add regenerate option to thumbnail creation
|
2013-10-24 18:52:10 +02:00 |
|
|
Damien Metzger
|
f3d74c9461
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/css/admin-theme.css
|
2013-10-24 18:13:04 +02:00 |
|
|
Damien Metzger
|
5ff406cdb8
|
// css
|
2013-10-24 18:09:11 +02:00 |
|
|
Kevin Granger
|
5c3058d45b
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-24 18:02:42 +02:00 |
|
|
Kevin Granger
|
e3dad946e3
|
// fixs
|
2013-10-24 18:02:13 +02:00 |
|
|
Sarah Lorenzini
|
e6d0fe60c3
|
// new design for mailalerts mails template
|
2013-10-24 17:54:32 +02:00 |
|
|
Kevin Granger
|
a02c31f106
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/css/admin-theme.css
|
2013-10-24 17:53:30 +02:00 |
|
|
Damien Metzger
|
f6dd4a9ee4
|
// Code review
|
2013-10-24 17:49:18 +02:00 |
|
|
Kevin Granger
|
32d146d880
|
// admin orders
|
2013-10-24 17:36:50 +02:00 |
|
|
Sarah Lorenzini
|
1a7f9e6c11
|
// new design for blockwishlist mails template
|
2013-10-24 17:35:37 +02:00 |
|
|
Sarah Lorenzini
|
005a57b077
|
// new design for blocknewsletter mails template
|
2013-10-24 17:28:37 +02:00 |
|
|
Vincent Augagneur
|
6a552be7dd
|
//followup now use bootstrap design
|
2013-10-24 17:23:40 +02:00 |
|
|
Damien Metzger
|
b548f72ac5
|
// Attributes and values => Product Attributes
|
2013-10-24 17:18:45 +02:00 |
|
|
Jerome Nadaud
|
ea7b8b175e
|
// Fix list title
|
2013-10-24 17:18:14 +02:00 |
|
|
Damien Metzger
|
c39a74e479
|
// Renamed Feature into Product Features
|
2013-10-24 17:07:47 +02:00 |
|
|
Damien Metzger
|
df639337af
|
// Code cleaning and small fixes
|
2013-10-24 17:04:55 +02:00 |
|
|
Vincent Augagneur
|
f82322e426
|
//typo
|
2013-10-24 16:51:55 +02:00 |
|
|
Damien Metzger
|
d2ff076eb1
|
// Removed useless alert
|
2013-10-24 16:43:41 +02:00 |
|
|
Damien Metzger
|
2931c20914
|
// Fixed rounding
|
2013-10-24 16:38:48 +02:00 |
|
|
Sarah Lorenzini
|
a44cdf785e
|
// new design for followup module mail
|
2013-10-24 16:18:52 +02:00 |
|
|
Gregory Roussac
|
3f11dde2f6
|
Merge pull request #886 from djfm/bootstrap
//emails
|
2013-10-24 07:09:10 -07:00 |
|
|
djfm
|
572f7c725d
|
// small html fix
|
2013-10-24 14:04:50 +00:00 |
|
|
djfm
|
3e8330dcb3
|
// small fixes on php email templates
|
2013-10-24 13:58:14 +00:00 |
|
|
Rémi Gaillard
|
667647f891
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
|
2013-10-24 15:23:25 +02:00 |
|
|
Rémi Gaillard
|
691e45a168
|
// delete useless file
|
2013-10-24 15:23:03 +02:00 |
|
|
Damien Metzger
|
6a2e847970
|
// dashboard improvements
|
2013-10-24 15:04:06 +02:00 |
|
|
Damien Metzger
|
a9f75a02a7
|
// Added missing icons for modules
|
2013-10-24 14:15:44 +02:00 |
|
|
Damien Metzger
|
a1df97776a
|
// Set default values
|
2013-10-24 13:54:55 +02:00 |
|
|
Rémi Gaillard
|
4bfd8dee11
|
// note updated by ajax in admincustomers should be url encoded
|
2013-10-24 11:51:48 +02:00 |
|
|
Damien Metzger
|
dd6aa1a077
|
Merge pull request #881 from emilien-puget/bootstrap
// changed path from dirname(__FILE__) to PS_ROOT_DIR
|
2013-10-24 02:49:34 -07:00 |
|
|
emilien-puget
|
92c2f6953f
|
changed path from dirname(__FILE__) to PS_ROOT_DIR
|
2013-10-24 11:44:52 +02:00 |
|
|
Damien Metzger
|
a34784a15d
|
// Fixed chart for period before the store creation
|
2013-10-24 11:17:33 +02:00 |
|
|
Damien Metzger
|
d173b2d4cd
|
Merge pull request #880 from djfm/bootstrap
// use automatic path for css in mail template header
|
2013-10-24 01:45:41 -07:00 |
|
|
djfm
|
baed28f1a7
|
// use automatic path for css in mail template header
|
2013-10-24 08:37:08 +00:00 |
|
|
Rémi Gaillard
|
9a7c3dd88f
|
// small fix
|
2013-10-24 10:14:44 +02:00 |
|
|
Damien Metzger
|
e17dd1fdde
|
// theme installation
|
2013-10-24 09:49:46 +02:00 |
|
|
Sarah Lorenzini
|
d9382a0a5b
|
// update mail template
|
2013-10-24 09:28:04 +02:00 |
|
|
Damien Metzger
|
9e0125d0b6
|
// theme installation
|
2013-10-23 19:09:14 +02:00 |
|
|
Kevin Granger
|
7a8cdf3913
|
// admin create order WIP
|
2013-10-23 18:54:44 +02:00 |
|
|
Rémi Gaillard
|
e1887425fa
|
[*] BO: Add an option to choose to not import the behavior of taxes displaying for the groups in localization pack import
|
2013-10-23 18:22:53 +02:00 |
|
|
Vincent Augagneur
|
b38073ad72
|
//watermark now use bootstrap design
|
2013-10-23 18:01:23 +02:00 |
|
|
Sarah Lorenzini
|
7a23c169d6
|
// update css mail template
|
2013-10-23 17:58:28 +02:00 |
|