Commit graph

4031 commits

Author SHA1 Message Date
Ron Anderson
8e4f2100cb VLab Issue #4953 Build fix and another cleanup item.
Change-Id: I5d92df3f452259c93784cd19e75cc7efd8e04dc4

Former-commit-id: 7a33861e7ac4475855778f50e0a5fca5227e5f97
2014-11-20 17:07:58 -06:00
Shawn Hooper
8376f3fce5 VLab Issue #5395 - Update gfeConfig.py based on Pablo's email
Change-Id: I100a8d2bb79092bca2157bba018566a650c55f4a

Former-commit-id: c5278c1a2d81d995ae9df252c461123bcc870320
2014-11-20 17:11:42 -05:00
Fay.Liang
5bd22b74c6 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9
2014-11-20 13:32:25 -05:00
Roger Ferrel
71db8afbaa Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files.
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e

Former-commit-id: a9ce685c99dbdc1442f022cda7af09af5bdabf87
2014-11-20 12:25:00 -06:00
Shawn Hooper
cf72b5753d VLab Issue #5395 - Build fixes and gfeConfig.py update
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: 94093accc4b2adc4c12cea0a3af0e037c1be52d8
2014-11-20 13:12:16 -05:00
Ana Rivera
c8a750b063 VLab Issue #5388 - HTI Update: replace 'MFL' references with SITE in HTI.xml (O&M RM16791); fixes #5388
Change-Id: I69ead4e0ed1103ca21728e46fa654ebaa85258a0

Former-commit-id: 27d2c6133b5563614b88fa03e3e706c6da2070a4
2014-11-20 13:57:19 +00:00
Fay.Liang
45b80432d6 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 28c3dbd91c1e89ffffd19afa811a08e228a995dd
2014-11-19 22:07:54 -05:00
Ana Rivera
40855f4ebd Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2
Former-commit-id: a0946643e3dab3f54c9d1d7a48dbb06b82207b55
2014-11-19 16:27:03 -05:00
Ana Rivera
af00fd8a98 VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df

Former-commit-id: 7d9cf7bfb3f513314608b6269f437061fc36d090
2014-11-19 20:29:42 +00:00
Ron Anderson
9104023408 VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: e8ac81c5850b8565ea1e375857cf9dfe531848a0
2014-11-19 11:31:49 -06:00
Ron Anderson
0610c71e2a Merge "Omaha #3549 improve performance of DataStoreResource processing of requests" into omaha_14.4.1
Former-commit-id: e572e5586d80623e8c6453404dc94691bfd5014d
2014-11-18 18:43:41 -06:00
Roger Ferrel
b88300a5fc Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15

Former-commit-id: 6cb88075375e3703b5ffe559ebd5e4f57d016880
2014-11-18 17:42:39 -06:00
Mark Peters
666e8d4332 Omaha #3300 Merge fixes for volume browser menus
Change-Id: Id2d6f643f80982d7b5c4f195e21775ec5def4b43

Former-commit-id: 1694a064c9496599532e9348a5eb89e558862e60
2014-11-18 16:03:42 -06:00
Nate Jensen
089292dbd0 Omaha #3549 improve performance of DataStoreResource processing of
requests

Change-Id: Ica72cded45aff23737c4b2aab8bbe94e0fc99755

Former-commit-id: bab091169dff1383a3b78ea4b94ec67d446e5f80
2014-11-18 15:22:09 -06:00
Ana Rivera
f1009bccc2 VLab Issue #5355 - HTI Update: TCFloodingRainThreat.py (O&M RM16791); fixes #5355
Change-Id: I6461bf9294f037a361f02d3a0de83bf41147e819

