mjames-upc
|
c986e0d703
|
typo fix: verticallAlignment to verticalAlignment
Former-commit-id: c8bf982c48949a9d7f4a6cb423f13a0fa61da34f
|
2016-06-27 14:36:02 -05:00 |
|
Steve Harris
|
89e25dd014
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/PrintDialog.java
cave/com.raytheon.viz.hydro/META-INF/MANIFEST.MF
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 30e9ffce1a90bd85f5b310944b309188447439ce
|
2016-05-19 22:07:52 -05:00 |
|
Steve Harris
|
ec8b83dd67
|
Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2
16.2.1-lx-29
Conflicts:
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/total/TotalLightningDecoder.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm
Former-commit-id: 17c68986a20e9a589d40407800dd52678fcda68b
|
2016-05-12 09:28:49 -05:00 |
|
David Gillingham
|
12a0735bb5
|
Omaha #5054 - Fix dialog parenting of SaveLevel2Data dialog when closing MPE daily QC dialog.
Change-Id: Ic4a60bb56d00f506d063e5137a70a627c4f0c7a9
Former-commit-id: 830f1ef6cad1bb9104d459f5bac2acbad98bc89c
|
2016-05-04 12:38:57 -05:00 |
|
David Gillingham
|
c732313e20
|
Omaha #5541 - Fix issues with hide/restore for dialogs during perspective switching.
Change-Id: I8bdca9c14bc4b6c950f398a9fb0a96eff6d6c378
Former-commit-id: 9bd669e8216ea8b169ea8e802c19b22010b1c187
|
2016-04-20 16:25:33 -05:00 |
|
Bryan Kowal
|
505f674a08
|
Omaha #5512 - mpe dialog updates.
Change-Id: Ifd5288b821e208656c10714a78481a7100ec19e5
Former-commit-id: 929b1cbf6929db0fe5b3435ccd250a78a9461347
|
2016-04-14 09:37:35 -05:00 |
|
Bryan Kowal
|
93bf20f99a
|
Merge "Omaha #5512 - mpe polygon dialog gui sizing updates." into omaha_16.2.1-lx
Former-commit-id: df0f9bf23b0edca17a4343f63821c8266b39d194
|
2016-04-14 09:32:10 -05:00 |
|
Bryan Kowal
|
d2b8ffafd6
|
Omaha #5512 - mpe polygon dialog gui sizing updates.
Change-Id: I659b4ebcb7583732a665945cb69ba53bea62607b
Former-commit-id: 6140161188603236b82523c56d4a42cc23f04faf
|
2016-04-14 09:31:11 -05:00 |
|
Bryan Kowal
|
7020a56e1c
|
Omaha #5512 - mpe qc dialog updates.
Change-Id: If0e85e8cba0963353ff70aeb3619c364a5dbe051
Former-commit-id: 065559d328bb0b9e517d75bc66bb9975a44a150b
|
2016-04-13 09:36:05 -05:00 |
|
Steve Harris
|
abaa61769f
|
Merge tag 'OB_16.2.2-3' into omaha_16.2.2
16.2.2-3
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
Former-commit-id: 55bc369bddace873c371d0b5b51c383b33c6ca3d
|
2016-04-12 16:14:15 -05:00 |
|
steve.naples
|
7814a0b807
|
ASM #18350 MPE: DailyQC Temp stations will not display in Daily QC.
Change-Id: I6cd6d9cebdbcf7faddcfb03b7658142872eb9798
Former-commit-id: 7d73b1b6993473a17f8175516cedae2a847e003d
|
2016-04-07 19:27:15 +00:00 |
|
Steve Harris
|
2ba0e17ff0
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Former-commit-id: 23382d06b2bea731deef5b0a01b1b27bb187fb95
|
2016-04-05 23:14:48 -05:00 |
|
Bryan Kowal
|
e728380be7
|
Omaha #5512 - no changes. apply AWIPS II code formatter.
Former-commit-id: 041f9bdcaaaae79875eae37fcc329a086a8c6a4d
|
2016-04-05 16:12:22 -05:00 |
|
steve.naples
|
8ca7209a39
|
ASM #18528 MPE: - Fixed merge issue with Daily QC Temperature Options dialog.
Change-Id: Ia39542f9e5c87670d7ea5636ffde6efbbc6f8952
Former-commit-id: b5ebc6c478a275c12e8e578dc75877eeb7782f7a
|
2016-03-30 22:06:58 +00:00 |
|
Shawn.Hooper
|
1cf2f19e65
|
Merge tag 'OB_16.2.1-17' into asm_16.2.2
16.2.1-17
Change-Id: I3cb4abf93fd7729ea54cbe4c8ecea781579c5db7
Former-commit-id: 17fb0b31a7377334925e852db6fabb7b223594dd
|
2016-03-29 16:43:12 -04:00 |
|
Steve Harris
|
385401f9ae
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 445a3ae3da804f366c1162104640d8459ab650d0
|
2016-03-28 17:31:59 -05:00 |
|
Steve Harris
|
29adcc65b4
|
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 3b7825bf9015097ce3be0a82c7f0a117475fd3e8
|
2016-03-28 17:13:12 -05:00 |
|
Shawn.Hooper
|
850ec358bf
|
ASM #18528 - "Merge tag 'OB_16.2.2-1' into DCS-18528"
16.2.2-1
Change-Id: I7ac65cae4efe4e38b2c059aec6d4808f97f1bf77
Former-commit-id: 8173420a5e472738d4c9255d2ed32e55927c8d07
|
2016-03-28 15:47:44 -04:00 |
|
Steve Harris
|
3ce4378152
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ZoneDbResource.java
Former-commit-id: 6074ea5185430ae4b5c959b02c893d93cf414479
|
2016-03-16 09:43:23 -05:00 |
|
Steve Harris
|
4db3d83cd5
|
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Former-commit-id: 1326695462feadf36857209b39d3061c4d493384
|
2016-03-16 09:02:02 -05:00 |
|
steve.naples
|
db746b7c13
|
ASM #18723 MPE - GageTableDlg fixed to not allow non-generated products for compare.
Change-Id: I91621eec8e5c4ad3daced91245093329f78eae7f
Former-commit-id: 9e38f38bc6db45802e0fb79aace559853075e1ae
|
2016-03-15 18:37:18 +00:00 |
|
Loubna.Bousaidi
|
062d27e6e3
|
ASM #18427 Code Improvements for DR 18384
Change-Id: Ifb965f37e3eb1200444b9f363dd69f10f095e275
Former-commit-id: a5b37dbc2aa6c0b7d0392e27da2e77c7e865634b
|
2016-03-15 18:05:26 +00:00 |
|
Loubna.Bousaidi
|
a004cfe877
|
ASM #18708 Revised the sorting so it doesn't always resort using LID
Change-Id: Ic01c40e54085298f775f6ec0f73998465a26ef65
Former-commit-id: bc6df2f429284f17c0ce089fef8566de821d62ce
|
2016-03-14 13:58:20 +00:00 |
|
David Friedman
|
d7ac171705
|
ASM #18528 - Merge remote branch 'origin/master_16.2.2' into HEAD
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Change-Id: Ie8a4ab8afd5eb80b714f0739bc8ac99fe0552be4
Former-commit-id: 95d232da9522aa1bc9bf738b027c32042eea797e
|
2016-02-29 20:35:54 +00:00 |
|
Steve Harris
|
c2b471a870
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/TCVDictionary.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a7340c2bf23cbc3d27ca52fbf2ccd9c7d1cb09c2
|
2016-02-29 13:39:42 -06:00 |
|
Steve Harris
|
bbd0a34445
|
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 50282f22b76f6d393c1918652a9e0da8696847f0
|
2016-02-29 13:18:08 -06:00 |
|
Shawn.Hooper
|
ffa9a5603c
|
Merge tag 'OB_16.1.2-22' into master_16.2.1
16.1.2-22
Former-commit-id: 76aec34b914155d7072b994dc25fa9bb900d2c9f
|
2016-02-25 15:15:03 -05:00 |
|
steve.naples
|
e0d65642f4
|
ASM #18599 MPE: - Fixed issue where Daily QC Temperature clears grid when editing points.
Change-Id: I8d08d2b8a3c0ff511000969e4311cbbdb627ab85
Former-commit-id: 06e03a88dca4eede28bb3203a28a659f4d9256d0
|
2016-02-23 19:03:44 +00:00 |
|
Shawn.Hooper
|
dbf3fcf7fd
|
Revert "ASM #18105 - Mpe Info needed more space to display basin names"
This reverts commit 7243c656b9 [formerly c34f0038386808f649631e5158af0fc35c260709].
Change-Id: I0a21149dc26f04e3d146264e01c7eab4411d8895
Former-commit-id: 30316ae7e73377703c93f9db67d683dfd9520cbb
|
2016-02-22 17:13:01 -05:00 |
|
Bryan Kowal
|
49e90a8217
|
Omaha #5338 - refresh the list of persistent resources in any mpe frames that exist whenever a
persistent polygon is deleted.
Former-commit-id: 9009c08d5fc90d4daab0ffb1305b22f702c0cf49
|
2016-02-15 16:47:16 -06:00 |
|
Steve Harris
|
85055fcc53
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 68c13f9160746f365bd5f896b1400f1a8099ebe8
|
2016-02-01 11:57:52 -06:00 |
|
Steve Harris
|
dcaaf9f52b
|
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 13a968811d1cdde95f663d7af4b8a6030ece556e
|
2016-01-28 15:47:31 -06:00 |
|
Shawn.Hooper
|
2861d7abd7
|
Merge tag 'OB_16.1.2-14' into master_16.2.1
16.1.2-14
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: If4483610b92d4c2ef975c3ac75403e12a70d612c
Former-commit-id: 66d3cd35731e59996c34f003e42cbb2a41010717
|
2016-01-25 14:32:31 -05:00 |
|
Steve Harris
|
e4202dd626
|
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 6e31f1b2e4f7c30faf67d0d62b5907b111e4b52f
|
2016-01-20 16:49:18 -06:00 |
|
Ron Anderson
|
5ffc65b59d
|
Omaha #5229 Fix merge errors in SaveLevel2Data
Change-Id: Ie27e609925a7ae5231243c70139712ce71b3550b
Former-commit-id: 713ef7be6d924e21a8eefbb220ba1613a650fef7
|
2016-01-20 16:01:07 -06:00 |
|
Steve Harris
|
11a5db155d
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java
Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
|
2016-01-20 15:23:43 -06:00 |
|
Steve Harris
|
52279f6cc1
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertMessageDlg.java
cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GFEConfigDialog.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java
Former-commit-id: afd3fb15b22d92b6b30205446b6fe4b3e21271bf
|
2016-01-20 09:44:34 -06:00 |
|
Ron Anderson
|
24bc0a3344
|
Omaha #5054 Fix Dialog parenting
Change-Id: Ie7e1727ef9666cf510093f8fb6b06a1a258a30e2
Former-commit-id: 5093e43e9d1d26898f9719e00f6489a7f3ea55c8
|
2016-01-19 09:19:13 -06:00 |
|
Shawn.Hooper
|
9dfa998295
|
Merge remote-tracking branch 'origin/master_16.1.2' into asm_16.1.2
Former-commit-id: 82cba204a74b5724c06ac06160e57d63eaf75b34
|
2016-01-15 11:50:18 -05:00 |
|
Mark Ruebens
|
3cee7e5e93
|
Merge "ASM #18092 - MPE: Fix GageTable column select saving and applying settings." into asm_16.1.2
Former-commit-id: 236cc7a1c0b9ffd06690fdfc4dd6915de8df1f97
|
2016-01-14 12:52:19 -05:00 |
|
Ron Anderson
|
9f255c8d50
|
Omaha #5070 Adjust font sizes for dpi scaling
(cherry picked from commit 0fac683b60 [formerly 330ae8034e6457f20224c81cf3886d797ea5b8fc])
Conflicts:
cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
Former-commit-id: 8817960b2aaea9188f868be38930903a498ef633
|
2016-01-13 19:17:37 -06:00 |
|
steve.naples
|
ec95cc5f9c
|
ASM #18092 - MPE: Fix GageTable column select saving and applying settings.
Change-Id: Ic2497d99a27a1efe58afcb4929f9513d6071c097
Former-commit-id: 2a00e1f6e14946d4a15613f2fa42da6c6a4b157e
|
2016-01-13 18:39:47 +00:00 |
|
Shawn.Hooper
|
bd27f40c6d
|
Merge tag 'OB_16.1.2-9' into master_16.2.1
16.1.2-9
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c
Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
|
2016-01-12 15:10:02 -05:00 |
|
Shawn.Hooper
|
996eee12da
|
Merge remote-tracking branch 'omaha/omaha_16.1.2' into master_16.1.2
Former-commit-id: 6727735b54f2fa9c463a5826bcd09505e6de13da
|
2016-01-08 17:26:48 -05:00 |
|
Shawn.Hooper
|
b9805ddf2e
|
Merge remote-tracking branch 'vlab/ohd_16.1.1.1' into master_16.1.2
Former-commit-id: 4fe656d88ae550c4ee836f1e4efb0e2294ff69dd
|
2016-01-07 17:15:01 -05:00 |
|
Bryan Kowal
|
356b57f7f7
|
Omaha #5235 - do not clear the grid when exiting group edit mode. Eliminated source code warnings.
Former-commit-id: 91e0318ffdf6dd3235a348c34d58ac46eb7903df
|
2016-01-07 15:04:41 -06:00 |
|
Paul Tilles
|
e4bbb25301
|
VLab Issue #13938 - MPE DailyQC; fixes #13938
Change-Id: I66a97b07fe2dc7f7bebc38a5a90e009f90463f9e
Former-commit-id: 9f3c299bc8ac40831b96aaeec25695af45d99675
|
2016-01-06 16:07:56 +00:00 |
|
Shawn.Hooper
|
fad499c581
|
Merge remote-tracking branch 'omaha/omaha_16.1.1.1' into master_16.1.2
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
Change-Id: I2e27575f864da841a07ca019a12819e0fcb16ced
Former-commit-id: 4b93303cd64cdae241f4dfc02fbdc3ab8a2c31f2
|
2016-01-05 20:33:34 -05:00 |
|
Shawn.Hooper
|
c03bf2fc84
|
Merge tag 'OB_16.1.1-32' into master_16.1.2
16.1.1-32
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/EditPrecipStationsDialog.java
Former-commit-id: bbe412da6e8b600bfcab446d46619c57a65efbe8
|
2015-12-22 10:23:34 -05:00 |
|
Shawn.Hooper
|
db7d68f3aa
|
Merge remote-tracking branch 'asm/asm_16.1.1' into master_16.1.1
Former-commit-id: 62dcc684705dac4cc7655cdbd77619b0c6f2ef88
|
2015-12-11 14:43:02 -05:00 |
|