Commit graph

6406 commits

Author SHA1 Message Date
steve.naples
9a38ed0b4d ASM #16993 - Restored code to DrawPolygonDlg to use Combo box for fields.
Change-Id: I736af4ac43de16c3978c462fca22bb147846d81b

Former-commit-id: 3a8aaf4ab99e8ae93dd9f074c5671cc8f3dc5f8d
2015-01-12 19:08:06 +00:00
Fay.Liang
50ca0a4756 Merge branch 'omaha_14.3.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 63cb45303d0afb6923e0065164022eac2fdb1053
2014-12-19 14:03:59 -05:00
Kenneth Sperow
94461ac6ab VLab Issue #5657 -- Fix MRMS menu to only display in D2D perspective; fixes #5657. Fix originally checked in by Darrel Kingfield as commit 8ff98671. Somehow 14.4.1 code got pulled into the mdl_14.3.1 branch so it was deleted and this commit was pushed.
Former-commit-id: 53ac049c9794cbcbf88707db04186f6d272ac850
2014-12-17 16:04:54 -08:00
Brian Clements
6ae64007a2 Issue #3935 prevent warning when using init.d script to stop edex
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03

Former-commit-id: b1034aa16b3393e6584038ebb80faf2a4e1a831f
2014-12-17 14:35:16 -06:00
Mike Duff
57f51e4c99 Issue #3026 - Implement last minute requirement change, change location of text on screen
Change-Id: I2f8fb480a3259bae71f7c09e46e393a413972378

Former-commit-id: 773590a3936ca34be68cb5b19ae8fbf027085926
2014-12-16 13:13:37 -06:00
Fay.Liang
60c13e1d79 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: b81b1814caa0956efdb566448514f16b5a7d039c
2014-12-16 08:27:02 -05:00
Ben Steffensmeier
abd42871a5 Merge "Issue #3923 Fix thin client grid updates." into omaha_14.3.1
Former-commit-id: b1deadcb432529e5259328d5cb982982ea25648d
2014-12-15 13:37:38 -06:00
Steve Harris
f03969281c Merge branch 'master_14.3.1' (14.3.1-38) into omaha_14.3.1
Former-commit-id: 8b512a56879fe37cdb5e3428f6f3d86f38349ed6
2014-12-15 13:31:21 -06:00
Ben Steffensmeier
dcea13e602 Issue #3923 Fix thin client grid updates.
Former-commit-id: 537534fb920a8ea109d9bc655f16579cdb357dda
2014-12-15 13:25:43 -06:00
Fay.Liang
baae521302 Merge branch 'ncep_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: f1be2cce4596c1b9405757a8a2e11b8ab0e0eb22
2014-12-15 12:45:17 -05:00
Fay.Liang
dd3df6b426 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: f88d457b62161250b44f9cdcbf025fafca43174b
2014-12-15 12:44:05 -05:00
steve.naples
9c0e08a03c ASM #16911 - Updated to fix Ending Hydrologic data when time is after 18Z.
Change-Id: Ia3022f07f1ebc54543b6e210d77d95b1458b434b

Former-commit-id: 571f7dde74c6cbf14553edc2fe27a5031e42d6be
2014-12-13 01:55:19 +00:00
Lee Venable
4d212f1d09 Merge "Issue #3026 - Fixed the HPE bias query" into omaha_14.3.1
Former-commit-id: 51e1e12ff98b2f1270b0fbd43bd169c6adae6d76
2014-12-12 13:53:21 -06:00
Mike Duff
508cf4c1d5 Issue #3026 - Fixed the HPE bias query
Former-commit-id: f2d5395fe522e61edd5768f37b530299a197dd07
2014-12-12 11:16:15 -06:00
Stephen Gilbert
d49dde17fd VLab Issue #5618 - Fix NSharp compare source feature
Change-Id: I26351271456211a8ad6de2c3d931d727f6a2d7d2

