Brian.Dyke
|
216f34fb25
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 8e4f6e96f7b70d6f2b7517f3f0695350506169c7
|
2014-09-15 10:46:25 -04:00 |
|
Matthew Howard
|
6e0dbf4fb5
|
Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7
|
2014-09-11 08:56:49 -05:00 |
|
Matthew Howard
|
f14ea5f877
|
Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: c4a0a681a3f0ea21237684cdadb2aab8ac8ca078
|
2014-09-09 14:01:39 -05:00 |
|
Brian.Dyke
|
3d9a3de6e4
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java
Former-commit-id: a3365943e7b7972a5c86f8cb1ad39667ab9e0695
|
2014-09-09 11:44:30 -04:00 |
|
Qinglu.Lin
|
51d48a6fdc
|
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09
Former-commit-id: 7a75687b76584b4578fad4c31c8557d78e507f46
|
2014-09-09 08:07:46 -04:00 |
|
Brian.Dyke
|
858b91d677
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
Former-commit-id: 7b49ea6d9c45c0624017bbe7ffb1297a402ee875
|
2014-09-08 14:54:16 -04:00 |
|
Matthew Howard
|
8ebfa3edce
|
Merge "ASM #539 Multiple flag functionality for textdb is not working properly" into asm_14.3.1
Former-commit-id: 764e268bcccec4a805509a11fbd9c9f4e1860842
|
2014-09-08 08:23:57 -05:00 |
|
Brian.Dyke
|
9e1ee22146
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 876c6fc4db3901fdcd8dd9a6fb343d2f65254569
|
2014-09-05 11:13:12 -04:00 |
|
Brian.Dyke
|
d7407481ef
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: c1f870d9df7579741e5a1d79cdec77293115e968
|
2014-09-05 10:57:14 -04:00 |
|
Ana Rivera
|
6d48576930
|
VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152
Former-commit-id: 084970f8445dbb6b76bbad84b5dc986d961d2383
|
2014-09-05 13:27:29 +00:00 |
|
Brian.Dyke
|
7b7ef56b04
|
Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: a77577595da1e2dcc8057c5a8b8643a612780339
|
2014-09-04 15:59:00 -04:00 |
|
Brian.Dyke
|
e762271240
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: ad120a9357402fbdedb350cabe88d2becf5d7361
|
2014-09-04 14:18:34 -04:00 |
|
Qinglu.Lin
|
8c28597210
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110
Former-commit-id: 33adaf353c6a4b7dc418dc86428257dae260c4c5
|
2014-09-04 14:09:24 -04:00 |
|
Brian.Dyke
|
72e2882496
|
Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 2c4c1a5babcfdcfadeb042a190bc79c7973e1a36
|
2014-09-04 14:01:26 -04:00 |
|
Nate Jensen
|
2cfbfc1dc4
|
Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320
Former-commit-id: 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782
|
2014-09-04 10:10:37 -05:00 |
|
Brian.Dyke
|
043a95d35e
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a
|
2014-09-03 21:14:27 -04:00 |
|
Brian.Dyke
|
121a2d100f
|
ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: 82d7bbe6bf005e543e1ad6772c6a18024f1b0764
|
2014-09-03 21:10:16 -04:00 |
|
Steve Harris
|
0e869fa6c1
|
Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4
|
2014-09-03 15:22:00 -05:00 |
|
Richard Peter
|
3de26efce6
|
Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
Former-commit-id: 5f9298d52d0a11775588ed3742f2c2d3f19da1d0
|
2014-09-03 09:42:34 -05:00 |
|
Nate Jensen
|
0f35426ad0
|
Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
Former-commit-id: 9e0f31fc6601a39938deeaf7e1c8ed8849e43288
|
2014-09-02 17:34:59 -05:00 |
|
Brian.Dyke
|
fd8ad016ef
|
Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: bc9f03426304e3bb194fbf7f356d8dd3816cd836
|
2014-09-02 16:32:54 -04:00 |
|
Brian.Dyke
|
f0875e724f
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 40efe51cafd5589ef0a640041ad0539e454b6f8d
|
2014-09-02 16:30:51 -04:00 |
|
Benjamin Phillippe
|
7265bf54c7
|
Issue #3560 Registry objects not re-sent after fully sync
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0
Former-commit-id: 15e57fc58bee1045c5574e4d66a727a672ac83cb
|
2014-09-02 14:46:50 -05:00 |
|
Brian.Dyke
|
368f80f220
|
Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: f9daf7d6e906904e96438fabc510e24ff66536d4
|
2014-09-02 15:09:06 -04:00 |
|
Qinglu.Lin
|
2374673f8d
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: 59890eef397f3282ef26f259ca85ffea3db7b710
|
2014-09-02 14:37:19 -04:00 |
|
Ron Anderson
|
46c62a1db6
|
Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce
Former-commit-id: e2ecb91569c2f622d45f7301c1eb4e058a2ab641
|
2014-09-02 12:21:42 -05:00 |
|
Richard Peter
|
be2474da34
|
Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
Former-commit-id: 6789576e88de568c6014c29d099349cec40c7c74
|
2014-09-02 12:15:38 -05:00 |
|
Benjamin Phillippe
|
ab8b2ef473
|
Issue #3560 Fix for registry memory issue
Former-commit-id: a6e4a2cac4d6f9390c5181439a6c834db56a95c6
|
2014-09-02 10:00:35 -05:00 |
|
Dave Hladky
|
9c3b002990
|
Issue #3564 Allow for un-authenicated WFS HTTPS connections.
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a
Former-commit-id: 7afe5332fcf41bbc8bb2411944584405f3ba686a
|
2014-09-02 09:38:21 -05:00 |
|
Steve Harris
|
3b6a003884
|
Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: 09b94266f1f3aeaaa7fcf622487d751097d271a4
|
2014-09-02 08:12:49 -05:00 |
|
Steve Harris
|
db74dc031e
|
Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21
|
2014-09-02 08:09:48 -05:00 |
|
Kiran.Shrestha
|
a285439c08
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6
Former-commit-id: 1681bea10870df58b3f2cc0d0a59f21c596e9e95
|
2014-08-29 13:50:55 -04:00 |
|
Brian.Dyke
|
6f3d0508e4
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: f34bc4f81eb5ac92ef306f73f8c34243d3f78e31
|
2014-08-29 10:19:02 -04:00 |
|
Brian.Dyke
|
37c926973c
|
Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: cff9bfd2697a73ccc18642d8dc057b6a27aa2991
|
2014-08-29 10:07:14 -04:00 |
|
Brian Clements
|
b352bd3944
|
Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040
Former-commit-id: b3482522860408c2d052261e845899cf73c2ce96
|
2014-08-29 08:55:58 -05:00 |
|
Juliya Dynina
|
169dc0ba43
|
Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: bb260c4003b477ca51cf5fd9c8d54275af906772
|
2014-08-28 15:52:11 -05:00 |
|
Ana Rivera
|
160dabc4d1
|
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: 2df117a7aec644e6964da6c36326ab3b29b9f378
|
2014-08-28 18:38:26 +00:00 |
|
Roger Ferrel
|
6f8c6d6aa1
|
Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: bcc9b0a6352151dfdf3ba75063bb87308cb162b4
|
2014-08-28 13:10:11 -05:00 |
|
David Friedman
|
de6e79f9e3
|
ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa
Former-commit-id: aca832a81bc18d954eadb51755ce04597cd264df
|
2014-08-28 18:08:23 +00:00 |
|
Daniel.Huffman
|
c89a7169b0
|
ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e
Former-commit-id: 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f
|
2014-08-28 17:20:30 +00:00 |
|
steve.naples
|
1856a05319
|
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: 2e8fb864f410b9b08ccc6de6c0d75666931da3a2
|
2014-08-28 16:08:17 +00:00 |
|
David Friedman
|
a2dfe8e8f6
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: 6bfa1d6662b00925814be7126592bbe340651649
|
2014-08-28 15:43:32 +00:00 |
|
Brian.Dyke
|
47ae6015e5
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 3909fa46a4efffabb09303f139bc36accc064a6d
|
2014-08-28 11:39:48 -04:00 |
|
Kiran.Shrestha
|
f11699eddd
|
ASM #539 Multiple flag functionality for textdb is not working properly
Change-Id: Iaae81cace051d97db464e6610d6fa94f86086fb8
Former-commit-id: 0220801fc1747c7659e3db7cf734538fdda270ef
|
2014-08-28 10:05:41 -04:00 |
|
Steve Harris
|
891019aadd
|
Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
Former-commit-id: 579781387325a36e27135b8384b2a8b14cb38317
|
2014-08-27 11:34:06 -05:00 |
|
Brian.Dyke
|
e654318431
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: 7334d3991903dfe8a62728de33c21e81534fdbb6
|
2014-08-27 11:19:19 -04:00 |
|
Brian.Dyke
|
d168e371aa
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: a6d5822b5cb5bb3aa62fcc95e980b08c685a3be3
|
2014-08-26 15:00:55 -04:00 |
|
Brian.Dyke
|
86f0ed23c1
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 2382e17fb6b947be89649da7c25698dc5baf5bf4
|
2014-08-26 13:31:34 -04:00 |
|
Brian.Dyke
|
de56ccebc0
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: b13e744dbbcc332b9efd0799e87390bdf9bb1df3
|
2014-08-26 10:56:45 -04:00 |
|
Daniel.Huffman
|
8962a069be
|
ASM #16715 - Reverted and augmented Cities.xml
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: 2107976bd25c429521d4df7a92a3726a38806ba3
|
2014-08-26 13:30:09 +00:00 |
|