Commit graph

2833 commits

Author SHA1 Message Date
Bryan Kowal
7d68836b88 Merge "Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts" into development
Former-commit-id: e0d15b8e29 [formerly cd8b9072bf3c0e5c4c29f6656bb1a65c406fd5d1]
Former-commit-id: faa7604827
2014-03-27 09:25:14 -05:00
Steve Harris
b1d31f21bc Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
Former-commit-id: a70710b467 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]
Former-commit-id: 656ae897c1
2014-03-26 16:19:26 -05:00
Steve Harris
1b9ebbddcc Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 53f91fdeea [formerly b0b18895aa445ee9b29674443529558b2141c042]
Former-commit-id: e5910b6c60
2014-03-26 16:13:59 -05:00
Bryan Kowal
6b28f08242 Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts
Former-commit-id: a554dc8c20 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]
Former-commit-id: 286051cbb9
2014-03-26 14:57:46 -05:00
Bryan Kowal
70fdc03a5c Merge "Issue #2851 - 64-bit gridslice library for Windows" into development
Former-commit-id: 386e85fce9 [formerly c28104c670e68296662a2d81def52d1122a7ef98]
Former-commit-id: 6df224e171
2014-03-26 09:19:05 -05:00
Brian.Dyke
d8256c4226 Fixed comment merge conflicts added .gitignore
Former-commit-id: 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]
Former-commit-id: a0e7cb624a
2014-03-25 15:41:58 -04:00
Ron Anderson
bbbf19c72e Merge "Issue #2874 Initial implementation of RTOFS data." into development
Former-commit-id: 1cad7c8ea7 [formerly 8cabd826bb4aa4af699ac674dad5323a030926c4]
Former-commit-id: fdbb505679
2014-03-25 13:20:02 -05:00
Richard Peter
6ebd2444ef Merge "Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text" into development
Former-commit-id: 3e2f280091 [formerly 4ba995c11c3c67215821c582eeb91d2ed3e17f19]
Former-commit-id: 3221310454
2014-03-25 13:11:36 -05:00
Nate Jensen
7c581cb5d7 Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
Former-commit-id: 38e3305e60 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]
Former-commit-id: 4861f92ef6
2014-03-25 13:11:29 -05:00
Bryan Kowal
dcaac3d61d Issue #2851 - 64-bit gridslice library for Windows
cave/build/static/win32.amd64/cave/lib/gridslice.pyd: PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly


Former-commit-id: 37a6b85483 [formerly 687a060d44c88723de7f775925536adb9f71a257]
Former-commit-id: 53d1b8bcbb
2014-03-25 13:03:44 -05:00
Brian.Dyke
36fdf6bfe4 OB_14.1.1-25 baseline
Former-commit-id: c67833407c [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]
Former-commit-id: 074abeb0fa
2014-03-25 13:55:54 -04:00
Mike Duff
c13b5959e9 Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text
Change-Id: I444477eadf8b2d9a2afd5cc4089b4f3137b50b0b

Former-commit-id: 0bfdcdcbe0 [formerly b69a8729347de1f0a8ab855f778559085c6de741]
Former-commit-id: befb72d65e
2014-03-25 12:13:29 -05:00
Nate Jensen
c726dd0589 Merge "Issue #2935 fix refresh issue" into development
Former-commit-id: 4fe0db7411 [formerly 170854eea4ebb9c1f89f7b9f3fa67d47322643de]
Former-commit-id: 21d448c0bc
2014-03-25 11:25:38 -05:00
Mike Duff
d497c533e6 Issue #2938 - Show status message for site/role changes, but not return from away
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2

Former-commit-id: 1e42d8a30d [formerly 666a354d6f676b899bd14371517bce9de88192d2]
Former-commit-id: a06f058ea9
2014-03-25 11:18:09 -05:00
Nate Jensen
0cad1fa167 Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: 68f9181340 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]
Former-commit-id: 7b586ebd67
2014-03-25 10:24:11 -05:00
Nate Jensen
68298da133 Merge "Issue #2954 - Handle missing scale files at cave startup." into development
Former-commit-id: d11a2dd96b [formerly 5f8585234a010053c841f2f58a65c6885aea4940]
Former-commit-id: 9e2a9022ae
2014-03-25 08:37:55 -05:00
Mike Duff
6de201d3f8 Issue #2954 - Handle missing scale files at cave startup.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1

