Brian.Dyke
|
0f9fe8301a
|
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: fe85eb9f70 [formerly 3d9a3de6e4] [formerly fe85eb9f70 [formerly 3d9a3de6e4] [formerly 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]]
Former-commit-id: 01dfe503f5
Former-commit-id: 29364e2b9f [formerly c42733eb39]
Former-commit-id: a31d3d702e
|
2014-09-09 11:44:30 -04:00 |
|
David Friedman
|
e42ffa0ad4
|
ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa
Former-commit-id: 9c2545ed64 [formerly de6e79f9e3] [formerly 9c2545ed64 [formerly de6e79f9e3] [formerly d5c086a022 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]]
Former-commit-id: d5c086a022
Former-commit-id: b2cc41f3de [formerly 6209bbc36f]
Former-commit-id: 41b4886743
|
2014-08-28 18:08:23 +00:00 |
|
Mike Duff
|
a86684f034
|
Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text
Change-Id: I444477eadf8b2d9a2afd5cc4089b4f3137b50b0b
Former-commit-id: 1eefb7be44 [formerly 0bfdcdcbe0] [formerly 1eefb7be44 [formerly 0bfdcdcbe0] [formerly befb72d65e [formerly b69a8729347de1f0a8ab855f778559085c6de741]]]
Former-commit-id: befb72d65e
Former-commit-id: f0f10d8061 [formerly c13b5959e9]
Former-commit-id: 8f0a23c91b
|
2014-03-25 12:13:29 -05:00 |
|
Mike Duff
|
ab451ac799
|
Issue #2857 - Implement Redbook NCO NDM menus
Change-Id: I93e9f21e8b7e797affe1e52c7baef0217433460b
Former-commit-id: 645e16792e [formerly c67f9c4be2] [formerly 645e16792e [formerly c67f9c4be2] [formerly 4ec18a8178 [formerly 2ddd856c9297a782340dc0fb9db2a9d36048f760]]]
Former-commit-id: 4ec18a8178
Former-commit-id: 80855b8e08 [formerly a624cd8053]
Former-commit-id: bb07313742
|
2014-03-20 11:24:48 -05:00 |
|
Mike Duff
|
df31189a39
|
Issue #2856 - Implement Redbook CPC ndm menus
Change-Id: I1ef4007b9f7147a9640754aaf8846028a40d0693
Former-commit-id: cdee2df27f [formerly 25c8a0a8aa] [formerly cdee2df27f [formerly 25c8a0a8aa] [formerly 40319e5fcf [formerly 8d9935cbee365c4a8537da610c2aff4d95c50f40]]]
Former-commit-id: 40319e5fcf
Former-commit-id: af9f9ba2c8 [formerly 09be0ef28d]
Former-commit-id: 9335ae821e
|
2014-03-20 11:16:35 -05:00 |
|
Mike Duff
|
580af4bdeb
|
Issue #2859 - Implement redbook MPC NDM menus
Change-Id: Ib681435386ea8e4335f5984ddbee2213633cac8e
Former-commit-id: 4be30fdc5b [formerly 059ac9c52a] [formerly 4be30fdc5b [formerly 059ac9c52a] [formerly e479bd7055 [formerly 619efadc2230af13707f124534d3caf2fdfaba68]]]
Former-commit-id: e479bd7055
Former-commit-id: 0b94340d7e [formerly bb07c57f3e]
Former-commit-id: c67dacabf5
|
2014-03-19 14:40:00 -05:00 |
|
Mike Duff
|
397af6e36e
|
Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common.
Peer review comments
Change-Id: Ie27e8f93d976dcc0573631472986898b3ad8c9ef
Former-commit-id: 26866f4d73 [formerly 105a11d8f9] [formerly 26866f4d73 [formerly 105a11d8f9] [formerly cb6a3e2cf5 [formerly 29a88687a788305be537ef97cce13e3f45338205]]]
Former-commit-id: cb6a3e2cf5
Former-commit-id: ae979e09f5 [formerly d98f4b2ab0]
Former-commit-id: ef7847bc14
|
2014-03-18 11:32:28 -05:00 |
|
Mike Duff
|
c1164aae5a
|
Issue #2858 - Implement NDM menus for ncep/hydro SPC
Peer review comments
Change-Id: Icbafa1e08ea9bc564c3f302715f527b92a5a55e5
Former-commit-id: 865ef97108 [formerly 9aa0b40ed5] [formerly 865ef97108 [formerly 9aa0b40ed5] [formerly b434ab5bb3 [formerly a74573fef8cc09ed15341d9873ae1dd2ba561478]]]
Former-commit-id: b434ab5bb3
Former-commit-id: 8c277c76f2 [formerly 693793eb92]
Former-commit-id: 7dccf753c4
|
2014-03-12 11:19:18 -05:00 |
|
Max Schenkelberg
|
229e0ee235
|
Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc
Former-commit-id: 6c92aa9dd7 [formerly 5ab8b6e2c6] [formerly 6c92aa9dd7 [formerly 5ab8b6e2c6] [formerly 06dbae8bdb [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]]
Former-commit-id: 06dbae8bdb
Former-commit-id: 2fc5af010d [formerly 759ff7bcfd]
Former-commit-id: 961ed891c8
|
2013-08-14 09:20:28 -05:00 |
|