Steve Harris
|
9e149df799
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 1c8f2f6185 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]
Former-commit-id: 6ef3b9f1e5
|
2014-05-05 08:21:02 -05:00 |
|
Brian.Dyke
|
eff27f5504
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: e82fc8f89c [formerly 4e921dbeab89e61635144b441ae0015155376c59]
Former-commit-id: a19f01c620
|
2014-04-24 13:01:50 -04:00 |
|
David Gillingham
|
1c79f69a18
|
Issue #2301: Fix GHG Monitor for 13.6, prevent map mouse handler events from firing until map is loaded.
Change-Id: Ifc758cb4d3ab0f06269e1176ce692664b81e5580
Former-commit-id: 58b64ff3a3 [formerly bfb01b8ab25c7287f6c71155a6808f8596403742]
Former-commit-id: d867e0ca2f
|
2013-08-27 11:35:38 -05:00 |
|
Max Schenkelberg
|
b95a96f4c9
|
Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f
Former-commit-id: d79cfe8ad1 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]
Former-commit-id: 0f3c791120
|
2013-08-09 14:24:49 -05:00 |
|
Nate Jensen
|
cce952c0bc
|
Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f
Former-commit-id: a9f5465c99 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]
Former-commit-id: a919490d00
|
2013-08-08 14:46:52 -05: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 |
|
Roger Ferrel
|
20f6baba0e
|
Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa
Former-commit-id: 463407a40e [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]
Former-commit-id: 8f4492c63c
|
2013-03-29 11:35:08 -05:00 |
|
Roger Ferrel
|
57fe6b5ca6
|
Issue #1790 bug fix for GFE dialogs in ticket 1353.
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612
Former-commit-id: 4db9e20fbf [formerly ee4a6d815bc85f861bb7d77719c5787343625741]
Former-commit-id: 98d056c3a1
|
2013-03-28 09:04:10 -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
|
33bc5fd816
|
13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
|
2013-01-23 11:18:44 -05:00 |
|
Roger Ferrel
|
fbf6bc87c4
|
Issue #1492 Made GFE's GhgFontDlg and volume browser's InventoryDlg non-blocking; removed no longer needed "original" classes. No code changes merge conflict?
Change-Id: I28676d7b6d016e3f4f61fcc667c2e1d2af9e53d1
Former-commit-id: cabdfd569f [formerly 5444e7653c0cf488eb424a16816beb2e6a9335b1]
Former-commit-id: 5250a0addf
|
2013-01-16 13:07:58 -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 |
|
Roger Ferrel
|
1a53158248
|
Issue #1353 Fix messed up merge for GhgFilterDlg and GhgMonitorDlg.
Change-Id: I35d6d6b1a66887e6c8af4b43267ecc3fef079b2c
Former-commit-id: c4e925aba1 [formerly 8904b7a7cfb3fdd9e2c28f2799550bed863e72ec]
Former-commit-id: 9ce284e2d9
|
2012-12-03 17:13:04 -06:00 |
|
Roger Ferrel
|
317e34f89b
|
Issue #1353 Changers for non-blocking GhgFilterDlg and GhgSaveDeleteFilterDlg.
Change-Id: I9a6278ea75eda3f8bc9666f6ae41451b255cb223
Former-commit-id: 2be7ff7c35 [formerly 5a2362265aa6378f323144d87f6d7ef01cd37c9f]
Former-commit-id: d1d846267c
|
2012-12-03 10:31:22 -06:00 |
|
Roger Ferrel
|
c9fd0d3b06
|
Issue #1353 Chagnes for non-blocking GhgColorDlg and GhgMonitorDlg.
Change-Id: If434b0e6a2ada677bb81fc49b7165e20d3041b17
Former-commit-id: 04a7b91150 [formerly cca0279fe7d8a4e811f81f3c929f24b21eecd1e4]
Former-commit-id: fdcd4f519a
|
2012-11-28 07:48:30 -06:00 |
|
Roger Ferrel
|
b66bc0210a
|
Issue #1298 Changes for non-blocking GhgAlertDlg.
Change-Id: I1da7317ad69203a4160c806458fdbf99a7d9108d
Former-commit-id: c0554d9686 [formerly b3c640da3fad8d1ce07e348b075b9b1a0468da37]
Former-commit-id: 800c1a6908
|
2012-11-15 15:51:46 -06:00 |
|
Roger Ferrel
|
a29b52ca8c
|
Issue #1298 Changes for non-blocking GhgMonitorDlg.
Change-Id: I69a05b6d62e8d75c998b6cb9059c9f45e6cf39d3
Former-commit-id: 109dea21e1 [formerly 782113272c208a32e6165c02404138fcaa79d523]
Former-commit-id: dc82ad820b
|
2012-11-15 14:37:29 -06:00 |
|
Steve Harris
|
de1639aea2
|
12.10.1-3 baseline
Former-commit-id: 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]
Former-commit-id: 21f430062b
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
a1d931fd44
|
12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
|
2012-08-21 15:27:03 -05:00 |
|
Ron Anderson
|
93c632c1ff
|
Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: 819b9c8e56 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]
Former-commit-id: 1321db6a99
|
2012-08-17 12:20:08 -05:00 |
|
Ron Anderson
|
936b2cabca
|
Issue #851 Cleaned up dead code and unused dependencies in GFE.
Amend: Issue #851 resubmitting after accepting ticket
Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e
Former-commit-id: 59a3ebe8ba [formerly af1332170e28aed53ff91997ce089b20423203d5]
Former-commit-id: ff5c7b7498
|
2012-07-05 15:39:05 -05:00 |
|
Bryan Kowal
|
5e80c45a03
|
Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: c0aaac4a07 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]
Former-commit-id: dcc5675564
|
2012-06-14 11:35:15 -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 |
|