Kevin Granger
|
67dc7aac04
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
Conflicts:
admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
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/filters.tpl
admin-dev/themes/default/template/controllers/modules/list.tpl
admin-dev/themes/default/template/controllers/orders/form.tpl
admin-dev/themes/default/template/helpers/form/form.tpl
classes/Category.php
classes/controller/AdminController.php
controllers/admin/AdminAttributesGroupsController.php
controllers/admin/AdminFeaturesController.php
controllers/admin/AdminImportController.php
controllers/admin/AdminLogsController.php
install-dev/install_version.php
install-dev/langs/ru/data/tab.xml
js/admin_carrier_wizard.js
modules/loyalty/loyalty.php
|
2013-10-14 12:21:29 +02:00 |
|
Francois Gaillard
|
77b2b4b6ca
|
// Manual merge PS 1.5.6.0
|
2013-10-07 18:22:55 +02:00 |
|
djfm
|
b6bba0c787
|
[*] LO : Removed 'Miss' from the default genders because too country specific
|
2013-10-07 07:53:19 +00:00 |
|
Vincent Augagneur
|
5564b342f4
|
//wizard boostrap and title fix
|
2013-10-04 17:07:10 +02:00 |
|
Damien Metzger
|
a6d8ffa293
|
// More breadcrumbs improvements
|
2013-09-30 15:38:22 +02:00 |
|
djfm
|
65559c5cf4
|
// small improvement to Brazilian translations
|
2013-09-18 16:08:23 +00:00 |
|
Damien Metzger
|
17618efb8b
|
// Fixed details
|
2013-08-27 15:27:51 +02:00 |
|
Vincent Augagneur
|
0cd6c5b200
|
//new tab name for carrier option
|
2013-08-12 17:32:55 +02:00 |
|
Rémi Gaillard
|
c0cf92cbdf
|
[+] BO: Add a wizard to create and edit your carriers
|
2013-07-26 18:27:21 +02:00 |
|
djfm
|
7912aba499
|
[*] TR : Added tab translations for installer languages
|
2013-04-22 15:40:25 +02:00 |
|
Rémi Gaillard
|
fdd4b50bf6
|
[-] Installer: fix installer in PT languahe
|
2013-04-03 11:36:44 +02:00 |
|
Gregory Roussac
|
f26b356f20
|
[-] INSTALLER : Fix crash from genders jpg copy
|
2013-03-06 21:05:51 +01:00 |
|
François Gaillard
|
6b501dc409
|
// URL rewrite encoding fixed
|
2013-02-22 11:19:00 +01:00 |
|
François Gaillard
|
23695a516c
|
// Order confirmation rewrite rule added
|
2013-02-22 10:14:47 +01:00 |
|
vAugagneur
|
fa34534654
|
[+] BO : added new marketing tab
|
2013-02-13 09:57:30 +01:00 |
|
François Gaillard
|
064ba453e6
|
// Welcome 2013
|
2013-01-04 11:19:03 +01:00 |
|
vAugagneur
|
768fcf8f84
|
Merge pull request #75 from @sebastienhouzet
|
2012-12-12 11:24:56 +01:00 |
|
Rémi Gaillard
|
50761112a1
|
[-] Core: send email when payment is remotly accepted #PSCFV-6064
|
2012-12-10 15:57:59 +01:00 |
|
DamienMetzger
|
521945706c
|
[-] Installer : name of the supplier page fixed #PSCFV-5571
|
2012-11-22 15:28:00 +01:00 |
|
vAugagneur
|
a1db83ef41
|
//remove svn keyword @version Release: $
|
2012-11-22 11:57:40 +01:00 |
|
lLefevre
|
946dd2caf7
|
// Revert Revision 17891 : #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 10:13:43 +00:00 |
|
lLefevre
|
04fc63c2b6
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 09:35:11 +00:00 |
|
lLefevre
|
779cf350af
|
// Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 09:29:43 +00:00 |
|
lLefevre
|
046b51ab99
|
// #PSCFV-5017 : update bad licenses in all files
|
2012-10-17 06:18:59 +00:00 |
|
lLefevre
|
9239de5dac
|
[-] BO : fix #PSCFV-4933 : add recursively index.php file
|
2012-10-12 12:17:04 +00:00 |
|
dMetzger
|
ef17e13a78
|
// Update brazilian translations
|
2012-10-04 09:28:19 +00:00 |
|
dMetzger
|
81525cd2ef
|
// Grumpf
|
2012-10-04 09:09:52 +00:00 |
|