Former-commit-id: 7afc6b5aa26c8984953102384e4df5936097f70b
2014-12-11 15:31:02 -05:00
Fay.Liang
abb8dfa35b Merge branch 'ncep_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e2471b99ed39a367d5a1811cb1a31f9425cbede3
2014-12-10 17:00:04 -05:00
Stephen Gilbert
b18e852853 VLab Issue #5618 - Fix NSharp compare source feature
Change-Id: Ib87bb9701c606f3c622cfe575205289ff7761854

Former-commit-id: 4c33e5bf594bb87a7823f3bf5452f2c322df8eec
2014-12-10 16:02:05 -05:00
Stephen Gilbert
afc03f606f VLab Issue #5612 - Fix NSharp crashes when using WINTER/FIRE/HAIL
buttons

Change-Id: I7f3c69455fab32945f8d19094002074445135dd4

Former-commit-id: 21f10e4299dcdeb5aacda8866f715ffa63ab72cc
2014-12-10 14:30:28 -05:00
Fay.Liang
8a4e1ba3ef Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: ea5b97f1f606210e70bbf616a0c9158f03f67b5e
2014-12-10 08:52:21 -05:00
steve.naples
45c3852132 ASM #16911 - Fixed issue where Hydrologic date did not advance to next day after 18Z.
Change-Id: Ie26af265d8a233e4fdf6e9dbc1e4ff6934aae4e4

Former-commit-id: b2c9cd15e1f02c8272c1d9a9d50e877470b05eb3
2014-12-09 19:04:17 +00:00
Ying-Lian.Shi
c4b665ad24 ASM #16929 Service Backup log cleanup script issue on test systems
Change-Id: I09f184a01081cf025854da60a298345b29ffc15f

Former-commit-id: 66fc128c8be25753904dfff65840334bfdff7963
2014-12-09 16:19:33 +00:00
Dave Hladky
8796705c6b Issue #3891 Special overlap handling for promotion of sub from site to shared
Change-Id: Ifa8f4be3e9e0f172ee54c5ef7021b912d45c5de2

Former-commit-id: 9a31befafe66a677b744fa9ae9ef7e134a758bd9
2014-12-08 14:36:44 -06:00
steve.naples
539b859040 ASM #16889 - Fixed issue with precip station count, also added logging for Snow data file read and station edit.
Change-Id: I1b689b485a152e1c942c021ac0f778b0f299d3e3

Former-commit-id: c836fb0c1f8721f81049af56cb8f7be9960a5cd6
2014-12-08 15:48:28 +00:00
Steve Harris
12d20a1e6b Merge branch 'master_14.3.1' (14.3.1-36) into omaha_14.3.1
Former-commit-id: e2a6deed98773f943def0ce9d9daf2a6a13f0eda
2014-12-07 23:13:26 -06:00
Shawn.Hooper
e4224cd67b ASM #16805 - Update component.spec for awips2-java for removal of license.txt file
Change-Id: I55524734785e63647cba46edb8e15324b794af95

Former-commit-id: dc77d48fc9c9e5183b94bc05321ab0061404a4ff
2014-12-04 16:48:33 -05:00
Steve Harris
6179b233a4 Merge branch 'master_14.3.1' (14.3.1-35) into omaha_14.3.1
Former-commit-id: 28f68f31cbb9b73910fc3623f48b141ba5ba2385
2014-12-03 16:03:42 -06:00
Juliya Dynina
354a421da7 Merge "ASM #16889 - Fixed colorvalue_use warning and cleaned up some code." into asm_14.3.1
Former-commit-id: 2ebcc016732b0405b183b0e4e56d528a24e9cbdf
2014-12-03 14:40:12 -05:00
steve.naples
b5389ced26 ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4

Former-commit-id: 862cb7c4d789915067558c4508cf5f1e45a2cdf2
2014-12-03 18:35:19 +00:00
Brian.Dyke
3b0a70d21e Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 5972d08bfe8bc836a3437251bcf9f5e68e14b6a1
2014-12-02 12:17:32 -05:00
Paul.Grell
370466a7e8 ASM #16911 HydroDate set to next day if hour is 18Z or later
Change-Id: Ied55660cb81e3fdf2e87295fe22eb0915f7b4764

