Steve Harris
|
17318b1870
|
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: 6ef3b9f1e5 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]
Former-commit-id: 1c8f2f6185
Former-commit-id: b797b4b1fa
|
2014-05-05 08:21:02 -05:00 |
|
Brian.Dyke
|
0fa669acce
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: a19f01c620 [formerly a19f01c620 [formerly 4e921dbeab89e61635144b441ae0015155376c59]]
Former-commit-id: e82fc8f89c
Former-commit-id: df6f06bef5
|
2014-04-24 13:01:50 -04:00 |
|
David Gillingham
|
edd683b897
|
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: d867e0ca2f [formerly d867e0ca2f [formerly bfb01b8ab25c7287f6c71155a6808f8596403742]]
Former-commit-id: 58b64ff3a3
Former-commit-id: a481c69387
|
2013-08-27 11:35:38 -05:00 |
|
Max Schenkelberg
|
2178fac70d
|
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: 0f3c791120 [formerly 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]
Former-commit-id: d79cfe8ad1
Former-commit-id: 75c95e83ef
|
2013-08-09 14:24:49 -05:00 |
|
Nate Jensen
|
440756a331
|
Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f
Former-commit-id: a919490d00 [formerly a919490d00 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]
Former-commit-id: a9f5465c99
Former-commit-id: fe3adecbc2
|
2013-08-08 14:46:52 -05:00 |
|
Steve Harris
|
146c5e8940
|
13.5.1-1 baseline
Former-commit-id: 998961612c [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: fe872355a7
Former-commit-id: 30ba1d634e
|
2013-06-10 15:17:17 -04:00 |
|
Roger Ferrel
|
c1ffc82920
|
Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa
Former-commit-id: 8f4492c63c [formerly 8f4492c63c [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]
Former-commit-id: 463407a40e
Former-commit-id: ec5f32aec6
|
2013-03-29 11:35:08 -05:00 |
|
Roger Ferrel
|
c354469c78
|
Issue #1790 bug fix for GFE dialogs in ticket 1353.
Change-Id: Ibe3361dfcf0361f66eb6d1da3893c309e8fcc612
Former-commit-id: 98d056c3a1 [formerly 98d056c3a1 [formerly ee4a6d815bc85f861bb7d77719c5787343625741]]
Former-commit-id: 4db9e20fbf
Former-commit-id: b95a38db32
|
2013-03-28 09:04:10 -05:00 |
|
Steve Harris
|
f1d156779a
|
13.3.1-12 baseline
Former-commit-id: 0be473728a [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
547c1dedd1
|
13.2.1-2 baseline
Former-commit-id: 83e9157df7 [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
|
2013-01-23 11:18:44 -05:00 |
|
Roger Ferrel
|
3a9b914186
|
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: 5250a0addf [formerly 5250a0addf [formerly 5444e7653c0cf488eb424a16816beb2e6a9335b1]]
Former-commit-id: cabdfd569f
Former-commit-id: e8d8dcc795
|
2013-01-16 13:07:58 -06:00 |
|
Steve Harris
|
b6fa9b4858
|
13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
|
2013-01-06 14:32:24 -06:00 |
|
Roger Ferrel
|
7c0913de25
|
Issue #1353 Fix messed up merge for GhgFilterDlg and GhgMonitorDlg.
Change-Id: I35d6d6b1a66887e6c8af4b43267ecc3fef079b2c
Former-commit-id: 9ce284e2d9 [formerly 9ce284e2d9 [formerly 8904b7a7cfb3fdd9e2c28f2799550bed863e72ec]]
Former-commit-id: c4e925aba1
Former-commit-id: 61930c5532
|
2012-12-03 17:13:04 -06:00 |
|
Roger Ferrel
|
66b44dffbe
|
Issue #1353 Changers for non-blocking GhgFilterDlg and GhgSaveDeleteFilterDlg.
Change-Id: I9a6278ea75eda3f8bc9666f6ae41451b255cb223
Former-commit-id: d1d846267c [formerly d1d846267c [formerly 5a2362265aa6378f323144d87f6d7ef01cd37c9f]]
Former-commit-id: 2be7ff7c35
Former-commit-id: ba682f2812
|
2012-12-03 10:31:22 -06:00 |
|
Roger Ferrel
|
7720709aef
|
Issue #1353 Chagnes for non-blocking GhgColorDlg and GhgMonitorDlg.
Change-Id: If434b0e6a2ada677bb81fc49b7165e20d3041b17
Former-commit-id: fdcd4f519a [formerly fdcd4f519a [formerly cca0279fe7d8a4e811f81f3c929f24b21eecd1e4]]
Former-commit-id: 04a7b91150
Former-commit-id: 1f745272cb
|
2012-11-28 07:48:30 -06:00 |
|
Roger Ferrel
|
342a35599b
|
Issue #1298 Changes for non-blocking GhgAlertDlg.
Change-Id: I1da7317ad69203a4160c806458fdbf99a7d9108d
Former-commit-id: 800c1a6908 [formerly 800c1a6908 [formerly b3c640da3fad8d1ce07e348b075b9b1a0468da37]]
Former-commit-id: c0554d9686
Former-commit-id: 05f32527bd
|
2012-11-15 15:51:46 -06:00 |
|
Roger Ferrel
|
418dd35a9d
|
Issue #1298 Changes for non-blocking GhgMonitorDlg.
Change-Id: I69a05b6d62e8d75c998b6cb9059c9f45e6cf39d3
Former-commit-id: dc82ad820b [formerly dc82ad820b [formerly 782113272c208a32e6165c02404138fcaa79d523]]
Former-commit-id: 109dea21e1
Former-commit-id: 2206167b00
|
2012-11-15 14:37:29 -06:00 |
|
Steve Harris
|
faadb51529
|
12.10.1-3 baseline
Former-commit-id: 21f430062b [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 438d139fdd
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
9b5c2094ed
|
12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
|
2012-08-21 15:27:03 -05:00 |
|
Ron Anderson
|
f7b9190b51
|
Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: 1321db6a99 [formerly 1321db6a99 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]
Former-commit-id: 819b9c8e56
Former-commit-id: 6eafdda705
|
2012-08-17 12:20:08 -05:00 |
|
Ron Anderson
|
b109c320ae
|
Issue #851 Cleaned up dead code and unused dependencies in GFE.
Amend: Issue #851 resubmitting after accepting ticket
Change-Id: I8bef2701a845275bba148e9777f3cb161b056d6e
Former-commit-id: ff5c7b7498 [formerly ff5c7b7498 [formerly af1332170e28aed53ff91997ce089b20423203d5]]
Former-commit-id: 59a3ebe8ba
Former-commit-id: 0c5199ba03
|
2012-07-05 15:39:05 -05:00 |
|
Bryan Kowal
|
720a152a45
|
Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: dcc5675564 [formerly dcc5675564 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]
Former-commit-id: c0aaac4a07
Former-commit-id: c608fc959c
|
2012-06-14 11:35:15 -05:00 |
|
Steve Harris
|
8cd5974f4c
|
12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
2e0f4b241b
|
12.3.1-10 baseline
Former-commit-id: 4068f5295f [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 22bd792cd9
Former-commit-id: ce3b74c605
|
2012-03-30 08:38:33 -05:00 |
|
Matt Nash
|
21d2361f00
|
Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
|
2012-01-19 11:53:12 -06:00 |
|
root
|
377dcd10b9
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
|
2012-01-06 08:55:05 -06:00 |
|