Bryan Kowal
9a7d0492fe
Merge branch 'ss_sync' (OB12.6.1-10) into development
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a33740e915b87b66abc5
2012-06-27 17:21:48 -05:00
Bryan Kowal
5874255a05
Issue #817 - fix ncep/gov.noaa.nws.ncep.metParameters and a few merge issues
...
Change-Id: I54dc0ee5e4f9a6592bb0a3281a2bc6d806abff55
Former-commit-id: f7d19019a998fdfa6f37
2012-06-27 16:22:53 -05:00
Steve Harris
eacd5aeb7f
12.6.1-10 baseline
...
Former-commit-id: 8dc4a774e23cd0902b49
2012-06-21 08:58:00 -05:00
Steve Harris
8367fb50f5
Revert "12.6.1-10 baseline"
...
This reverts commit b33c5bdfcfa2c0893d1addde63eee0b4b1f6975f25198a5cd6
2012-06-21 08:51:08 -05:00
Steve Harris
b33c5bdfcf
12.6.1-10 baseline
...
Former-commit-id: ddde63eee0a2c0893d1a
2012-06-21 08:38:48 -05:00
Bryan Kowal
94e4af6d47
Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
...
Former-commit-id: 207bbd308725addabe64
2012-06-19 15:03:57 -05:00
Steve Harris
27b50c57bd
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
...
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 2f20a86a3048860df690
2012-06-12 14:37:12 -05:00
Steve Harris
a945ed8e6d
12.6.1-5 baseline
...
Former-commit-id: c99afab05f8947efbc7f
2012-06-11 16:23:47 -05:00
Steve Harris
1fdc0aa237
12.6.1-3 baseline
...
Former-commit-id: 42f3513175d57eb02b9e
2012-06-11 16:23:47 -05:00
Steve Harris
7da9afe36a
12.5.1-15 baseline
...
Former-commit-id: d5c238de07cee20d8656
2012-06-11 16:02:30 -05:00
Steve Harris
676ea3192f
12.5.1-15 baseline
...
Former-commit-id: b13cbb7e003904c4ccf5
2012-06-08 13:39:48 -05:00
Max Schenkelberg
a6ca2ee4f6
Issue #590 fixed GFE session creation bugs. Added refresh to tool items
...
on undo/redo from keyboard
Former-commit-id: b5da470e0a8b87b6a0a1
2012-06-05 16:43:27 -05:00
Steve Harris
ce0422a34a
12.5.1-9 baseline
...
Former-commit-id: 8f3c9ebfb71f542697cb
2012-05-21 17:48:55 -05:00
Steve Harris
c452cce633
12.5.1-6 baseline
...
Former-commit-id: 24474489f9fa87dc6cf1
2012-05-16 16:41:22 -05:00
Max Schenkelberg
aa5f1d12db
Issue #588 Fix VizPainter.py bug from previous commit
...
Change-Id: I58c217f5abcefd637097bd5c9c6824015ea082b7
Former-commit-id: c2e1e83033ea2151970a
2012-05-09 15:38:03 -05:00
Max Schenkelberg
3ca8ca6f01
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 78e1bd2c621f5abc6e20
2012-05-09 15:02:30 -05:00
Steve Harris
63ea8599d7
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
...
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 27bc36981858037cb5d1
2012-05-09 13:14:00 -05:00
Steve Harris
a821111fbf
12.5.1-2 baseline
...
Former-commit-id: 84d191e7b6b36c69cc67
2012-05-03 19:17:13 -05:00
Steve Harris
a28d70b5c5
12.4.1-10 baseline
...
Former-commit-id: 9f8cb727a58485b90ff8
2012-05-01 18:06:13 -05:00
Steve Harris
aabc3842ac
12.4.1-10 baseline
...
Former-commit-id: 704b75e1a101457fbbde
2012-04-24 15:38:29 -05:00
Steve Harris
a4e519f3cd
12.4.1-4 baseline
...
Former-commit-id: 67a5a683002a216f333c
2012-04-18 15:18:16 -05:00
Bryan Kowal
10a291afa1
Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
...
Former-commit-id: 6ddeef48face99417a2a
2012-04-10 16:42:36 -05:00
Steve Harris
ce3b74c605
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f22bd792cd9
2012-03-30 08:38:33 -05:00
Steve Harris
3d511fe719
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
...
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: d0bbbfefcc7a10ca9766
2012-02-23 10:06:18 -06:00
Steve Harris
4450cf8963
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae9874154be9660f1
2012-02-22 11:14:43 -06:00
Steve Harris
aaead73ec5
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 94c2ea985b9995d22e25
2012-02-22 10:12:49 -06:00
Steve Harris
54b5b6baef
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: 4b76d22f77cc66c8be24
2012-02-20 12:43:38 -06:00
Steve Harris
65b22abd24
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 93f6535bd8b137302802
2012-02-17 10:55:02 -06:00
Bryan Kowal
2c3f67d470
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
...
Former-commit-id: 34d9122f14c77b9558e1
2012-02-13 10:08:15 -06:00
Ben Steffensmeier
63ef103145
Issue #228 change plots, grid icons, and radar icons
...
to use a new PointImageExtension which provides an
interface for drawing images at a single point,
which kml can use to extract plot images.
Change-Id: I29b07ed4f9e8ea95ed131ab1eb3ca27efadaf0e2
Former-commit-id: d97660326213a99abe7b
2012-02-01 12:45:56 -06:00
Nate Jensen
29be9b82bd
Issue #181 fix ncep
...
Change-Id: If0e2947c33523ada50036212666867a7c5138c17
Former-commit-id: ca923b947515e0a5e68d
2012-01-26 17:28:06 -06:00
Roger Ferrel
c6f2b90560
Issue #181
...
new files not indexed
Former-commit-id: 472e788dba69f8daedff
2012-01-26 14:37:19 -06:00
Roger Ferrel
cbd8827872
Issue #181
...
The January ncep_build/build.cave changes
Former-commit-id: f00f3dd332750b17a81c
2012-01-26 11:25:39 -06:00
Bryan Kowal
5eb9afeb98
Issue #22 - merging Windows MSI installer changes into git thinclient branch.
...
Former-commit-id: 48b420cbb2ff44a81ceb
2012-01-23 12:36:13 -06:00
Matt Nash
1faae42484
Moving 12.1.1 into ss_sync
...
Former-commit-id: 66be3bec40c83e5ff474
2012-01-19 11:53:12 -06:00
root
3360eb6c5f
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 9f19e3f71206a8b51d6d
2012-01-06 08:55:05 -06:00
