Brian.Dyke
|
fe85eb9f70
|
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: 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 3d9a3de6e4
|
2014-09-09 11:44:30 -04:00 |
|
steve.naples
|
4205d83452
|
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: ff52f1dc0a [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]
Former-commit-id: 1856a05319
|
2014-08-28 16:08:17 +00:00 |
|
steve.naples
|
765fa2dc4e
|
ASM #14807 Updated snow file parser in ReadSnowData to fix parsing issues.
Change-Id: I5182f2640baebbb0f5c6d66e5a3d81da7461af69
Former-commit-id: 4be6abad1b [formerly 67e36d96d0acaa8dfdf61164a5c66fbda9dd753b]
Former-commit-id: 179031d9b4
|
2014-08-20 17:17:14 +00:00 |
|
Loubna.Bousaidi
|
afae4700a6
|
ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: d41e489ced [formerly a43ad03838d53d3b9688b48851f41a1af6b043f6]
Former-commit-id: 8c15d1f124
|
2014-08-15 10:54:10 -05:00 |
|
Brian.Dyke
|
a0a879be7d
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: 3f1e12effc [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]
Former-commit-id: a8737e18f0
|
2014-05-30 10:46:25 -04:00 |
|
Chip Gobs
|
4e4d00792d
|
VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada
Former-commit-id: e42bef2a33 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]
Former-commit-id: 65d2135ac2
|
2014-05-06 10:48:35 -04:00 |
|
Loubna.Bousaidi
|
1b5bccc451
|
ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004
Former-commit-id: 6d526cb1ff [formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]
Former-commit-id: 760ee964d6
|
2014-04-29 21:09:34 +00:00 |
|
Richard Peter
|
cd51f3fa87
|
Merge branch 'omaha_14.2.2' (14.2.2-3) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/QcAlertAlarmLimitsDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/resource/HRAPOverlayResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/dbapi/impl/TextDBStaticData.java
edexOsgi/com.raytheon.edex.textdb/src/com/raytheon/edex/textdb/ingest/TextDBStaticDataSubscriber.java
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Former-commit-id: 21ae3b5fcd [formerly bd13bc332bcdd87723bec8669885f4594ad483b9]
Former-commit-id: 3575d6586f
|
2014-04-11 16:23:09 -05:00 |
|
Mike Duff
|
d1a705822c
|
Issue #2952 - Change MPE fieldgen to use thriftSrv
Change-Id: Ibd0ed87582a6374db1e49bc66093705436f6d5d3
Former-commit-id: 235080c256 [formerly 182b9f69c72332e73cdda26ebbebedb4abc059b0]
Former-commit-id: 2cb92e6039
|
2014-03-31 15:08:33 -05:00 |
|
David Friedman
|
32a7adbe4b
|
Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.
Conflicts:
cave/build/static/linux/cave/cave.sh
cave/build/static/linux/cave/caveUtil.sh
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml
Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d
Former-commit-id: f146c7bcd0 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]
Former-commit-id: fd900e38c2
|
2014-03-27 19:17:03 +00:00 |
|
steve.naples
|
0d44e46f88
|
ASM #337 MeanMonthlyPrecip updated to handle precip values from PRISM data less than 1 inch.
Change-Id: Iffa8644f68df362d4f988fa3d1a9bd16acd4be97
Former-commit-id: 20582ab173 [formerly cd7d6876338b98c320a8d7559c518e32e90e3000]
Former-commit-id: 212677f94b
|
2014-03-10 17:47:25 +00:00 |
|
Ron Anderson
|
e7f2b6883d
|
Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
rpms/awips2.core/Installer.tools/component.spec
Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4
Former-commit-id: 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]
Former-commit-id: 32bcf9d0d0
|
2014-02-18 10:45:20 -06:00 |
|
gerritcm
|
9e935404d8
|
14.1.1-16 baseline
Former-commit-id: b84f7d4203 [formerly dee925ccd6738c3ca6727a7c65f4471170bc698c]
Former-commit-id: 6be938e6eb
|
2014-01-16 16:43:05 -05:00 |
|
Lee Venable
|
60fb3a2b8f
|
Issue #2353 - fixed cursor memory leaks
Former-commit-id: a52ea0a481 [formerly 0481bd1eaf467d1be6b8cc2f558f2de0301969ad]
Former-commit-id: e70475bb7b
|
2013-09-12 08:39:07 -05:00 |
|
Steve Harris
|
8cde3b2b54
|
13.5.2-2 baseline
Former-commit-id: 9e4bf0cf2e [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]
Former-commit-id: 4a47fb97c5
|
2013-08-29 15:01:29 -04:00 |
|
Steve Harris
|
894d2425b2
|
13.5.2-1 baseline
Former-commit-id: 542b2c3d18 [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]
Former-commit-id: 73dd0f166c
|
2013-08-28 09:43:48 -04:00 |
|
Greg Armendariz
|
f0b62a22bf
|
13.5.1-13 baseline
Former-commit-id: 5577e686c1 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]
Former-commit-id: 29b823fee4
|
2013-08-08 17:00:36 -04:00 |
|
Steve Harris
|
630705aa3f
|
13.5.1-7 baseline
Former-commit-id: 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]
Former-commit-id: bf58a81b38
|
2013-07-18 12:07:22 -04:00 |
|
Greg Armendariz
|
82aabf1066
|
13.5.1-5 baseline
Former-commit-id: ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]
Former-commit-id: 492f92ef7b
|
2013-07-03 12:20:27 -04:00 |
|
Steve Harris
|
6384018950
|
13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: 998961612c
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
6fcbb5ae6b
|
13.4.1-6 baseline
Former-commit-id: 16fe8cc5a2 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]
Former-commit-id: 8379977673
|
2013-05-07 08:47:39 -04:00 |
|
Steve Harris
|
91a5e4578e
|
13.3.1-14 baseline
Former-commit-id: 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]
Former-commit-id: 9022c500ce
|
2013-03-27 17:59:34 -05:00 |
|
Steve Harris
|
be96282207
|
13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: 0be473728a
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
bc9df0a8f9
|
13.3.1-8 baseline
Former-commit-id: c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]
Former-commit-id: f97d78994b
|
2013-03-18 15:43:32 -05:00 |
|
Steve Harris
|
48d1aa7732
|
13.2.1-1 baseline
Former-commit-id: c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]
Former-commit-id: 9771dfae6b
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
efd3392abe
|
13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]
Former-commit-id: 8e5f9e0e6c
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
51208e5515
|
13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
2d338b4cec
|
12.12.1-8 baseline
Former-commit-id: 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]
Former-commit-id: 19962f41ba
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
a81c46987b
|
12.12.1-3 baseline
Former-commit-id: b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]
Former-commit-id: c999505fba
|
2012-11-13 17:27:04 -06:00 |
|
Steve Harris
|
0abf64b77c
|
12.10.1-1 baseline
Former-commit-id: d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]
Former-commit-id: 195158c004
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
d07c18918d
|
12.9.1-11 baseline
Former-commit-id: fc405efab7 [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]
Former-commit-id: 6eb6b0909b
|
2012-08-30 14:36:12 -05:00 |
|
Steve Harris
|
36c108e960
|
12.9.1-4 baseline
Former-commit-id: 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]
Former-commit-id: dcda3a2290
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
c11f7d396e
|
12.9.1-3 baseline
Former-commit-id: 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]
Former-commit-id: 36d80b1f60
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
27871051e3
|
12.9.1-2 baseline
Former-commit-id: a198b3a807 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]
Former-commit-id: d1d877d319
|
2012-08-15 14:12:24 -05:00 |
|
Steve Harris
|
2653ddc2e3
|
12.8.1-5 baseline
Former-commit-id: cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]
Former-commit-id: fd2abfb6f1
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
11f96dbedd
|
12.7.1-8 baseline
Former-commit-id: c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: 16bf591a33
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
4bfbdad17d
|
12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 9f8cb727a5
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
750b7543dd
|
12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
0e4128712b
|
12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 4068f5295f
|
2012-03-30 08:38:33 -05:00 |
|
Matt Nash
|
580e2938d7
|
Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
|
2012-01-19 11:53:12 -06:00 |
|
root
|
a02aeb236c
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
|
2012-01-06 08:55:05 -06:00 |
|