David Gillingham
19043b866a
Issue #4344 : Make suggestion blacklist for spellchecker configurable via localization.
...
Change-Id: I1e73afcc2433329bb6b3c3200d776711dc1d7600
Former-commit-id: 44e092d35e214c8f11fedb1c4aee0f78e4f82acc
2015-03-30 11:57:33 -05:00
Steve Harris
1aab7b1831
Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
...
15.1.1-2m
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
2015-03-30 11:07:52 -05:00
Ana Rivera
bcc40073df
Merge "VLab Issue #7249 - Removed extra dashes from baseTDLSurface.xml commented code; fixes #7249 " into field_15.1.1
...
Former-commit-id: aabaec95f61e69d40604b1e1a0c69d83de4a901a
2015-03-27 18:03:19 +00:00
Joshua Watson
5323c60d8f
VLab Issue #7249 - Removed extra dashes from baseTDLSurface.xml commented code; fixes #7249
...
Change-Id: Ifda3cd240b123f2f82b67e7978d2abfee12b247d
Former-commit-id: d5225988678e3bd26470ceb40a24bb7dc6a58af0
2015-03-27 11:53:52 -04:00
Ron Anderson
e6cfc5f40d
Omaha #4027 Convert all GFE text products to mixed case
...
Change-Id: I94275b65e8733d5bed1242f78503f1613b2e0aff
Former-commit-id: 07088e71d78d6302da23683894d96d72e4f69a96
2015-03-26 18:30:39 -05:00
Steve Harris
25bd3ee930
Merge tag 'OB_14.4.1-20m' into omaha_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
2015-03-26 09:57:17 -05:00
Melissa Porricel
d96bbe4799
ASM #16905 - Implement missing RTMA/URMA parameters
...
Change-Id: I4ec616b80b6c8f85bafec46f0c840c3c43a9c527
Former-commit-id: d68078b665787d91bfd92440345d41f9fcc98b3d
2015-03-26 09:58:45 -04:00
Steve Harris
68f4b3c18f
Merge tag 'OB_14.4.1-20m' into omaha_14.4.1
...
14.4.1-20m
Former-commit-id: dc7c935e809764604aa7f773b7123630dd818dd5
2015-03-26 08:26:55 -05:00
Steve Harris
46b86ab052
Merge tag 'OB_14.4.1-20m' into omaha_14.4.1
...
14.4.1-20m
Former-commit-id: f099adad7568f4b3c18f68f4b3c18fd320c52c35
2015-03-26 08:26:55 -05:00
Ron Anderson
597c396e06
Merge "Omaha #4313 Updated Service Backup html help files for Multi-Site capability" into omaha_15.1.1
...
Former-commit-id: 1b268788a9fbec5b3ec557395c7122e8e2437a35
2015-03-25 16:45:35 -05:00
Ron Anderson
9208af09dc
Merge "Omaha #4330 Changed feature order so nwsauth is installed before gfe on the Windows build." into omaha_15.1.1
...
Former-commit-id: fc7526665ab854440eced0b03075fabc32f342df
2015-03-25 11:15:32 -05:00
Ron Anderson
1e82efdb12
Omaha #4313 Updated Service Backup html help files for Multi-Site capability
...
Change-Id: I5d456a87ea651e377366c3826edacc29cfe38d5f
Former-commit-id: 2fb059379d95abe1762cde7258dd722319fc0165
2015-03-25 10:53:36 -05:00
Ron Anderson
7aa3d76477
Omaha #4300 Minor updates to the Service Backup Dialogs
...
Change-Id: I409be11a06ff181f184d22dea311c6b0a7e96cca
Former-commit-id: 6833a9db5bc8c0187ce999d8a7f310bcd4892ad2
2015-03-25 10:46:36 -05:00
David Lovely
c975476243
Omaha #4330 Changed feature order so nwsauth is installed before gfe on the Windows build.
...
Former-commit-id: 542a81d065c7ea5a991965967bf78faae253a029
2015-03-25 09:06:45 -05:00
Joshua Watson
2e15bf321c
VLab Issue #7124 - Added new HRRRFamily.xml to volume bundles. Edited Volume menu entry for HRRR model to call HRRRFamily.xml bundle; fixes #7124
...
Change-Id: I201d1c46c179d958360e9ff027fd6dfc35100403
Former-commit-id: c0d0fe36c45049e3a069ffe87bca4d8430d9f3c3
2015-03-24 15:01:55 -04:00
Ron Anderson
3fa5db60e5
Merge "Omaha #4300 Client-side changes for multi-site service backup" into omaha_15.1.1
...
Former-commit-id: f6a14fd5ffa9a3629aae5a2d9a360b75bca31878
2015-03-23 17:33:08 -05:00
Ron Anderson
dcfd2c2e7c
Omaha #4300 Client-side changes for multi-site service backup
...
Change-Id: Ibcf05dfc67fa3824a5fe716e1d4038ad5aeb4034
Former-commit-id: 8daff8d5bb3e1bbf23a559671040cae4a03c9911
2015-03-23 16:08:31 -05:00
Ana Rivera
a746466657
Merge branch 'omaha_15.1.1' into field_15.1.1
...
Change-Id: I8f43ac5ff751ba680a1d271ff4513b7620d6b226
Former-commit-id: 1cea14c70abde518ac3a6e180d87dc31796d3749
2015-03-23 20:15:01 +00:00
Nate Jensen
41ae3a02b9
Omaha #4278 try/catch throwables in dialog components
...
Change-Id: Icb349774ff43ced32bdbf2cb9f21712589cfcfdb
Former-commit-id: 9a78fb10bdbe14d77cf29442e1de8a1205c27b66
2015-03-23 13:19:27 -05:00
Fay.Liang
f2e952b71a
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: dd741e026ef0599738bbbc82579a679b57feeef7
2015-03-19 17:18:52 -04:00
Fay.Liang
fb86bbc988
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 53bdc83ba4f2e952b71af2e952b71aaf80d5b682
2015-03-19 17:18:52 -04:00
David Gillingham
fd5b270fdd
Omaha #4103 : Update GFE service backup server code to support multiple service backup sites, use "smarter" lock files to store additional status.
...
NOTE: Service Backup features are broken until DR 4300 lands on this branch.
Change-Id: Ic0184c10c553187c8d0515f639c5a33fd3abde1f
Former-commit-id: 732208b6600882a9ba9fcc0eefd7c8be0157beab
2015-03-19 16:13:56 -05:00
Paul Grell
81c34481c1
Merge "Revert "Revert "ASM #17217 - GFE: default to smart formatter types""" into asm_14.4.1
...
Former-commit-id: 60344f611d90d46fffcf2a05230670b72f303916
2015-03-19 16:05:49 -05:00
Paul Grell
72b1a9ee64
Merge "Revert "Revert "ASM #17217 - GFE: default to smart formatter types""" into asm_14.4.1
...
Former-commit-id: f47e4fdcff81c34481c181c34481c12d17527faa
2015-03-19 16:05:49 -05:00
Paul Grell
07491fe499
Revert "Revert "ASM #17217 - GFE: default to smart formatter types""
...
This reverts commit 2495ce971f
2015-03-19 16:02:22 -05:00
Paul Grell
bdf62a0cdd
Revert "Revert "ASM #17217 - GFE: default to smart formatter types""
...
This reverts commit f4920cc0b9f31cdc69252495ce971fb1d84d29642495ce971f3b71d3694507491fe49907491fe499b36de51998
2015-03-19 16:02:22 -05:00
Dave Hladky
62e705005f
Omaha #3888 More nulls in Fog
...
Former-commit-id: 1ceafc3d1512071ed4e82a38c426ee5a9aecf08c
2015-03-19 14:56:25 -05:00
Dave Hladky
abd4abb0bb
Omaha #3888 More nulls in Fog
...
Former-commit-id: 8ebeb60c6e62e705005f62e705005fe63bc78422
2015-03-19 14:56:25 -05:00
Fay.Liang
4718a036f1
Merge branch 'ohd_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Former-commit-id: 366cd07d35f6e9f842ba72d1164a53fbb5fc6838
2015-03-19 12:42:35 -04:00
Fay.Liang
9a12a4bca3
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Former-commit-id: 391ff6c59e4db20b42ea5ff52d7b37f4f49fc714
2015-03-19 12:41:59 -04:00
Fay.Liang
2eb8777058
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Fay.Liang
0284b3b7e9
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e926e1c0160e7d40df41fbe1e6ec7dd7263ade3e
2015-03-18 15:12:56 -04:00
Fay.Liang
15560cc42e
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: 475019fb610284b3b7e90284b3b7e9228e85dcb9
2015-03-18 15:12:56 -04:00
Fay.Liang
29adda74b3
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 3496ae3b3063b553e7a891d0a62fa489b1bedb9e
2015-03-18 15:09:16 -04:00
Fay.Liang
990e8b7d0c
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 6b10ca734829adda74b329adda74b36589cd8d6e
2015-03-18 15:09:16 -04:00
Fay.Liang
3b9e0864ab
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: ec7875e9a4bec3752aeb8442fca15e4e4fd02571
2015-03-18 15:08:01 -04:00
Fay.Liang
9b9a3bb1eb
Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 1c80edbed03b9e0864ab3b9e0864abfd502062c5
2015-03-18 15:08:01 -04:00
Fay.Liang
6f8f2f5398
Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 42d435f739134ec29a021415ed96b6c3406fc021
2015-03-18 14:54:46 -04:00
Fay.Liang
ec294fd11c
Merge ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 3233640aa26f8f2f53986f8f2f53988db78cb400
2015-03-18 14:54:46 -04:00
Lee Venable
d3625bd704
Merge "Omaha #4234 remove code that doesn't work anyway" into omaha_15.1.1
...
Former-commit-id: b9e6d3d5d5eeb43136709f59a1e980919fa4b73f
2015-03-18 13:16:41 -05:00
Steve Harris
19f99823a6
Merge tag 'OB_14.4.1-18m' into omaha_14.4.1
...
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 390c7ec5c261717f6e0b2053761e12e1fcb68215
2015-03-18 13:09:03 -05:00
Steve Harris
fdf751fa90
Merge tag 'OB_14.4.1-18m' into omaha_14.4.1
...
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
Former-commit-id: 9b749e134d19f99823a619f99823a6bda107f32a
2015-03-18 13:09:03 -05:00
Nate Jensen
83d109e2cf
Omaha #4234 remove code that doesn't work anyway
...
Change-Id: I6747dcc1ccb3f7c3b424b996d63417f4a86a171b
Former-commit-id: 26b21f4db52aa6dd802a5de460b98e1758bc6872
2015-03-18 11:50:10 -05:00
Paul Grell
b28a5d5350
Merge "Revert "ASM #17217 - GFE: default to smart formatter types"" into asm_14.4.1
...
Former-commit-id: 4601ad77a9e49efaf34d4563baddcdf61dbd5804
2015-03-18 10:44:10 -05:00
Paul Grell
8f9ec5ac48
Merge "Revert "ASM #17217 - GFE: default to smart formatter types"" into asm_14.4.1
...
Former-commit-id: 4b1cec4b99b28a5d5350b28a5d5350d0daa26bdb
2015-03-18 10:44:10 -05:00
Paul Grell
2495ce971f
Revert "ASM #17217 - GFE: default to smart formatter types"
...
This reverts commit dc489dabe2
2015-03-18 09:36:12 -05:00
Paul Grell
f4920cc0b9
Revert "ASM #17217 - GFE: default to smart formatter types"
...
This reverts commit 2b5a21a115d5ca25bb18dc489dabe270e5e24941dc489dabe2b1d84d29642495ce971f2495ce971ff31cdc6925
2015-03-18 09:36:12 -05:00
Rici.Yu
72af59fcb6
ASM #17217 - Add fullStationID entry for table products
...
Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847
Former-commit-id: a987fe4493e4e58618271fffb37a708185ed4139
2015-03-18 10:30:38 -04:00
Rici.Yu
d602aa1fcd
ASM #17217 - Add fullStationID entry for table products
...
Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847
Former-commit-id: 6a7fbec94272af59fcb672af59fcb626ae2cded5
2015-03-18 10:30:38 -04:00
Steve Harris
2fd5ba420f
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
...
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
2015-03-18 09:29:01 -05:00
