dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
889a2006ecc7e70f5076f75d200459c5bf64703c
PrestaShop/js
T
History
Kevin Granger 889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/template/controllers/customer_threads/message.tpl
	admin-dev/themes/default/template/controllers/customers/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/favorites.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/modules/tab_module_line.tpl
	admin-dev/themes/default/template/controllers/modules_positions/list_modules.tpl
	admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/associations.tpl
	admin-dev/themes/default/template/controllers/products/combinations.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/informations.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/controllers/referrers/helpers/view/view.tpl
	admin-dev/themes/default/template/header.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/ProductSale.php
	classes/helper/HelperList.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminCustomersController.php
	controllers/admin/AdminMetaController.php
	controllers/admin/AdminModulesController.php
	controllers/admin/AdminPerformanceController.php
	controllers/admin/AdminProductsController.php
	controllers/front/ParentOrderController.php
	install-dev/theme/views/welcome.phtml
	modules/blocknewproducts/blocknewproducts.php
	modules/blocktopmenu/blocktopmenu.php
	modules/importerosc/importerosc.php
	modules/mailalerts/mailalerts.php
	modules/shopimporter/shopimporter.php
	modules/statsstock/statsstock.php
	themes/default/css/product_list.css
2013-11-04 14:43:01 +01:00
..
cropper
// Welcome 2013
2013-01-04 11:19:03 +01:00
jquery
// manually merge of modules search
2013-10-16 11:36:40 +02:00
tiny_mce
[-] BO : FixBug #PSCFV-10600 - Unmatched Boundary with mod_security
2013-10-24 18:36:36 +02:00
vendor
// feedback button
2013-10-11 18:26:12 +02:00
.htaccess
//small fix
2011-10-04 16:25:08 +00:00
admin_carrier_wizard.js
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-14 12:21:29 +02:00
admin_order.js
// small changes on orders view
2013-10-23 12:10:02 +02:00
admin-categories-tree.js
// Welcome 2013
2013-01-04 11:19:03 +01:00
admin-dashboard.js
Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-10-30 10:52:04 +01:00
admin-dnd.js
[-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries
2013-01-23 15:48:15 +01:00
admin-products.js
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
admin-scene-cropping.js
// Welcome 2013
2013-01-04 11:19:03 +01:00
admin-translations.js
// Welcome 2013
2013-01-04 11:19:03 +01:00
admin.js
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
adminImport.js
[-] BO : Could noty save ImportMatchs
2013-10-03 11:15:03 +02:00
ajax.js
// Welcome 2013
2013-01-04 11:19:03 +01:00
attributesBack.js
// Welcome 2013
2013-01-04 11:19:03 +01:00
checkLangPack.js
[-] BO : Fix bug #PSCFI-7231 strtolower iso_lang for package download link
2013-05-27 18:13:13 +02:00
date.js
2011-07-06 10:54:11 +00:00
fileuploader.js
// Product image upload failed with bad content-type header
2013-10-28 14:58:19 +01:00
form.js
/////
2013-08-29 17:21:27 +02:00
gg-translate.js
2011-07-06 10:54:11 +00:00
helpAccess.js
// remove notification for helpAccess calls
2012-04-05 09:57:16 +00:00
hookLiveEdit.js
[-] FO : fixed entities issue in javascript alerts #PSCFV-9001
2013-06-26 16:22:57 +02:00
index.php
// Welcome 2013
2013-01-04 11:19:03 +01:00
login.js
// fix login - (tabindex, loading, ellipsis)
2013-10-25 14:58:10 +02:00
notifications.js
// Fix notifications
2013-10-10 11:02:33 +02:00
pluginDetect.js
2011-07-06 10:54:11 +00:00
price.js
// Welcome 2013
2013-01-04 11:19:03 +01:00
productTabsManager.js
[-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries
2013-01-23 15:48:15 +01:00
retro-compat.js.php
__DIR__ was never defined
2013-10-04 17:18:23 -07:00
sendMailTest.js
// Advanced parameters bootstrap design
2013-09-25 15:15:28 +02:00
tinymce.inc.js
[+] BO Wip BS -> Products + fix
2013-07-05 18:36:42 +02:00
toggle.js
// Welcome 2013
2013-01-04 11:19:03 +01:00
toolbar.js
// Fix warning
2013-09-25 11:43:14 +02:00
tools.js
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap
2013-11-04 14:43:01 +01:00
validate.js
// validators
2013-11-02 10:50:02 +01:00