Former-commit-id: 372e9dc80f [formerly 4b7a68aeca0346f41965b98626e2c728b1a0e532]
Former-commit-id: 9334bc2b00
2014-03-24 16:38:38 -05:00
Lee Venable
d0ec74f4b7 Issue #2951 - added dispose checks for runAsync calls.
Former-commit-id: f5c4414c72 [formerly c4e17780f5a3dc342b856f83a4144ff3778c4001]
Former-commit-id: c2d52987f8
2014-03-24 16:14:49 -05:00
Nate Jensen
2d97ef8631 Merge "Issue #2868 plot delegate python now uses PythonCoordinatorJob API, Refactored plot data request, image creation, and sample threading" into development
Former-commit-id: 5df9be36da [formerly 78dbdcb1d98aa7fff15b3b9a9398c335cb45b923]
Former-commit-id: a47c32f4b9
2014-03-24 15:59:20 -05:00
Mike Duff
fc7a71889c Issue #2936 - Remove the join alert from the nws collaboration feed
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840

Former-commit-id: fd31ea7fa5 [formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]
Former-commit-id: ca27ceac1f
2014-03-24 14:59:33 -05:00
Nate Jensen
774091461c Issue #2868 plot delegate python now uses PythonCoordinatorJob API,
Refactored plot data request, image creation, and sample
              threading

Change-Id: I3e1a3dc70b2346aa826ec4509ee7a3e59c61a918

Former-commit-id: fe33896e7e [formerly e421731415d798487c96dd1e56b6f02347d9aa26]
Former-commit-id: c4beb293b9
2014-03-24 14:59:31 -05:00
Lee Venable
18de63886c Issue #1426 - fixed arrow buttons and simplified the code.
Former-commit-id: 702ebe6881 [formerly fc55337ba9768a7b9e6ecde11f8c8ddfd32c4859]
Former-commit-id: 4c80552979
2014-03-24 14:08:49 -05:00
Ben Steffensmeier
ab8293c6a1 Issue #2874 Initial implementation of RTOFS data.
Former-commit-id: 55046a8e1e [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]
Former-commit-id: 12ed72b0c0
2014-03-24 11:10:18 -05:00
Brian.Dyke
14567f20a7 Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 06ee9a6384 [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]
Former-commit-id: 07b2e04d7a
2014-03-24 07:01:29 -04:00
Lee Venable
f08d4a827f Issue #2925 - Fixed NPE found during testing.
Former-commit-id: c29981fa99 [formerly 86306076f94bbfe4e063c4e6d82b7140b5911e61]
Former-commit-id: 5b73c516d3
2014-03-21 12:42:13 -05:00
Brian.Dyke
6b2175da93 OB_14.1.1-24 baseline
Former-commit-id: 37b6368268 [formerly 8b1e7457fc58021208e4233502f118cf34df7534]
Former-commit-id: face1ebeeb
2014-03-21 12:43:50 -04:00
Lee Venable
88619d51a1 Merge "Issue #2925 - added runAsync dispose checks." into development
Former-commit-id: 7d4062dc66 [formerly cb16fae6fd3cebdf1c80fc18dbc2684c27018b3d]
Former-commit-id: 597fe2b674
2014-03-20 17:49:30 -05:00
Nate Jensen
a5cf7bd6e0 Merge "Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image." into development
Former-commit-id: 8a3c03b260 [formerly 8fddee15ee0fbe36c917b06cdf64f76c2b69fc86]
Former-commit-id: a47328b3cb
2014-03-20 14:22:57 -05:00
Nate Jensen
59485dbac7 Merge "Issue #2791 fix NaN handling of smoothed contours." into development
Former-commit-id: f9b86f97e0 [formerly 347b9555cfe67ee5643b92bd84afbd1e2899acd7]
Former-commit-id: c64f0b2558
2014-03-20 14:19:17 -05:00
Ben Steffensmeier
a9ee8b9b2f Issue #2791 fix NaN handling of smoothed contours.
Former-commit-id: 76fcfe163e [formerly a6f8a0bd2758008997555e08ea7245517535b1db]
Former-commit-id: c5aac15437
2014-03-20 13:34:52 -05:00
Ben Steffensmeier
48dac44df4 Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image.
Former-commit-id: 286f447a9c [formerly db3ffd586611ea8692728ea0de5451cec89421b6]
Former-commit-id: 14af3282cb
2014-03-20 13:31:08 -05:00
Brad Gonzales
d303662a51 Issue #2873 Removed 32 bit native libraries and references.
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f

Former-commit-id: 08dde4824f [formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]
Former-commit-id: 189234f162
2014-03-20 13:27:39 -05:00
Lee Venable
2a6f9e8a85 Issue #2925 - added runAsync dispose checks.
Change-Id: I4048f4b4ae8976d93b1bee89179be527ee3139e5

Former-commit-id: 112f7a886e [formerly 2ebffdcfca606309daa3ed587f696a95af0b094e]
Former-commit-id: 397cb233d4
2014-03-20 13:09:17 -05:00
Mike Duff
a624cd8053 Issue #2857 - Implement Redbook NCO NDM menus
Change-Id: I93e9f21e8b7e797affe1e52c7baef0217433460b