Former-commit-id: 38d9bc8c4e385e339df5bdd010160728730bed8d
2014-12-02 11:35:28 -05:00
Greg Armendariz
f8d3131a94 Merge "Issue #3804 BigNsharp 32 Bit Binary DLL" into omaha_14.3.1
Former-commit-id: e2ca08db84093060c1b570d7ec0c6d95b37d958c
2014-12-01 08:39:56 -06:00
David Lovely
7011dcd271 Issue #3804 BigNsharp 32 Bit Binary DLL
Former-commit-id: d4fe863a026c3df816d74ae724276628ab8aa4fb
2014-11-26 13:39:22 -06:00
steve.naples
a0face5b02 ASM #16889 - Daily QC does not display SNOTEL data.
Change-Id: I42035d5d4d856a395400a1be1d0c6a24bc64b0d8

Former-commit-id: 01735909fffdc9b5ef14ed072253eed6deaecad9
2014-11-26 18:24:53 +00:00
Nate Jensen
63c505f357 Merge "Issue #3026 - Fix for HPE displays is volume browser" into omaha_14.3.1
Former-commit-id: 1cf731bc43346810f1976650ad509ee538cf3067
2014-11-21 15:46:16 -06:00
Mike Duff
c1bea3b41f Issue #3026 - Fix for HPE displays is volume browser
Change-Id: I1ef2766e9bf74e7ad82cc36cd4e4a35659aacf39

Former-commit-id: a375e64e7ee3276be47b26f4386e7bc6491bc740
2014-11-21 13:56:46 -06: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
Roger Ferrel
b88300a5fc Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15

Former-commit-id: 6cb88075375e3703b5ffe559ebd5e4f57d016880
2014-11-18 17:42:39 -06:00
Mike Duff
f841f1eda9 Issue #3026 - Fixed pattern to match the actual file names
Change-Id: I957e2076cfa5ee4d59acc1a0db89066e446bfc99

Former-commit-id: 5a3ccbadbf08957a4f68a0cb7118c765ca44f849
2014-11-18 13:54:17 -06:00
Steve Harris
8372956276 Merge branch 'master_14.3.1' (14.3.1-33) into omaha_14.3.1
Former-commit-id: 75097cfa26dbcff3adf0054a1f88d0d185f289fc
2014-11-17 13:46:28 -06:00
David Lovely
bfcc4cf523 Issue #3804 BigNsharp Binary DLL
Change-Id: Iaed7d84aeee537d884aa89942b6d0f14bb0a119d

Former-commit-id: 1e0d00304e70b89b9b2a9de96753aeebde32bb19
2014-11-17 12:40:13 -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
Lee Venable
f5bcc5b2c2 Merge "Issue #3026 - fixes to data access for HPE label generation" into omaha_14.3.1
Former-commit-id: 389c35bce7c456154321605c3415c43431a46c7b
2014-11-13 09:31:57 -06:00
Mike Duff
15f9d1ef50 Issue #3026 - fixes to data access for HPE label generation
Former-commit-id: 8d30af1c970cca70fe74560d3157e754e1164785
2014-11-12 18:34:32 -06:00
Ron Anderson
654c831b4e Issue #2854 Fix merge issue in MessageProducer between DRs 2726 and 3684
Change-Id: I6a6ea9c57857459f61e955a54275a8983a8004ce

Former-commit-id: 09f13d9b33cfe3547d2dc3fb75c1673e1f3193b0
2014-11-12 11:25:32 -06: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
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
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
Steve Harris
2ed98bb227 Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1
Former-commit-id: b70eb5b35985453e77ef2337728c65161ba60422
2014-11-04 13:05:36 -06:00
Matthew Howard
afc51d425d Merge changes I8e97aec2,Ib6df55db into asm_14.3.1
* changes:
  ASM #16693 changed swear words to all upper case
  ASM #16693 fixed typo in the filter


Former-commit-id: 0c3de224e672ea5259eaa395672efdf8982a1d45
2014-11-04 13:11:10 -05:00