 Rémi Gaillard
|
59a1105fce
|
// small fix on multishop checkboxes
|
2013-10-25 14:55:27 +02:00 |
|
|
Jerome Nadaud
|
81482df1e5
|
// Fix merge
|
2013-10-25 14:33:29 +02:00 |
|
|
Jerome Nadaud
|
08baa71a05
|
// Fix on color field in list
|
2013-10-25 14:29:30 +02:00 |
|
|
Jerome Nadaud
|
8d1765f2df
|
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
controllers/admin/AdminCategoriesController.php
|
2013-10-25 14:29:02 +02:00 |
|
|
Jerome Nadaud
|
bff1ad8833
|
// Some changes to integrate uploader helper
|
2013-10-25 14:20:42 +02:00 |
|
|
Jerome Nadaud
|
52795495bd
|
//Starting Uploader helper
|
2013-10-25 14:19:51 +02:00 |
|
|
Rémi Gaillard
|
3997543e7f
|
// notice
|
2013-10-25 11:35:01 +02:00 |
|
|
Damien Metzger
|
087d0d8206
|
// Fields resizing
|
2013-10-25 11:25:13 +02:00 |
|
|
Damien Metzger
|
d59c83e64d
|
Merge pull request #888 from djfm/bootstrap
[+] FO: New E-Mail templates!
|
2013-10-25 02:18:04 -07:00 |
|
|
djfm
|
dd009f133f
|
// fixes in php mail templates
|
2013-10-25 09:13:24 +00:00 |
|
|
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 |
|
|
djfm
|
c8e75eec03
|
// fixed indentation in e-mail html templates
|
2013-10-24 14:25:17 +00:00 |
|
|
Sarah Lorenzini
|
a44cdf785e
|
// new design for followup module mail
|
2013-10-24 16:18:52 +02:00 |
|
|
djfm
|
0603c54756
|
[*] LO : New English E-Mail templates by SuperSarah
|
2013-10-24 14:15:19 +00: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 |
|