dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

46 Commits

Author SHA1 Message Date
Jerome Nadaud
3dd7a17f6f // Some fixtures 2013-11-18 19:53:44 +01:00
Damien Metzger
b548f72ac5 // Attributes and values => Product Attributes 2013-10-24 17:18:45 +02:00
Damien Metzger
c39a74e479 // Renamed Feature into Product Features 2013-10-24 17:07:47 +02:00
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
djfm
819dac6622 // fixed name of gender 2 in English 2013-10-10 09:36:05 +00: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
Damien Metzger
17618efb8b // Fixed details 2013-08-27 15:27:51 +02:00
Damien Metzger
c5f635f967 // Updated some meta and translations 2013-08-20 10:31:03 +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
Gregory Roussac
f26b356f20 [-] INSTALLER : Fix crash from genders jpg copy 2013-03-06 21:05:51 +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
lLefevre
06e88dcdb7 [-] TR : #PSCFV-4027 : change string "tabs" by "Menus"... 2012-09-12 15:06:48 +00:00
dMetzger
6449391653 // Fixed typo #PSCFV-2995 2012-07-03 07:43:31 +00:00
lLefevre
e70a5e0f42 // Fix english translations tab 2012-06-07 16:01:05 +00:00
rMalie
f66ce88f85 // Reorder taxes and tax rules 2012-06-06 12:25:50 +00:00
rMalie
5d056020ff // Rename "Genders" in "Social titles" (ty Xavier) 2012-06-04 14:48:42 +00:00
fBrignoli
8c6a3e3bfb // "Unknown" gender ... seriously? 2012-05-19 10:03:45 +00:00
vSchoener
269d97eab3 // Delete Accounting #2 2012-05-10 10:36:05 +00:00
rMalie
d7337c4d4f // Multishop interface reworked 2012-05-09 15:05:39 +00:00
rMalie
153bd1fc64 // Add translation for AdminLogin page 2012-04-19 08:50:56 +00:00
lLefevre
ac1726d1a8 [-] BO : #PSTEST-1131 : Fix bug rewrite URL for contact form 2012-04-04 15:28:51 +00:00
rMalie
99249b3683 // Add migration of tabs in upgrader 2012-03-12 16:39:15 +00:00
vSchoener
300295ac59 [-] BO : Make a lot of changement on the Accounting (accouting plan / configuration / customer) 2012-03-08 17:21:23 +00:00
fSerny
885dfe0375 // Removing Addons My Account Tab 2012-03-05 14:02:07 +00:00
rMalie
17d19e51cf // Fix Administration tab translations 2012-03-02 15:22:07 +00:00
rMalie
04a5e53284 // Rename Tools in Advanced Parameters in BO 2012-03-02 14:57:12 +00:00
rMalie
d2cfa4e8da [*] BO : reorganization of admin tabs 2012-03-02 14:44:07 +00:00
vSchoener
1e88952721 [+] CORE : Accounting, Add a begin of the Accounting plan detail 2012-02-29 15:28:07 +00:00
rMalie
84807f52d8 // Remove AdminPdf controller and move its configuration in AdminInvoices controller 2012-02-29 12:41:05 +00:00
bMancone
3e22318114 // Fixed #PSTEST-751 2012-02-20 17:46:11 +00:00
bMancone
5190010c82 // Improved Supply Order States 2012-02-06 14:11:29 +00:00
mMarinetti
d67186f592 // install-new renamed to install-dev 2012-01-26 17:35:54 +00:00