 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 |
|
|
gRoussac
|
942d3c7151
|
[-] MO : Fixbug #PSCFV-10679 dateofdelivery PDF invoice array and array
|
2013-10-25 00:01:25 +02:00 |
|
|
gRoussac
|
1e094f4016
|
[-] FO: Fix bug #PSCFV-10623 blocknewproducts shows products when PS_NB_DAYS_NEW_PRODUCT == 0
|
2013-10-24 23:29:23 +02:00 |
|
|
gRoussac
|
a9643c80c3
|
// bad commit sorry
|
2013-10-24 22:45:43 +02:00 |
|
|
gRoussac
|
438a3dda2b
|
[-] BO : Fix bug #PSCFV-10718 AdminAttachments old file not deleted on update
|
2013-10-24 22:42:13 +02:00 |
|
|
gRoussac
|
4cd3e1b830
|
[-] FO: Fix bug #PSCFV-10230, Blockspecials still caching when files cache limit is 0
|
2013-10-24 21:59:32 +02:00 |
|
|
gRoussac
|
97ef888345
|
[-] FO: Fix bug #PSCFV-10625 Js error on carriers step if AjaxCart disabled
|
2013-10-24 21:28:22 +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 |
|
|
Gregory Roussac
|
4207bdff32
|
Merge pull request #890 from indesign47/patch-14
[-] BO : AdminImport change width height depth
|
2013-10-24 09:43:54 -07:00 |
|
|
Jerome Nadaud
|
6f57093f50
|
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
|
2013-10-24 18:36:36 +02:00 |
|
|
indesign47
|
8cb1806e49
|
// small fixes for Width Height Depth
change
0,1;0,2;0,3
to
1,2,3
|
2013-10-24 18:13:05 +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 |
|
|
gRoussac
|
759fe2f671
|
// norms
|
2013-10-24 18:09:21 +02:00 |
|
|
Damien Metzger
|
5ff406cdb8
|
// css
|
2013-10-24 18:09:11 +02:00 |
|
|
Gregory Roussac
|
0416aca547
|
Merge pull request #889 from PhpMadman/PSCFV-10728
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
|
2013-10-24 09:06:43 -07: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 |
|
|
Rémi Gaillard
|
cc3363011e
|
// rewrited urls for feeder module
|
2013-10-24 17:54:44 +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 |
|
|
PhpMadman
|
c516035e0e
|
[-] BO : fix #PSCFV-10728, prices incorrectly formatted when creating new order from BO
|
2013-10-24 17:19:28 +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 |
|
|
gRoussac
|
c5324a653b
|
[-] IN: Fix bug #PSCFV-10644 no carrier available after upgrade from 1.4.x
|
2013-10-24 16:31:50 +02:00 |
|
|
Rémi Gaillard
|
3cd702da42
|
[-] WS: Fix stockavailables list when stock is shared between shops #PSCFV-10793
|
2013-10-24 16:30:02 +02:00 |
|
|
djfm
|
c8e75eec03
|
// fixed indentation in e-mail html templates
|
2013-10-24 14:25:17 +00:00 |
|
|
Gregory Roussac
|
65401efcb6
|
Merge pull request #887 from indesign47/patch-13
[*] BO : AdminImport add img manufacturers-suppliers
|
2013-10-24 07:22:57 -07:00 |
|
|
Sarah Lorenzini
|
a44cdf785e
|
// new design for followup module mail
|
2013-10-24 16:18:52 +02:00 |
|
|
indesign47
|
84454bbc1c
|
[*] BO : AdminImport add img manufacturers-suppliers
|
2013-10-24 16:16:29 +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 |
|
|
indesign47
|
f0ed5a303c
|
[*] BO : AdminImport add img suppliers
|
2013-10-24 15:49:56 +02:00 |
|
|
indesign47
|
4803530eed
|
[*] BO : AdminImport add img manufacturers
|
2013-10-24 15:47:31 +02:00 |
|