Commit graph

12 commits

Author SHA1 Message Date
Steve Harris
7e48d3e684 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]
Former-commit-id: 4f155a183a
2013-02-21 15:41:39 -06:00
Steve Harris
db712e1fcf 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
2013-02-20 16:19:40 -06:00
Brad Gonzales
3e4338339b Issue #1517 Added SPC Prob menu changes.
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
       Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
       Updated units in spcGuideNDFD.xml.
       Removed local configuration menu items and tags.
       Updated pqact.conf.template SPC entry.
       Update SPC.py with levels.

Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1

Former-commit-id: 7cef72a460 [formerly 35cc853c74] [formerly f459554e33] [formerly 5bc6dd5498 [formerly f459554e33 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 62d4c20906235f41b4a9b49850da7af9a09a8dfd [formerly f3ef309293]
Former-commit-id: 8fc5c18ebd
2013-02-04 08:52:33 -06:00
Steve Harris
ce726fadc7 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]
Former-commit-id: d9be4dce21
2013-01-23 11:18:44 -05:00
Steve Harris
82cdde8491 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
2013-01-06 14:32:24 -06:00
Ben Steffensmeier
9b86fc6221 Issue #1387 updated style rules for RFC-FFG products, fixed never ending Requesting Gridded Data when RFC-FFG is loaded
Former-commit-id: 0aa85c1c28 [formerly 45220299f9] [formerly 95dc87b6cf] [formerly e44db81177 [formerly 95dc87b6cf [formerly 26abcb77b1b1157ce6e8bc5bda28202430f2d4f7]]]
Former-commit-id: e44db81177
Former-commit-id: 621f07af3d6794831b815542020e9c529dd63003 [formerly e1b134aa35]
Former-commit-id: d3456e3ee3
2012-12-04 14:09:28 -06:00
Ben Steffensmeier
ecdef95d0a Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 54767956bc [formerly 8e5b20236d] [formerly 9632663c0a] [formerly f918b6636f [formerly 9632663c0a [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]
Former-commit-id: f918b6636f
Former-commit-id: 7490d8b24afa2934ebd15d8ff27aa170ba918366 [formerly 6c38e6abb2]
Former-commit-id: 9512238d6e
2012-09-24 14:05:22 -05:00
Steve Harris
d3023f15ac 12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]
Former-commit-id: aed7a644df
2012-08-15 13:59:00 -05:00
Steve Harris
1f521a70b3 12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]
Former-commit-id: 97c4db937e
2012-06-08 13:39:48 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00