Shawn.Hooper
3a03a83975
Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
...
Former-commit-id: 90719ee2df7532ed6ab3172cf2345b03bced5ef4
2016-05-23 12:57:15 -04:00
mjames-upc
fa4e6b4751
typo fix in FSL grib table
2016-05-22 10:39:26 -06:00
mjames-upc
d26bb58906
ESRL/GSD 3km experimental HRRR support
2016-05-21 13:51:26 -06:00
mjames-upc
759abc9621
five radar decoder threads
2016-05-20 10:47:00 -06:00
Richard Peter
c1ec2e4406
Merge "Omaha #5664 Close netcdf files in pointset decoder." into omaha_16.2.2
...
Former-commit-id: 6a0b24badbdfae8a617e5bb35fcb24742c59d7f5
2016-05-20 11:20:05 -05:00
Ben Steffensmeier
a85a4f6a8c
Omaha #5664 Close netcdf files in pointset decoder.
...
Former-commit-id: 1b82fbbdf5c93fe4fa7984487a02a06f31e9dcc2
2016-05-20 10:50:32 -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
mjames-upc
e1aef47c5a
Merge branch 'unidata_16.1.4' of github.com:Unidata/awips2 into unidata_16.1.4
...
Conflicts:
edexOsgi/build.edex/build.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
rpms/build/common/rpms.sh
2016-05-18 09:34:45 -06:00
mjames-upc
41e328f176
more build updates for 16.1.4-15 from moe
2016-05-18 09:33:18 -06:00
mjames-upc
2b020fee41
build and UI updates for 16.1.4-15
2016-05-18 10:10:31 -05:00
Sean.Webb
275cc1926d
ASM #18987 - Updates to EWW template
...
Change-Id: I1308c1ccd89a14ce076017f54d8090b54014c490
Former-commit-id: 1db43b17f6654231d37e0281ae7a627df863a27e
2016-05-18 04:44:57 -04:00
Steve Harris
e7a171b923
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
...
Former-commit-id: 16a1f86553620541fa175e10d9b7734e13fe98c7
2016-05-17 22:10:58 -05:00
Zhidong.Hao
b93e94bf71
ASM #19009 FFMP: DPR underestimating basin rain averages
...
Change-Id: Ib90ce4a2c3f535f5ce72595abb08996c0c77aedf
Former-commit-id: f6cc23c9e2cfd067ada3832979e342be1cac0292
2016-05-17 09:37:50 -04:00
Wen Kwock
6df6f91580
VLab Issue #18745 - DR17787 fix conflict; fixes #18745 . Includes additions for MRMS from Darrel.
...
Change-Id: I205178d8d6d0740d7484bf81e2270b2d59c5d0e0
Former-commit-id: f51c83713e0d07ecb719260cd1a6f965722da3b3
2016-05-16 16:17:23 -07:00
David Lovely
c8f420f39c
Omaha #5586 Added NASA SPoRT as an optional repo
...
Change-Id: Ieddc4213dcff264bb5c87505fb512a337a9e4e6f
Former-commit-id: 5e2268423c11f5288925310ddbb5de329d8e6c5f
2016-05-16 14:50:37 -05:00
Bryan Kowal
c7c4ef3f31
Omaha #5483 - fix Hydro GUI sizing issues.
...
Change-Id: Ibe0ead7fa2b24b80724b4dcb38ab8b0bc25decd6
Former-commit-id: 9c4bcf5d9896c5e3334ccd419ee929f56c06b0ec
2016-05-16 14:49:04 -05:00
Steve Harris
d0ec543b42
Merge "Omaha #5586 - moving NASA SPoRT plugins to AWIPS2_NASA_SPoRT repository" into omaha_16.2.2
...
Former-commit-id: 7333c85fc9ce61e33a729b4f70d160c6346b2c5f
2016-05-16 14:23:57 -05:00
David Lovely
51b764d689
Omaha #5586 Removed NASA SPoRT features
...
Former-commit-id: 32dda5d366a994590c7f731a378bfa2e8a9e8d14
2016-05-16 14:03:18 -05:00
Shawn.Hooper
ceb9742387
Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1-p1
...
Former-commit-id: af6f5e78ced8e265063fd184af88886fe58bd4fe
2016-05-13 16:23:31 -04:00
Mark Ruebens
99b1b62c99
Merge changes I7e4d3cca,Id75ad2d2 into asm_16.2.1-p1
...
* changes:
ASM #18950 - WarnGen Templates: Special marine warning followup has formatting problem with front event type and line of storms
ASM #18958 - WarnGen Templates: Misc template fixes post 16.1.2 implementation
Former-commit-id: 7ecb4d6a9904cf2f0552454a9f3fdf991d3ec2bb
2016-05-13 14:28:21 -05:00
Mark Ruebens
236d191804
Merge "ASM #18968 - WarnGen Template: OF needs to be of in VM_global_library.vm" into asm_16.2.1-p1
...
Former-commit-id: 54b6eff2eddd813b0f08d6344bb0aef6fa6683dd
2016-05-13 13:03:11 -05:00
Shawn.Hooper
cb056721af
Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
...
Former-commit-id: ae99c4e7b743ff3ae10a73796a14b72426598401
2016-05-13 13:15:53 -04:00
Shawn.Hooper
c58c624779
ASM #18987 - Updates to Extreme Wind Warning Followup Template
...
Change-Id: I2a8598e6af722a5fbed353f6c8d41c241ad6c45f
Former-commit-id: 7dd216cc9a264147189806ca3549700acb0d5c0b
2016-05-13 12:51:30 -04:00
Penghai Wang
2519dfda38
VLab Issue #18616 - DR18984 enable to load all levels of gfeParamInfo.xml; fixes #18616
...
Change-Id: If56ee04aa285a9e9d89b31ec73319070c9b45e1f
Former-commit-id: f026d9b5539377db251ce7ba1795bad9d7d686c5
2016-05-13 16:41:05 +00:00
Shawn.Hooper
3aea06ff70
ASM #18950 - WarnGen Templates: Special marine warning followup has formatting problem with front event type and line of storms
...
Change-Id: I7e4d3cca6fa3f87c90b5fcec1aee53b97ccfd644
Former-commit-id: b3417552085340863cf193e7555a581c17ec6332
2016-05-13 11:30:20 -04:00
Shawn.Hooper
52976849d0
ASM #18958 - WarnGen Templates: Misc template fixes post 16.1.2 implementation
...
Change-Id: Id75ad2d2e0204e5ae85249e431a2a189f56d2a6a
Former-commit-id: 1e92a24fe8d7fd3654cb2a0425efce683d7d1d9f
2016-05-13 11:27:01 -04:00
Shawn.Hooper
afd1a817f6
ASM #18968 - WarnGen Template: OF needs to be of in VM_global_library.vm
...
Change-Id: I8234fa9d8011e77a2d26a36fdb5fc6c6e0596ca5
Former-commit-id: d018dfc0d57751b0cf024bad237d004ff49d5367
2016-05-13 11:23:52 -04:00
Steve Harris
426033b0c2
Omaha #5586 - moving NASA SPoRT plugins to AWIPS2_NASA_SPoRT repository
...
Former-commit-id: e82f241c3b7ea1be18e140dbba838ebcc90d33fd
2016-05-13 10:09:49 -05:00
Shawn.Hooper
4e20a3c69b
ASM #17308 - Revert gridImageryStyleRules.xml to 16.2.2-2 version
...
Change-Id: I24a03427b2d37b3e7188f104cc96e4a7baa5a147
Former-commit-id: 4f083feb5675ed0249459a62c793814a9eb83095
2016-05-12 11:07:49 -04: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
Richard Peter
7d1e95be34
Omaha #5642 - Fix GridCoverage transaction nesting
...
Change-Id: I5347dad1ccc4278823ab10763184ddbd1bdbabda
Former-commit-id: 82b0193e98fe4bb8a6ae7c1a9ab0baf288db8c32
2016-05-10 16:09:43 -05:00
Shawn.Hooper
8977a0a91c
Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
...
Former-commit-id: f45d120949051fa6ffe06b225a05571244042a73
2016-05-05 14:15:17 -04:00
Shawn.Hooper
3c315c8ee4
Merge remote-tracking branch 'vlab/asdt_16.2.2' into master_16.2.2
...
Former-commit-id: 4701750f64bc9d7c911b1bb58a1b48cbb99b85ce
2016-05-05 14:15:12 -04:00
Melissa Porricel
45c1f60ebb
ASM #18361 - Some synoptic obs data not being decoded
...
Change-Id: I474a1c31787fb98f841ad20ddd5bccb2a9a1e0d9
Former-commit-id: a53d7f9691e47257915174556c97c6af139d1d52
2016-05-05 09:09:37 -04:00
Steve Harris
5419e1a273
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: a1bc44e359360b9718945f9db2f435e267a15730
2016-05-04 21:13:12 -05:00
mjames-upc
1b74fa1378
state save for radar viz development
2016-05-04 16:52:45 -05:00
mjames-upc
be4a866daa
figuring out this ToShef nonsense
2016-05-04 16:41:12 -05:00
mjames-upc
2ce7d4df83
mute shef plugins in hydro feature
2016-05-04 15:59:41 -05:00
mjames-upc
31c4b14eee
Merge branch 'unidata_16.1.4' of github.com:Unidata/awips2 into unidata_16.1.4
2016-05-04 14:28:36 -06:00
mjames-upc
f087e01ee8
GFE serverConfig.py updates
2016-05-04 14:27:39 -06:00
mjames-upc
7eed48e4ac
GFE perspective fixes and improvements for 16.1.5
2016-05-04 15:26:31 -05:00
Penghai Wang
87fda2aad8
Merge "VLab Issue #18075 - DR 18336 fix. All keep-alives were being treated as NLDN. Get source from WMO header instead; fixes #18075 " into asdt_16.2.2
...
Former-commit-id: 6b10f777d56029f04826d0789b1dd3aa3969bc3d
2016-05-04 13:11:05 +00:00
mjames-upc
18954d306b
Merge remote-tracking branch 'remotes/unidata/unidata_16.1.4-gfe' into unidata_16.1.4
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
2016-05-03 18:16:45 -05:00
mjames-upc
35486065df
Merge branch 'unidata_16.1.4' of github.com:Unidata/awips2 into unidata_16.1.4
2016-05-03 18:13:39 -05:00
mjames-upc
9e3e5ad2a5
naming/formatting for ImageBlinkDialog; UKMET-Global naming
2016-05-03 18:13:23 -05:00
mjames-upc
a1b90f1b19
massive grid renaming incl. GFE
2016-05-03 16:14:14 -06:00
Andrew Moore
de50a8ac01
VLab Issue #18075 - DR 18336 fix. All keep-alives were being treated as NLDN. Get source from WMO header instead; fixes #18075
...
Change-Id: I53a392780148de85de9c25fff05c313737137b57
Former-commit-id: 3cf025add9b0c2636a442784bb977601ed7b434e
2016-05-03 17:04:25 +00:00
mjames-upc
4373760eaf
further with the menus
2016-05-02 18:22:14 -05:00
mjames-upc
1100f6a49c
purge rule updates for 16.1.4
2016-05-02 16:55:01 -05:00
Penghai Wang
3464ad6b11
Merge branch 'master_16.2.2' into asdt_16.2.2
...
Former-commit-id: 02133bf406abe2ba96c7037cbb30675de2e02918
2016-05-02 19:52:55 +00:00
