Author: jacopoc
Date: Fri Aug 31 08:40:21 2012
New Revision: 1379363
URL:
http://svn.apache.org/viewvc?rev=1379363&view=revLog:
Applied fix from trunk for revision: 1379340
===
Removed a bunch of empty/unused files from webpos application and added reference to 2 JQuery files used by the webpos application to the LICENSE file.
Removed:
ofbiz/branches/release12.04/specialpurpose/webpos/script/org/ofbiz/webpos/WebPosServices.xml
ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/buttons/
ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/buttons/
ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl
ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/includes/Footer.ftl
ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/includes/Language.ftl
ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/manager/ModifyPrice.ftl
ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/payment/ClearPayment.ftl
ofbiz/branches/release12.04/specialpurpose/webpos/webapp/webpos/payment/PaySetRef.ftl
ofbiz/branches/release12.04/specialpurpose/webpos/widget/ButtonsScreens.xml
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/LICENSE
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1379340
Modified: ofbiz/branches/release12.04/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/LICENSE?rev=1379363&r1=1379362&r2=1379363&view=diff==============================================================================
--- ofbiz/branches/release12.04/LICENSE (original)
+++ ofbiz/branches/release12.04/LICENSE Fri Aug 31 08:40:21 2012
@@ -1235,6 +1235,8 @@ ofbiz/trunk/framework/entity/lib/ofbiz-m
ofbiz/trunk/framework/base/lib/slf4j-api-1.6.4.jar
ofbiz/trunk/framework/base/lib/slf4j-simple-1.6.4.jar
ofbiz/trunk/framework/images/webapp/images/jquery/*
+ofbiz/trunk/specialpurpose/webpos/webapp/webpos/images/js/jquery.hotkeys-0.7.9.min.js
+ofbiz/trunk/specialpurpose/webpos/webapp/webpos/images/js/WebPosHotkeys.js
=========================================================================
The MIT License