Former-commit-id: 682cf4e6376265d0e590cfd1c05f7591204d0e0a
2014-11-18 16:06:22 +00:00
Steve Harris
1d18722dca Merge tag 'OB_14.3.1-33m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: 9c77ee7c19b87501983acf88279205644e1692f2
2014-11-17 14:31:43 -06:00
Fay.Liang
d666aca2b4 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 3b21d69375ceb9c07377082c5e46a094742406a0
2014-11-14 16:24:25 -05:00
Fay.Liang
8ced3a4c73 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 7fd3b02016b0d9eed7ecca9c2fd70c3f83695abc
2014-11-14 12:47:46 -05:00
Lee Venable
9fde70a354 Merge "Omaha #3741 - Updated procedures for calculation of a center for zone and station." into omaha_14.4.1
Former-commit-id: b6d35ac4e3aa430de7057a16f9d5516584833150
2014-11-14 11:14:16 -06:00
Ana Rivera
e54f3305d8 VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42
2014-11-14 16:58:11 +00:00
Lee Venable
d0b2cb955c Merge "Omaha #3650 - Added confirmation box for unsaved changes in the dialog." into omaha_14.4.1
Former-commit-id: 8632472592ff0dc8611e528cb774d6b1586fea58
2014-11-13 14:47:58 -06:00
Fay.Liang
cfe2f18790 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 3f94c7f0ddbf580576b435a715366e3b9f3d9a53
2014-11-13 11:50:16 -05:00
Nate Jensen
3e2e3761de Merge "Omaha #3705 fixed collaboration public room empty participants list problem" into omaha_14.4.1
Former-commit-id: 6ad3a9d449cbdc06d68335d49bb0ac5620585758
2014-11-13 09:45:21 -06:00
Slav Korolev
dac55d1f49 Omaha #3650 - Added confirmation box for unsaved changes in the dialog.
Former-commit-id: d24676cfc946cb31618e0178d67d2d687e6a4599
2014-11-13 10:33:58 -05:00
Ron Anderson
fe531a33e5 VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files.
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30

Former-commit-id: c9d45db2fe6d4693c02b8788d0c7d44b21f5359f
2014-11-12 14:50:21 -06:00
Ben Steffensmeier
0021311cb2 Omaha #3810 Make D2D nsharp more thread safe.
Former-commit-id: 31901b563e4169cc44494134e3cac55a5542a79f
2014-11-12 14:48:08 -06:00
Roger Ferrel
8cde49f98e Omaha #3401 Enter events to upper case verification added.
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3

Former-commit-id: 414f6e16547e0535ae36c5c4cc86f43db54b689c
2014-11-12 10:50:43 -06:00
Brian Clements
a8cc3b8f08 Omaha #3705 fixed collaboration public room empty participants list problem
Change-Id: I25e35b6f5dc1266191c04131b69c840ccd76363e

Former-commit-id: 251a206c409855ee105c97bdbfe80715142bf25d
2014-11-12 10:38:15 -06:00
Roger Ferrel
739b253792 Omaha #3727 Place HFR and HiResW entries in sub-menus.
Change-Id: I602cf35675c6ea4255ade4cb42ebe5c97207d62e

Former-commit-id: 0456cbbaf9c694a73c9862773b0e42165114b78d
2014-11-11 16:10:48 -06:00
Slav Korolev
6343f04511 Omaha #3741 - Updated procedures for calculation of a center for zone and station.
Former-commit-id: a34a8901f83457fa21fc99a0f2ff0df956487b62
2014-11-11 14:56:21 -05:00
Dave Hladky
39db26fb1d Issue #3026 Fixed null metaData lookups in resource.
Change-Id: I29d17ea990ac5516b67ac18fadf4267663a23efb

Former-commit-id: 3f6bba1fda61fe283be47af1a4245d196f94f998
2014-11-11 10:18:47 -06:00
Fay.Liang
4bef6cf18d Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: a141921090ecec459e99d448025f58ca6a957fa6
2014-11-10 14:08:25 -05:00
Sarah Pontius
061583cd50 VLab Issue #5277 - HLS/TCV code for OPG 11-17-2014; fixes #5277
Change-Id: I258b2f8c8ddb7f45b02b1035f6fa5006b9fabe1b

Former-commit-id: 0db3944372ecc381df4e8a918829530391d598db
2014-11-10 11:20:09 -07:00
Steve Harris
9de825c332 Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/build.edex/esb/conf/logback-ingest.xml
	edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: 565efec2ebe5a3a1a009d213a77617f4a593aa6b