Former-commit-id: c67f9c4be2 [formerly 2ddd856c9297a782340dc0fb9db2a9d36048f760]
Former-commit-id: 4ec18a8178
2014-03-20 11:24:48 -05:00
Mike Duff
09be0ef28d Issue #2856 - Implement Redbook CPC ndm menus
Change-Id: I1ef4007b9f7147a9640754aaf8846028a40d0693

Former-commit-id: 25c8a0a8aa [formerly 8d9935cbee365c4a8537da610c2aff4d95c50f40]
Former-commit-id: 40319e5fcf
2014-03-20 11:16:35 -05:00
Mike Duff
bb07c57f3e Issue #2859 - Implement redbook MPC NDM menus
Change-Id: Ib681435386ea8e4335f5984ddbee2213633cac8e

Former-commit-id: 059ac9c52a [formerly 619efadc2230af13707f124534d3caf2fdfaba68]
Former-commit-id: e479bd7055
2014-03-19 14:40:00 -05:00
Lee Venable
9784b3737e Merge "Issue #2433 - Implement view by priority check box menus review comments" into development
Former-commit-id: 96ea26a9a2 [formerly 27cb84fc6629e94927a4e80cba9586df20805b0a]
Former-commit-id: ab3de987b4
2014-03-19 08:54:39 -05:00
Nate Jensen
99643d9545 Merge "Issue #2895 fixed telestration when leadership returns to a previous leader" into development
Former-commit-id: 3ee42187e6 [formerly ad4deae1563ea5f311c3428cefb82bf156392310]
Former-commit-id: d44fee0588
2014-03-18 17:01:44 -05:00
Mike Duff
980e398584 Issue #2433 - Implement view by priority check box menus
review comments

Change-Id: I63c984c328336ebe9d6d06dbc48780051e3ea2e7

Former-commit-id: a7e568e799 [formerly ca228b57089101c61f9d3f76d7edc4ba96c41b61]
Former-commit-id: 202a822384
2014-03-18 16:42:58 -05:00
Nate Jensen
3e32812f13 Merge "Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. Peer review comments" into development
Former-commit-id: 85e3ac041a [formerly 5e03b83061e1cd7f1a15e939c2bc98d3b99cf393]
Former-commit-id: 7e7745cd7b
2014-03-18 13:13:53 -05:00
Nate Jensen
ca1ec93450 Issue #2895 fixed telestration when leadership returns to a previous
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: e75d3dfb7c [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]
Former-commit-id: 2fc1030fad
2014-03-18 12:52:01 -05:00
Nate Jensen
a4728542c5 Merge "Issue #2798 - Fix issue with color not changing for existing user changing site." into development
Former-commit-id: 5f79ece006 [formerly 1c87269eac595b61cc54c1e39ec8624ba55fd6d8]
Former-commit-id: e9be36b08c
2014-03-18 12:38:48 -05:00
Mike Duff
5bbe504f82 Issue #2798 - Fix issue with color not changing for existing user changing site.
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57

Former-commit-id: 3d10260065 [formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]
Former-commit-id: 7bdef60a55
2014-03-18 11:55:00 -05:00
Mike Duff
d98f4b2ab0 Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common.
Peer review comments

Change-Id: Ie27e8f93d976dcc0573631472986898b3ad8c9ef

Former-commit-id: 105a11d8f9 [formerly 29a88687a788305be537ef97cce13e3f45338205]
Former-commit-id: cb6a3e2cf5
2014-03-18 11:32:28 -05:00
Nate Jensen
e77738ef65 Merge "Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit" into development
Former-commit-id: 6ddf9a2ee7 [formerly 5b287c87e27e77b07b2f72030bf9e23c72e50912]
Former-commit-id: 6148c00ed2
2014-03-18 09:20:16 -05:00
Steve Harris
b5a2d2237f Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: d0aeb854f5 [formerly a2318f04eea89a258400dea526daa4fe67b69271]
Former-commit-id: 0c2c5ad4bd
2014-03-17 15:55:41 -05:00
Steve Harris
f878fe8729 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: d087c8c31e [formerly 543090e28936ce680e21cda802cfac73ff31ca58]
Former-commit-id: 24fe6a248f
2014-03-17 15:53:31 -05:00
Nate Jensen
d4596770ee Issue #2908 attempt to fix build
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480

Former-commit-id: 78afc6040c [formerly 131d45e260ab446e9764d0fcc1f542ef012ff352]
Former-commit-id: 9cf43e7de6
2014-03-14 14:14:37 -05:00
Brian.Dyke
2109409b24 Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 030a18f804 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]
Former-commit-id: 30084d7f84
2014-03-14 10:15:53 -04:00
Brian.Dyke
3ab2df3507 Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: d4b6d22ae2 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]
Former-commit-id: f999e48df0
2014-03-14 08:44:39 -04:00