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

98 Commits

Author SHA1 Message Date
Jerome Nadaud
f44ecb9fc8 // Products section list adjustment 2013-09-20 16:19:50 +02:00
Jerome Nadaud
cd627113b6 // Some fix 2013-09-19 12:13:24 +02:00
Jerome Nadaud
62b4a3cd5e [+] BO : Page header toolbar 2013-08-27 18:42:24 +02:00
Kevin Granger
3005ca39f2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/modules_positions/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/input_text_lang.tpl
	admin-dev/themes/default/template/controllers/products/shipping.tpl
	admin-dev/themes/default/template/controllers/shipping/content.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	admin-dev/themes/default/template/toolbar.tpl
	classes/helper/HelperList.php
	controllers/admin/AdminCategoriesController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminModulesPositionsController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminStockInstantStateController.php
	css/admin.css
	js/admin-products.js
	js/admin.js
 2013-08-21 09:14:10 +02:00
Jerome Nadaud
95f775daa1 [+] BO : Catalog Bulk actions 2013-08-07 10:52:23 +02:00
Kevin Granger
9d16eb1d1b // BO fix + work on helpers + compass/codekit config 2013-07-22 16:43:16 +02:00
Piotr Moćko
291cec36ab Do not limit features value on a list 
Controller use default method getList with pagination of 50 items. Argument $limit should be set to FALSE to disable limit, because if you have more than 50 values of one feature, then you can not access them in back office.
 2013-07-11 18:49:44 +02:00
fram
ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
fram
77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard
2f08f6a292 [-] BO: Fix form displayed for features add after error 2013-02-25 16:45:17 +01:00
Rémi Gaillard
31c27ad86b [-] BO: Fix form displayed for features add after error 2013-02-25 16:45:17 +01:00
djfm
385c593129 //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
djfm
714a5e08cc //Changed English strings using the translationsenglish module. 2013-01-04 16:58:58 +01:00
François Gaillard
064ba453e6 // Welcome 2013 2013-01-04 11:19:03 +01:00
Francois Gaillard
8baf87eef5 // Welcome 2013 2013-01-04 11:19:03 +01:00
vAugagneur
a1db83ef41 //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
vAugagneur
be946319be //remove svn keyword @version Release: $ 2012-11-22 11:57:40 +01:00
lLefevre
779cf350af // Revert Revision 17884 : #PSCFV-5017 : update bad licenses in all files 2012-10-17 09:29:43 +00:00
lLefevre
6588f9514c // 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
398d345362 // #PSCFV-5017 : update bad licenses in all files 2012-10-17 06:18:59 +00:00
lLefevre
2f4df32eaf [-] BO : fix #PSCFV-4053 2012-10-16 09:52:07 +00:00
lLefevre
f67dbd5f39 [-] BO : fix #PSCFV-4053 2012-10-16 09:52:07 +00:00
vAugagneur
5023d8eee8 [-] BO : fixed bug #PSCFV-4439 2012-10-09 15:45:23 +00:00
vAugagneur
35dbdb87a0 [-] BO : fixed bug #PSCFV-4439 2012-10-09 15:45:23 +00:00
dMetzger
526a99f8c5 // Clean AdminController methods did not return the appropriate value #PSCFV-3645 2012-08-17 07:03:54 +00:00
dMetzger
841db7a805 // Clean AdminController methods did not return the appropriate value #PSCFV-3645 2012-08-17 07:03:54 +00:00
mDeflotte
51a3578325 [-] BO : #PSCFV-2596 - Hide custom features values from customization detail list 2012-08-06 12:37:21 +00:00
mDeflotte
e728f6ef06 [-] BO : #PSCFV-2596 - Hide custom features values from customization detail list 2012-08-06 12:37:21 +00:00
rGaillard
95ce439d4e // delete ajax_send_mail_test.php 2012-06-19 08:40:44 +00:00
rGaillard
e0d1c17d09 // delete ajax_send_mail_test.php 2012-06-19 08:40:44 +00:00
mDeflotte
21be2b2b1f [-] BO : #PSCFV-2473 - Fix bug with attribute value and shop 2012-05-21 15:32:56 +00:00
mDeflotte
a4368658f6 [-] BO : #PSCFV-2473 - Fix bug with attribute value and shop 2012-05-21 15:32:56 +00:00
tDidierjean
c4ea27d4b0 [*] BO : #PSFV-865 - it is now possible to use drag and drop positions in custom controllers using HelperList 2012-04-18 15:48:38 +00:00
tDidierjean
45ea9fdaae [*] BO : #PSFV-865 - it is now possible to use drag and drop positions in custom controllers using HelperList 2012-04-18 15:48:38 +00:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
rMalie
009e190263 // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
tDidierjean
c5bf3ab59a // Rename fieldsDisplay to fields_list part2 (timeout) 2012-03-29 16:29:31 +00:00
tDidierjean
ba2abcd990 // Rename fieldsDisplay to fields_list part2 (timeout) 2012-03-29 16:29:31 +00:00
tDidierjean
98aa77ef24 // Refactoring: remove $token arg from process functions 2012-03-26 15:25:36 +00:00
tDidierjean
365248d632 // Refactoring: remove $token arg from process functions 2012-03-26 15:25:36 +00:00
tDidierjean
818ae88be1 [-] BO : #PSFV-704 - refactoring of AdminFeaturesController and fix of broken bulk delete 2012-03-26 12:29:34 +00:00
tDidierjean
dd75df4e69 [-] BO : #PSFV-704 - refactoring of AdminFeaturesController and fix of broken bulk delete 2012-03-26 12:29:34 +00:00
lLefevre
1998bb56d4 // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
lLefevre
c21bef2acf // Fix update english key of translations in all files 2012-03-14 12:25:51 +00:00
tDidierjean
b2e056ec8b [*] BO : #PSFV-481 - Refactor HelperList position management 2012-03-13 16:22:23 +00:00
tDidierjean
eb8447eb2a [*] BO : #PSFV-481 - Refactor HelperList position management 2012-03-13 16:22:23 +00:00
mDeflotte
318443a150 [-] BO : #PSTEST-989 - Remove button "Save and add" on form add/edit feature 2012-03-08 09:31:38 +00:00
mDeflotte
f48ba19ca7 [-] BO : #PSTEST-989 - Remove button "Save and add" on form add/edit feature 2012-03-08 09:31:38 +00:00
tDidierjean
c0b05dbe6c // rename $toolbar_fix to $toolbar_scroll part2 2012-02-28 17:39:40 +00:00