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

48 Commits

Author SHA1 Message Date
gRoussac
10dac5a45b [-] CORE : Merge of https://github.com/PrestaShop/PrestaShop/pull/816 2013-11-27 00:06:44 +01:00
Rémi Gaillard
8aa369531e // employee avatar 2013-10-30 18:02:10 +01:00
Jerome Nadaud
f9b115a2f8 // Date Range picker improvements 2013-10-17 11:39:02 +02:00
Jerome Nadaud
a85b931765 // Adding compare options 2013-10-16 19:07:23 +02:00
Jerome Nadaud
dfd00bb064 // Add stats date in install 2013-10-16 14:44:49 +02:00
Jerome Nadaud
d575ba8273 // Adding compare dates to date range picker 2013-10-11 18:30:05 +02:00
Damien Metzger
f80b348d86 // Default vertical menu in BO 2013-10-11 11:02:35 +02:00
Kevin Granger
c7ec33f062 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
 2013-09-13 11:41:14 +02:00
Damien Metzger
06a178b8fe // Replaced screencast option by menu option 2013-09-12 18:24:18 +02:00
Rémi Gaillard
567321dd3d // clean cookie after logout 2013-08-08 11:39:36 +02:00
Rémi Gaillard
6ccf3e839d // change passwd in cookie after changed it 2013-08-07 13:51:18 +02:00
Damien Metzger
91c5d184b6 // Small backend optimization 2013-07-23 09:50:26 +02:00
François Gaillard
064ba453e6 // 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
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
rMalie
37963e07f1 // Filter list of entities per shop in admin if employee is not super admin #PSCFV-2525 2012-05-30 08:22:48 +00:00
rMalie
14cdca92d8 // Remove 'multishop' => true from Employee and AttributeGroup 2012-05-21 09:13:23 +00:00
vChabot
7b5c0465c3 // employee can now be multishop 2012-05-16 14:23:33 +00:00
rMalie
bd1892578d // Fix bug on auths for sub employees #PSFV-849 2012-04-23 09:38:24 +00:00
rMalie
3a2bb555eb // Some optimization #PI-121 2012-04-18 09:57:19 +00:00
rMalie
49869aaaaf // MERGE product_multistore branch : product fields are now editable per shop 2012-04-17 13:32:12 +00:00
lLefevre
13eee403db [-] BO : remove sprintf() which are unnecessary 2012-03-29 08:31:28 +00:00
vAugagneur
9566879f60 //small fix 2012-03-12 15:26:24 +00:00
vAugagneur
526301f67d [-] BO : #PSFV-608 - "Access denied" message in BO when login as Logistician 2012-03-12 14:15:31 +00:00
rMalie
14e6929565 // Welcome 2012² 2012-02-23 16:33:10 +00:00
rMalie
91aae3e665 // Improve multishop API 2012-02-23 15:39:44 +00:00
dMetzger
ad41e83fbc [+] BO : BO width can now be fixed or flexible (you can set it up in your employee account) 2012-02-23 14:42:23 +00:00
mBertholino
aebd1538d0 [*] BO : A new method in Employee class has been written "getEmployeesByProfile". it returns an array of employees who has the given profile. 2012-01-30 10:16:09 +00:00
rMalie
3a7325c75e [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376 2012-01-19 10:14:10 +00:00
rMalie
1506dc39b3 // Format definitions 2011-12-13 13:41:54 +00:00
rMalie
48baf36558 [*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead 2011-12-12 18:10:38 +00:00
rMalie
d3a24b8622 // Remove $table and $identifier property from all classes, and add static $definition instead 2011-12-05 13:56:03 +00:00
lLefevre
70fc45a18d // fix refactoring templates in AdminCustomerThreadsController 2011-12-02 11:19:03 +00:00
tDidierjean
00f61bc35b // Remove BO themes 2011-11-18 10:27:07 +00:00
mMarinetti
afa10c9080 // bugfix duplicated information (show_screenshot) 2011-10-28 16:12:05 +00:00
lLefevre
351a76b661 [*] BO : Rights verification for multi-shop : delete info() 2011-10-10 16:12:58 +00:00
lLefevre
63f696082d [*] BO : Rights verification for multi-shop 2011-10-10 16:10:57 +00:00
rMalie
468306a3ca // Merge -> revision 8952 2011-10-03 09:14:01 +00:00
tDidierjean
3d733ae6e2 // Context part 31 2011-08-17 10:07:12 +00:00
rMalie
0b28aa8f72 // Fix #PSFV-48 2011-08-11 14:42:31 +00:00
rMalie
c17e7c236d // MERGE with 1.4 r7770 2011-07-28 09:20:57 +00:00
tDidierjean
21017fb5d8 // remove 1.4 deprecated functions 2011-07-27 09:51:43 +00:00
tDidierjean
6e93cc2848 // Context part 7 2011-07-15 13:59:26 +00:00
rGaillard
8fc7f11014 2011-07-06 10:54:11 +00:00
rGaillard
d1a13007b9 2011-07-06 10:10:43 +00:00
aFolletete
fbc1882f85 [*] Core : clean all deprecated methods 2011-04-12 18:50:26 +00:00
aFolletete
05a58f53e6 // 1.5 branche creation 2011-04-12 18:24:40 +00:00