/[Apache-SVN]
ViewVC logotype

Revision 1042964


Jump to revision: Previous Next
Author: jleroux
Date: Tue Dec 7 10:42:16 2010 UTC (13 years, 4 months ago)
Changed paths: 124 (showing only 100; show all)
Log Message:
Merges the trunk at r1042950 (some conflicts handled by hand)


Changed paths

Path Details
Directoryofbiz/branches/jquery/ modified , props changed
Directoryofbiz/branches/jquery/applications/accounting/data/DemoAccountingUserData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/accounting/data/DemoOrganizationData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/accounting/servicedef/services_billing.xml modified , text changed
Directoryofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/data/ContentPortletData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/content/data/ExampleHelpData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/content/data/MimeTypeData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/content/data/UsersDemoData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java modified , text changed
Directoryofbiz/branches/jquery/applications/humanres/data/HumanResHelpData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/marketing/data/sfaDemoData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/order/data/OrderTypeData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/order/entitydef/entitymodel.xml modified , text changed
Directoryofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml modified , props changed
Directoryofbiz/branches/jquery/applications/order/script/org/ofbiz/order/shoppinglist/ShoppingListServices.xml modified , text changed
Directoryofbiz/branches/jquery/applications/order/servicedef/orderProcessXPDL.xml modified , text changed
Directoryofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java modified , text changed
Directoryofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java modified , text changed
Directoryofbiz/branches/jquery/applications/order/src/org/ofbiz/order/order/OrderServices.java modified , text changed
Directoryofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutHelper.java modified , text changed
Directoryofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java modified , text changed
Directoryofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java modified , text changed
Directoryofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java modified , text changed
Directoryofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java modified , text changed
Directoryofbiz/branches/jquery/applications/order/src/org/ofbiz/order/shoppingcart/product/ProductPromoWorker.java modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy
(Copied from ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy, r1042956)
added
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/controller.xml modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl
(Copied from ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/ProductUomDropDownOnly.ftl, r1042956)
added
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/compareproductslist.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/keywordsearch.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/keywordsearchbox.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/order/orderitems.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml modified , text changed
Directoryofbiz/branches/jquery/applications/party/data/PartyDemoData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/party/data/PartyGeoPointData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/party/entitydef/entitymodel_old.xml modified , text changed
Directoryofbiz/branches/jquery/applications/party/script/org/ofbiz/party/party/PartyServices.xml modified , text changed
Directoryofbiz/branches/jquery/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml modified , text changed
Directoryofbiz/branches/jquery/applications/party/servicedef/services.xml modified , text changed
Directoryofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy modified , props changed
Directoryofbiz/branches/jquery/applications/party/webapp/partymgr/party/profileblocks/Content.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/party/widget/partymgr/PartyVisitForms.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/config/ImageProperties.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/config/ProductEntityLabels.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/data/ProductTypeData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/entitydef/entitymodel.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/script/org/ofbiz/product/product/ProductServices.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml modified , props changed
Directoryofbiz/branches/jquery/applications/product/servicedef/services.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/servicedef/services_pricepromo.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/src/org/ofbiz/product/image/ScaleImage.java modified , text changed
Directoryofbiz/branches/jquery/applications/product/src/org/ofbiz/product/price/PriceServices.java modified , text changed
Directoryofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductServices.java modified , text changed
Directoryofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductWorker.java modified , text changed
Directoryofbiz/branches/jquery/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/product/webapp/catalog/reviews/pendingReviews.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.groovy modified , text changed
Directoryofbiz/branches/jquery/applications/product/webapp/facility/shipment/EditShipment.ftl deleted
Directoryofbiz/branches/jquery/applications/product/widget/catalog/FacilityForms.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/widget/catalog/ProductStoreForms.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/widget/facility/ShipmentForms.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/widget/facility/ShipmentScreens.xml modified , text changed
Directoryofbiz/branches/jquery/applications/workeffort/config/EventReminders.properties modified , text changed
Directoryofbiz/branches/jquery/applications/workeffort/data/WorkEffortSecurityData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/workeffort/data/WorkEffortTypeData.xml modified , text changed
Directoryofbiz/branches/jquery/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalConverter.java modified , text changed
Directoryofbiz/branches/jquery/debian/TODO modified , text changed
Directoryofbiz/branches/jquery/debian/ofbiz-framework.ofbiz.init modified , text changed
Directoryofbiz/branches/jquery/debian/override-data.xslt modified , text changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java modified , text changed
Directoryofbiz/branches/jquery/framework/common/config/general.properties modified , text changed
Directoryofbiz/branches/jquery/framework/common/data/UnitData.xml modified , text changed
Directoryofbiz/branches/jquery/framework/common/script/org/ofbiz/common/email/EmailServices.xml modified , text changed
Directoryofbiz/branches/jquery/framework/common/src/org/ofbiz/common/FindServices.java modified , text changed
Directoryofbiz/branches/jquery/framework/common/widget/HelpScreens.xml modified , props changed
Directoryofbiz/branches/jquery/framework/entity/dtd/entitymodel.xsd modified , text changed
Directoryofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/datasource/GenericDAO.java modified , text changed
Directoryofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java modified , text changed
Directoryofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java modified , text changed
Directoryofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/model/ModelEntityChecker.java modified , text changed
Directoryofbiz/branches/jquery/framework/example/data/ExampleHelpData.xml modified , text changed
Directoryofbiz/branches/jquery/framework/example/data/helpdata/HELP_EXAMPLE.xml modified , text changed
Directoryofbiz/branches/jquery/framework/example/data/helpdata/HELP_EXAMPLE_main.xml modified , text changed
Directoryofbiz/branches/jquery/framework/example/widget/example/BirtForms.xml modified , text changed
Directoryofbiz/branches/jquery/framework/example/widget/example/BirtScreens.xml modified , text changed
Directoryofbiz/branches/jquery/framework/images/webapp/images/ecommain.css modified , text changed
Directoryofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/control/ContextFilter.java modified , text changed
Directoryofbiz/branches/jquery/framework/webtools/widget/CacheForms.xml modified , text changed
Directoryofbiz/branches/jquery/framework/webtools/widget/LabelManagerScreens.xml modified , text changed
Directoryofbiz/branches/jquery/framework/webtools/widget/Menus.xml modified , text changed
Directoryofbiz/branches/jquery/framework/webtools/widget/StatsForms.xml modified , text changed
Directoryofbiz/branches/jquery/macros.xml modified , text changed
Directoryofbiz/branches/jquery/specialpurpose/ebaystore/data/DemoEbayStoreData.xml modified , text changed
Directoryofbiz/branches/jquery/specialpurpose/ebaystore/lib/ modified , props changed
Directoryofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoMarketing.xml modified , text changed
[...]

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26