/[Apache-SVN]
ViewVC logotype

Revision 1044245


Jump to revision: Previous Next
Author: jleroux
Date: Fri Dec 10 09:14:36 2010 UTC (13 years, 4 months ago)
Changed paths: 265 (showing only 100; show all)
Log Message:
Merges the trunk at r1044232 (few false conflicts handled by hand)


Changed paths

Path Details
Directoryofbiz/branches/jquery/ modified , props changed
Directoryofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/AIMRespPositions.java modified , props changed
Directoryofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/authorizedotnet/CPRespPositions.java modified , props changed
Directoryofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java modified , props changed
Directoryofbiz/branches/jquery/applications/accounting/src/org/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java modified , props changed
Directoryofbiz/branches/jquery/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/accounting/webapp/accounting/reports/AcctgTransSearchResult.fo.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java modified , text changed , props changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java modified , text changed , props changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java modified , text changed
Directoryofbiz/branches/jquery/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java modified , text changed
Directoryofbiz/branches/jquery/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java modified , text changed
Directoryofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/bom/EditProductBom.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java modified , props changed
Directoryofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml modified , props changed
Directoryofbiz/branches/jquery/applications/order/src/org/ofbiz/order/requirement/RequirementServices.java modified , text changed , props 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/ShipSettings.groovy modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductUomDropDownOnly.groovy modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/lookup/LookupAssociatedProducts.groovy modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/order/findOrders.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/order/webapp/ordermgr/return/returnLinks.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy modified , props changed
Directoryofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml modified , text changed
Directoryofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml modified , props changed
Directoryofbiz/branches/jquery/applications/product/src/org/ofbiz/product/category/OfbizCatalogUrlTransform.java modified , props changed
Directoryofbiz/branches/jquery/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java modified , props changed
Directoryofbiz/branches/jquery/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/product/webapp/catalog/find/advancedsearch.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/product/webapp/catalog/product/EditVirtualProductInventory.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/product/webapp/catalog/product/ViewProductOrders.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/product/webapp/facility/shipment/VerifyPick.ftl modified , text changed
Directoryofbiz/branches/jquery/applications/securityext/src/org/ofbiz/securityext/da/ServiceDaHandler.java modified , props changed
Directoryofbiz/branches/jquery/applications/securityext/src/org/ofbiz/securityext/test/AuthorizationTests.java modified , props changed
Directoryofbiz/branches/jquery/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl modified , text changed
Directoryofbiz/branches/jquery/debian/EncryptPassword.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/DependencyPool.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/ExecutionPool.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/GeneratedResult.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/TTLCachedObject.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/TTLObject.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/AsyncTTLObjectTest.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/DependencyPoolTests.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/SyncTTLObjectTest.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/TTLCachedObjectTest.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/concurrent/test/TTLObjectTest.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/GenericSingletonToList.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/GenericSingletonToSet.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/JSONConverters.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/JSONResult.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/NetConverters.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/DateTimeTests.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/conversion/test/MiscTests.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/json/JSONWriter.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/json/test/JSONTests.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/IsEmpty.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/LockedBy.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/ObjectWrapper.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/SourceMonitored.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/lang/test/ComparableRangeTests.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/test/GenericTestCaseBase.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/IndentingWriter.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/RMIExtendedSocketFactory.java modified , text changed , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/ReferenceCleaner.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/cache/test/UtilCacheTests.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMap.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapCollection.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapEntry.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapEntrySet.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapKeySet.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapSet.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/GenericMapValues.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/IteratorWrapper.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/MapContext.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/ReadOnlyMapEntry.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/collections/test/GenericMapTest.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java modified , text changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/IndentingWriterTests.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/ObjectTypeTests.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/ReferenceCleanerTests.java modified , props changed
Directoryofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/test/StringUtilTests.java modified , props changed
[...]

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26