2014-11-10 08:42:01 -06:00
Nate Jensen
caa74b3938 Merge "Omaha #3760 Derived parameter definitions should be split to appropriate plugins" into omaha_14.4.1
Former-commit-id: abd111e667be780e9e5eb3c416b7e4fcf73f5e9a
2014-11-07 13:35:57 -06:00
Mark Peters
54139d0b0c Omaha #3760 Derived parameter definitions should be split to appropriate plugins
Change-Id: I9dfd7623b778e64982dd2de6f00d944c90401611

Former-commit-id: d4da6be1b1972df984ea1fb3eb1c5476af5d4cfa
2014-11-07 12:09:04 -06:00
Lee Venable
6e70e2edd7 Merge "Omaha #3667 - Corrected functionality of dialog." into omaha_14.4.1
Former-commit-id: d0812d4d7ce5a01f6a5de7ceea84dd098f3c4354
2014-11-07 12:07:12 -06:00
Brian.Dyke
7e87bf7ac4 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: b683c7776ef1fad2702fca82aed1abb4873e433b
2014-11-07 12:55:38 -05:00
Richard Peter
8328d538cd Merge "Omaha #3643 Archive menu entries consolidated under Archive." into omaha_14.4.1
Former-commit-id: e10b35d2537f6aec5cd007e071f570734098c802
2014-11-07 10:01:32 -06:00
Richard Peter
f1499db1c3 Merge "Omaha #3353 Fix deadlock that freezes cave." into omaha_14.4.1
Former-commit-id: 24f3f08d27ac6d3e2cba7b5f6f5a3fd8e6452700
2014-11-07 09:50:34 -06:00
Nate Jensen
9c79b4851f Omaha #3356 fix thin client startup when localization caching is
disabled

Change-Id: I38a9299d9cc50c3e6f1b5d781c0754c2af70d478

Former-commit-id: b4817236399d6084da219892d97b6db38d44d64a
2014-11-06 16:48:11 -06:00
Slav Korolev
9f0b1a68e6 Omaha #3667 - Corrected functionality of dialog.
Former-commit-id: cf354d6ac5668ba502feb188bdf17a0967168b19
2014-11-06 15:24:12 -05:00
Brian.Dyke
1e7d47d2aa Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java

Former-commit-id: b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f
2014-11-06 13:14:24 -05:00
Brian.Dyke
acf00264f4 Merge branch 'master_14.2.4' into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 5c2079dd25181c68f872691e81842aff0f696f8d
2014-11-06 12:55:21 -05:00
Dave Hladky
ef29e2883c Omaha #3132 merge in PDA into 14.4.1
Former-commit-id: 38944c601a800e96fbdd34d51034bb7e42ae4a27
2014-11-06 09:48:54 -06:00
Dave Hladky
1923af2aab Merge branch 'omaha_pda' into omaha_14.4.1
Former-commit-id: 465a3cff39ad6f0159de561aaf6e8e89e99762ed
2014-11-06 09:34:39 -06:00
Steve Harris
4d0eef66f3 Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 3fdd69aade32e40d4684da739b19a414e0ba37df
2014-11-05 07:58:05 -06:00
Ron Anderson
1f0fee6536 Omaha #3557 Fixed NPE when parm is removed from display
Change-Id: I14a82967256a788c25d049a4fd119289c909ad91

Former-commit-id: 4ba96e15f55e276cf78b06f71d3e5d6c98bcab8b
2014-11-04 17:41:19 -06:00
Roger Ferrel
acbde703a2 Omaha #3353 Fix deadlock that freezes cave.
Change-Id: I4afa5c505178f30ada5dd58612b0703ab9529e6b

Former-commit-id: 871fa68ddf242f1e63286939b1324fc3197c7336
2014-11-04 14:13:29 -06:00
Steve Harris
e770670ebf Merge tag 'OB_14.3.1-31m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java

Former-commit-id: 361f7bcf425edaf687cbfc63d4c165790b45a5bf
2014-11-04 13:17:44 -06:00