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

6387 Commits

Author SHA1 Message Date
Jerome Nadaud 14a9d914d8 // Fix module uninstall button 2013-09-12 18:23:27 +02:00
Jerome Nadaud 29db737c10 // Add autosize to textarea 2013-09-12 16:52:55 +02:00
Jerome Nadaud c105486fa3 // Tree bugs 2013-09-12 15:22:47 +02:00
Jerome Nadaud 873eee8ad0 // Tree list bug 2013-09-12 14:55:45 +02:00
Jerome Nadaud e63ce0a86d // Tree 2013-09-12 14:47:47 +02:00
Jerome Nadaud e9dbadcabf // Tree 2013-09-11 20:41:14 +02:00
Jerome Nadaud 49c9afec40 // Categories tree 2013-09-11 15:08:24 +02:00
Jerome Nadaud e0d33eae9e // Categories Tree changes 2013-09-10 18:40:05 +02:00
Jerome Nadaud 85dc552667 // Toolbar 2013-09-10 14:08:29 +02:00
Damien Metzger 1d8da79507 [-] BO : fixed notifications when there is too much data 2013-09-10 09:17:54 +02:00
Jerome Nadaud e91460b8fe [-] BO : Change Nested categories 2013-09-09 18:58:32 +02:00
Jerome Nadaud 4e8658f1d6 [+] BO : Helper Tree js improvement 2013-09-09 18:57:42 +02:00
Jerome Nadaud accd2d77c1 [+] BO : Adding tree templates and functions 2013-09-09 12:20:58 +02:00
Rémi Gaillard 302d5f94dd // grmbl 2013-09-06 18:33:19 +02:00
Jerome Nadaud c7e4f0ce5f [+] BO : Adding Tree Helper 2013-09-06 17:06:19 +02:00
Jerome Nadaud 36a863df59 [+] BO : Adding Tree Helper 2013-09-06 17:05:19 +02:00
Rémi Gaillard 8868271c07 // push changes 2013-09-05 18:37:25 +02:00
Sarah Lorenzini 73524c7a4c // update maintenance and email pages 2013-09-05 14:16:06 +02:00
Vincent Augagneur 009536d3f4 //small fix on version compare for install module 2013-09-05 10:33:15 +02:00
Rémi Gaillard 6e3d24b567 // add push 2013-09-04 19:33:05 +02:00
Kevin Granger b4ecaf3ddb // Carrier Wizard with bootstrap WIP 2013-09-04 15:38:45 +02:00
Jerome Nadaud 7d61be252f [+] BO : Get categories in nested array 2013-09-03 15:27:58 +02:00
Vincent Augagneur d10a339542 //kevin special commit 2013-09-02 14:47:47 +02:00
Jerome Nadaud 4a7e68ae05 // Modules list fix 2013-08-28 10:18:43 +02:00
Jerome Nadaud ed0037c435 [+] BO : New page header toolbar 2013-08-27 18:21:27 +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
Kevin Granger 17be1e7528 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-08-20 16:40:14 +02:00
Kevin Granger 44655ecdef // breaking things 2013-08-20 16:38:31 +02:00
Jerome Nadaud 00e1b7c0eb [-] BO : FixBug language in label for 2013-08-20 09:36:00 +02:00
Damien Metzger 415ca83b62 // Code cleaning 2013-08-19 15:23:43 +02:00
Damien Metzger 1a81191c09 // Code cleaning 2013-08-19 15:14:05 +02:00
Jerome Nadaud a7f6e91ac0 [-] BO : FixBug #PSCFV-9329 Alias problem in order by 2013-08-19 10:35:43 +02:00
Jerome Nadaud 0e353fe655 [-] BO : Fix bug to check filter values 2013-08-13 15:42:00 +02:00
Jerome Nadaud 5e2a3e3c13 [+] BO : Modal module list 2013-08-13 15:22:18 +02:00
Jerome Nadaud 1af9fdd1b2 [-] BO : Module list new action buttons 2013-08-13 12:28:07 +02:00
Jerome Nadaud 2aa4237bb2 [+] BO : Add otf/woff type to htaccess generator 2013-08-13 10:57:06 +02:00
Jerome Nadaud a0d870c4eb [+] BO : Button action list improvements 2013-08-13 10:10:24 +02:00
Shagshag ce20d55e77 ProductDownload::getNewFilename() little optimisation 
Avoid recursion
 2013-08-12 04:28:58 +02:00
Jerome Nadaud ecfe61972b [+] BO : Change action link for button 2013-08-09 16:07:07 +02:00
Jerome Nadaud cbc7b9567a [-] FO : Do not redirect on 301 when POST request 2013-08-09 10:20:42 +02:00
Jerome Nadaud 1c6eb93951 [-] BO : Check if function mb_encode_mimeheader exist in case some user uninstall it 2013-08-07 17:08:01 +02:00
Jerome Nadaud 44f7356d44 [-] BO : FixBug message charset problem in mail 2013-08-07 16:40:40 +02:00
Gregory Roussac bf355e934e Merge pull request #634 from PhpMadman/RefSort 
[*] FO : Sort by Product reference
 2013-08-06 09:13:06 -07:00
Damien Metzger 5be8e169f5 // Fixed totally unexplicable behavior 2013-08-06 17:40:49 +02:00
Damien Metzger 2303677ebf // Rollback a modification in object model 2013-08-06 16:52:13 +02:00
Damien Metzger a1cf8d462f // Keep remote file retrieval in the right order 2013-08-06 16:42:10 +02:00
PhpMadman 6a54f6efd5 [*] BO: Add reference to FrontController 2013-08-06 15:32:30 +02:00
Damien Metzger 3839dbee9a / Add check in object model 2013-08-06 15:06:46 +02:00
gRoussac 81e4a5f635 [*] BO : Do not insert duplicates in poruct_carrier, thanks @edamart 2013-08-06 11:19:34 +02:00
Francois Gaillard c0bc3bda29 // Bug fix template override & admin templates 2013-08-06 11:13:49 +02:00