 Damien Metzger
|
6796b64e18
|
Merge pull request #691 from djfm/development
// fixed translation of modules descriptions containing quotes
|
2013-09-23 07:51:57 -07:00 |
|
|
Jerome Nadaud
|
5206496f64
|
[-] BO : Fix Bug For new Fancy Box events
|
2013-09-23 11:22:51 +02:00 |
|
|
gRoussac
|
e2a1f5101c
|
[-] BO : Bad input radio names
|
2013-09-20 15:27:31 +02:00 |
|
|
gRoussac
|
e0b59082f9
|
[-] BO : Issue with domready on adminImport
|
2013-09-19 17:19:51 +02:00 |
|
|
gRoussac
|
ea6ea955bb
|
// licence
|
2013-09-19 16:39:21 +02:00 |
|
|
gRoussac
|
0c511dead5
|
[*] FIX #PSCFV-8106 do not regenerate thumbnails if not
|
2013-09-19 16:28:19 +02:00 |
|
|
djfm
|
0a9f425281
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-09-18 16:08:44 +00:00 |
|
|
gRoussac
|
f293562ea4
|
[-] BO : Fix bug #PSCFV-8214 import entity pre selected
|
2013-09-18 15:03:16 +02:00 |
|
|
Rémi Gaillard
|
47c5f400ee
|
// Add gender on order view
|
2013-09-17 16:30:47 +02:00 |
|
|
Damien Metzger
|
0e3d53321a
|
[-] BO : limited the number of customers displayed in the group view to 100 in order to avoid memory usage error
|
2013-09-16 09:56:22 +02:00 |
|
|
Rémi Gaillard
|
f9b1f0ab5e
|
[*] Core: don't re-generate the class_index.php file if a class is not known to avoid misuse of class_exists()
|
2013-09-12 15:03:23 +02:00 |
|
|
gRoussac
|
dfdbe39ee3
|
[-] BO : Small changes when creating vouchers in back office orders
|
2013-09-11 16:28:11 +02:00 |
|
|
Jerome Nadaud
|
c502c9766f
|
[-] BO : FixBug PSCFV-10331 - Tax rules Pagination
|
2013-09-09 15:04:14 +02:00 |
|
|
djfm
|
641cf225f2
|
// fix small translation bug PSCFV-10329
|
2013-09-09 09:47:44 +00:00 |
|
|
Damien Metzger
|
ec11b7e064
|
// Better control of the requests when our website is down
|
2013-09-06 10:18:48 +02:00 |
|
|
gRoussac
|
6daf8ebbfa
|
[-] BO : Fix error returned when first import of a localisation pack
|
2013-09-03 18:20:58 +02:00 |
|
|
Rémi Gaillard
|
6059b4301a
|
// states list
|
2013-09-02 17:10:20 +02:00 |
|
|
Rémi Gaillard
|
51083e17af
|
//
|
2013-08-29 17:18:05 +02:00 |
|
|
Rémi Gaillard
|
c736c28ab5
|
// small ajax.php clean
|
2013-08-29 11:47:11 +02:00 |
|
|
Vincent Augagneur
|
39c882cdb4
|
//small fix
|
2013-08-27 16:21:13 +02:00 |
|
|
Vincent Augagneur
|
ad428dfb2b
|
//MERGE branche release
|
2013-08-26 10:59:36 +02:00 |
|
|
Rémi Gaillard
|
099baaef70
|
// small change on specific price rules after condition deletion
|
2013-08-21 19:14:59 +02:00 |
|
|
Jerome Nadaud
|
155fd516ba
|
// Misplaced if
|
2013-08-19 14:41:08 +02:00 |
|
|
Jerome Nadaud
|
1138e8d01a
|
[-] BO : FixBug Friendly URL change
|
2013-08-19 10:17:42 +02:00 |
|
|
Rémi Gaillard
|
24ac8582bf
|
[*] BO: Warehouse name is now displayed on each product line orders
|
2013-08-14 15:02:30 +02:00 |
|
|
Vincent Augagneur
|
ec39b9e701
|
[-] BO : fixed bug #PSCFV-10111 when carrier is free don't display ranges in summary
|
2013-08-14 14:19:52 +02:00 |
|
|
Vincent Augagneur
|
f8acc2a15e
|
//small typo
|
2013-08-13 16:46:44 +02:00 |
|
|
Vincent Augagneur
|
6e386868a6
|
[-] BO : fixed bug #PSCFV-10096
|
2013-08-13 16:14:09 +02:00 |
|
|
gRoussac
|
e8685b1430
|
[*] BO : Add clear smarty cache button
|
2013-08-13 15:11:00 +02:00 |
|
|
Damien Metzger
|
b1b636a911
|
// Added helpbox and fixed translation
|
2013-08-13 14:16:40 +02:00 |
|
|
Vincent Augagneur
|
136586830d
|
//small fix
|
2013-08-12 15:09:40 +02:00 |
|
|
Vincent Augagneur
|
52806c0056
|
[-] BO : fixed bug #PSCFV-10033 - disable next step if no range has been added on carrier wizard
|
2013-08-12 14:41:44 +02:00 |
|
|
Vincent Augagneur
|
431aa78b6f
|
//small fix
|
2013-08-09 16:36:26 +02:00 |
|
|
Vincent Augagneur
|
73f40a6cc6
|
//fixed carrier wizard typewatch
|
2013-08-07 17:29:44 +02:00 |
|
|
Jerome Nadaud
|
cd1ed74d8e
|
[-] BO : FixBug #PSCFV-10038 escaped quote in address fields
|
2013-08-07 11:53:12 +02:00 |
|
|
gRoussac
|
82621c08ec
|
[-] BO : Do not display root category bool if addrootcategory not in url
|
2013-08-07 11:51:48 +02:00 |
|
|
Vincent Augagneur
|
67b44b5f17
|
//fixed carrier bug and added typewatch plugin on range validation
|
2013-08-06 18:04:12 +02:00 |
|
|
Vincent Augagneur
|
478e338df0
|
//added active field on carrier wizard
|
2013-08-06 11:40:03 +02:00 |
|
|
gRoussac
|
a69d1c6d05
|
Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug
Conflicts:
controllers/admin/AdminPerformanceController.php
install-dev/data/xml/configuration.xml
|
2013-08-06 10:42:44 +02:00 |
|
|
Vincent Augagneur
|
3a75a783f6
|
//added label on carrier zones && improve range validation
|
2013-08-05 16:54:36 +02:00 |
|
|
Vincent Augagneur
|
5a88dc0f8b
|
//fixed bug on carrier wizard when edit carrier
|
2013-08-05 14:06:50 +02:00 |
|
|
Rémi Gaillard
|
003c05a729
|
[-] BO: Fix #PSCFV-9885 catalog price rules edition
|
2013-08-05 09:55:29 +02:00 |
|
|
Gregory Roussac
|
47b7e6aab5
|
Merge pull request #392 from ldecoker/patch-4
[-] [BO] : The div for colorAttributeProperties is not closed
|
2013-08-02 09:15:51 -07:00 |
|
|
Vincent Augagneur
|
be93a00277
|
//new place for validate and add new range && global range validation part 1 on carrier wizard
|
2013-08-02 17:29:15 +02:00 |
|
|
Vincent Augagneur
|
f2146ac2ae
|
//fixed somes bug on carriers wizard
|
2013-08-02 10:54:07 +02:00 |
|
|
Vincent Augagneur
|
9e720da3d6
|
//carrier wizard free shipping fix & added currency sign on new range
|
2013-08-02 10:22:06 +02:00 |
|
|
Vincent Augagneur
|
ac48c1b786
|
//remove inline css
|
2013-08-01 18:26:39 +02:00 |
|
|
Vincent Augagneur
|
1447be6f3c
|
//fixed bug when changing range type
|
2013-08-01 17:16:52 +02:00 |
|
|
Vincent Augagneur
|
fa958c9a5e
|
//carrier wizard currency sign bug
|
2013-08-01 17:13:08 +02:00 |
|
|
Vincent Augagneur
|
adede4f7ea
|
//small fix
|
2013-08-01 16:11:50 +02:00 |
|