Commit graph

3100 commits

Author SHA1 Message Date
Ron Anderson
6264fd681d Merge "Issue #2664 Added support for non-WGS84 shape files" into development
Former-commit-id: e7ec80c0ca [formerly a97734c786] [formerly 21e3eeca05] [formerly 86c0fe78f2 [formerly 21e3eeca05 [formerly 6ec350a33b6f5bca31906ff2f7b5b76911f33973]]]
Former-commit-id: 86c0fe78f2
Former-commit-id: 277e90770a5c5453a1ebffc7aa107e33b2fb38a6 [formerly c318aa6547]
Former-commit-id: 374f012e85
2014-03-27 14:35:34 -05:00
David Friedman
1e4ac84f99 Merge branch 'master_14.2.2' into asm_14.2.2
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: ee37afaf7b [formerly 32a7adbe4b] [formerly fd900e38c2] [formerly f146c7bcd0 [formerly fd900e38c2 [formerly cf35c1870fc4b6b3c2ceaf038274c4701f8046b1]]]
Former-commit-id: f146c7bcd0
Former-commit-id: 06e6f2e7e7ae2f1959eaefcb5e76c2a04c33de99 [formerly 533d15c863]
Former-commit-id: 1168a3eae5
2014-03-27 19:17:03 +00:00
Ron Anderson
fb564d8275 Issue #2664 Added support for non-WGS84 shape files
Change-Id: Id7ec05ddd6c8ff8b144ef4208db3e052e9693951

Former-commit-id: b08d5dfe21 [formerly c9e456983b] [formerly 1b39ed7771] [formerly 4c6cddc7d4 [formerly 1b39ed7771 [formerly 143017d2a61b242a7fa5d9ad596cd958cea1df3a]]]
Former-commit-id: 4c6cddc7d4
Former-commit-id: 4fef82c9075c140b26c17875dcbc2c745ae87cba [formerly 65d4400471]
Former-commit-id: 527399107f
2014-03-27 13:04:44 -05:00
Bryan Kowal
fad5502b49 Merge "Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts" into development
Former-commit-id: b55006b39a [formerly 5b563bf870] [formerly e0d15b8e29] [formerly faa7604827 [formerly e0d15b8e29 [formerly cd8b9072bf3c0e5c4c29f6656bb1a65c406fd5d1]]]
Former-commit-id: faa7604827
Former-commit-id: 55c97eebe8665cd8a5690127e9024a4759ccbf78 [formerly 7d68836b88]
Former-commit-id: 5ce208ec73
2014-03-27 09:25:14 -05:00
Brian.Dyke
bded86a35f Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: 7ca114f7f1 [formerly a1b980a15d] [formerly 6346c9776b] [formerly 3b639347f8 [formerly 6346c9776b [formerly 3b24535fec4e47c1eb0bb845f77dd2f407ecf412]]]
Former-commit-id: 3b639347f8
Former-commit-id: 38694ae3f3f4b7b74544ffa190d887b7c937b26b [formerly 76625c2238]
Former-commit-id: 519ec3071a
2014-03-27 10:22:26 -04:00
Steve Harris
4cc478e83b Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development
Former-commit-id: 883244fa2e [formerly 29f4f53d27] [formerly a70710b467] [formerly 656ae897c1 [formerly a70710b467 [formerly eeb50c8acbe727769ed7f14b63b94af5b14bbf3f]]]
Former-commit-id: 656ae897c1
Former-commit-id: c89d11e09dd409255cf1e5daff026439aa00fab2 [formerly b1d31f21bc]
Former-commit-id: b99ed0cce6
2014-03-26 16:19:26 -05:00
Steve Harris
46efda0c29 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: ef7ebd22b4 [formerly d940427408] [formerly 53f91fdeea] [formerly e5910b6c60 [formerly 53f91fdeea [formerly b0b18895aa445ee9b29674443529558b2141c042]]]
Former-commit-id: e5910b6c60
Former-commit-id: 81756753feb5c4701663ee447ac1a92dcfa9676d [formerly 1b9ebbddcc]
Former-commit-id: 9d4f24da7b
2014-03-26 16:13:59 -05:00
Steve Harris
3b8569a1ac Merge branch 'master_14.2.1' (14.2.1-14,15) into omaha_14.2.1
Former-commit-id: e621e81f20 [formerly 9cf3600ff6] [formerly 4879520391] [formerly a7efde7cf4 [formerly 4879520391 [formerly 42a1ec47aa72a882d0f53f94eba3284dccd89b21]]]
Former-commit-id: a7efde7cf4
Former-commit-id: 9e1c5536bf5208e6e617f1b651bab6961954548a [formerly 55440888fd]
Former-commit-id: 311c8d67af
2014-03-26 15:51:32 -05:00
Bryan Kowal
718bbc47f4 Issue #2851 - msi build updates for two shortcuts instead of a single launcher; added amd64 scripts
Former-commit-id: d455d71216 [formerly 911c0a99c9] [formerly a554dc8c20] [formerly 286051cbb9 [formerly a554dc8c20 [formerly 386723d9048f6d6b6bd0281f273210949672acd2]]]
Former-commit-id: 286051cbb9
Former-commit-id: 92b3111cb9f6f27db1c947559a4696fd1d1b0a4b [formerly 6b28f08242]
Former-commit-id: f0f10e2544
2014-03-26 14:57:46 -05:00
Bryan Kowal
1a1c33b8c8 Merge "Issue #2851 - 64-bit gridslice library for Windows" into development
Former-commit-id: 3821e13dcd [formerly 3f06c30135] [formerly 386e85fce9] [formerly 6df224e171 [formerly 386e85fce9 [formerly c28104c670e68296662a2d81def52d1122a7ef98]]]
Former-commit-id: 6df224e171
Former-commit-id: b1fdb0c4cb169ca5eddb0cdb3e8bfdb6ee9a3dbb [formerly 70fdc03a5c]
Former-commit-id: d8b088392b
2014-03-26 09:19:05 -05:00
Brian.Dyke
6476c4fb85 Fixed comment merge conflicts added .gitignore
Former-commit-id: 642cdfe2e6 [formerly 027cca8673] [formerly 7cc471a9c9] [formerly a0e7cb624a [formerly 7cc471a9c9 [formerly 6093428342170b9fd8deb741a5721375e80bc955]]]
Former-commit-id: a0e7cb624a
Former-commit-id: 47a683ae6b10ecfc1cda91acf0f3b856b0a8977f [formerly d8256c4226]
Former-commit-id: 412a7eb2c2
2014-03-25 15:41:58 -04:00
Ron Anderson
ac0f8c1339 Merge "Issue #2874 Initial implementation of RTOFS data." into development
Former-commit-id: 1715102f26 [formerly c8b2da72ee] [formerly 1cad7c8ea7] [formerly fdbb505679 [formerly 1cad7c8ea7 [formerly 8cabd826bb4aa4af699ac674dad5323a030926c4]]]
Former-commit-id: fdbb505679
Former-commit-id: 1ac36120a099b3b2a502909144590734aecf5303 [formerly bbbf19c72e]
Former-commit-id: b154755f33
2014-03-25 13:20:02 -05:00
Richard Peter
e5dc574b44 Merge "Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text" into development
Former-commit-id: 4188281e8b [formerly c37a55b552] [formerly 3e2f280091] [formerly 3221310454 [formerly 3e2f280091 [formerly 4ba995c11c3c67215821c582eeb91d2ed3e17f19]]]
Former-commit-id: 3221310454
Former-commit-id: dd67ae29188f830e505220cad6a9914b86728cf8 [formerly 6ebd2444ef]
Former-commit-id: 457e51a4ee
2014-03-25 13:11:36 -05:00
Nate Jensen
0a9da8ca6c Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
Former-commit-id: d1ca7d7c75 [formerly c7dc0baeb9] [formerly 38e3305e60] [formerly 4861f92ef6 [formerly 38e3305e60 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]
Former-commit-id: 4861f92ef6
Former-commit-id: f289ec627b5f30e10b3a962e1f08f3e13492e4e2 [formerly 7c581cb5d7]
Former-commit-id: 307cdc15c1
2014-03-25 13:11:29 -05:00
Bryan Kowal
5e07b5f00d 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: 4e4f55eb6c [formerly 065e1dac5e] [formerly 37a6b85483] [formerly 53d1b8bcbb [formerly 37a6b85483 [formerly 687a060d44c88723de7f775925536adb9f71a257]]]
Former-commit-id: 53d1b8bcbb
Former-commit-id: e2ae36264143a5a4e9f00cb98512d5d27750943e [formerly dcaac3d61d]
Former-commit-id: 77601dbb9f
2014-03-25 13:03:44 -05:00
Brian.Dyke
5b848e5480 OB_14.1.1-25 baseline
Former-commit-id: c66bac30c7 [formerly c085bc6879] [formerly c67833407c] [formerly 074abeb0fa [formerly c67833407c [formerly dd2417b58b33005985f80cc83b45134132b3e5a1]]]
Former-commit-id: 074abeb0fa
Former-commit-id: ec4f283a91b4ae374dc7edc0c06351378f44b61f [formerly 36fdf6bfe4]
Former-commit-id: 95ada25b65
2014-03-25 13:55:54 -04:00
Mike Duff
78523a861c Issue #2857 - Fix the ncoBase.xml file, add better error logging for missing menu text
Change-Id: I444477eadf8b2d9a2afd5cc4089b4f3137b50b0b

Former-commit-id: e0fc16c612 [formerly 1eefb7be44] [formerly 0bfdcdcbe0] [formerly befb72d65e [formerly 0bfdcdcbe0 [formerly b69a8729347de1f0a8ab855f778559085c6de741]]]
Former-commit-id: befb72d65e
Former-commit-id: 81e6f193a12ca5c960bf6c6512fb2a5e76dbdeec [formerly c13b5959e9]
Former-commit-id: f0f10d8061
2014-03-25 12:13:29 -05:00
Nate Jensen
c4eb2113d8 Merge "Issue #2935 fix refresh issue" into development
Former-commit-id: 61653d8e45 [formerly 07c97d0fda] [formerly 4fe0db7411] [formerly 21d448c0bc [formerly 4fe0db7411 [formerly 170854eea4ebb9c1f89f7b9f3fa67d47322643de]]]
Former-commit-id: 21d448c0bc
Former-commit-id: 428b0f96016670efcf89eef5a265277ea2a064c3 [formerly c726dd0589]
Former-commit-id: 33c20da77f
2014-03-25 11:25:38 -05:00
Mike Duff
47402575c0 Issue #2938 - Show status message for site/role changes, but not return from away
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2

Former-commit-id: 1d0edcc2c6 [formerly 758fdca514] [formerly 1e42d8a30d] [formerly a06f058ea9 [formerly 1e42d8a30d [formerly 666a354d6f676b899bd14371517bce9de88192d2]]]
Former-commit-id: a06f058ea9
Former-commit-id: 6fb4c8dc2286133134b00c03341141f90a3454df [formerly d497c533e6]
Former-commit-id: 81ac35a1b8
2014-03-25 11:18:09 -05:00
Nate Jensen
19b2056aaf Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: c6474ef98e [formerly d1f080fd05] [formerly 68f9181340] [formerly 7b586ebd67 [formerly 68f9181340 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]
Former-commit-id: 7b586ebd67
Former-commit-id: 1685ee85fb1e67da2bfbc2821c89b427bb01d5d0 [formerly 0cad1fa167]
Former-commit-id: 447b1a36bb
2014-03-25 10:24:11 -05:00
Nate Jensen
eba1575cf9 Merge "Issue #2954 - Handle missing scale files at cave startup." into development
Former-commit-id: 8f104b014a [formerly e64401eedf] [formerly d11a2dd96b] [formerly 9e2a9022ae [formerly d11a2dd96b [formerly 5f8585234a010053c841f2f58a65c6885aea4940]]]
Former-commit-id: 9e2a9022ae
Former-commit-id: 57178504bc6c5c5d7cb61e70d2bca941f07ed2d2 [formerly 68298da133]
Former-commit-id: 476e4df3ff
2014-03-25 08:37:55 -05:00
Mike Duff
f2c11bd688 Issue #2954 - Handle missing scale files at cave startup.
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1

Former-commit-id: a3bf92988a [formerly 39cb0ac9e3] [formerly 372e9dc80f] [formerly 9334bc2b00 [formerly 372e9dc80f [formerly 4b7a68aeca0346f41965b98626e2c728b1a0e532]]]
Former-commit-id: 9334bc2b00
Former-commit-id: 8d4152bf8316554ef4fe24d94ae4d45059ccf75e [formerly 6de201d3f8]
Former-commit-id: fb0073c74b
2014-03-24 16:38:38 -05:00
Lee Venable
b230e78880 Issue #2951 - added dispose checks for runAsync calls.
Former-commit-id: 0198c5ff1e [formerly 4afcc659a2] [formerly f5c4414c72] [formerly c2d52987f8 [formerly f5c4414c72 [formerly c4e17780f5a3dc342b856f83a4144ff3778c4001]]]
Former-commit-id: c2d52987f8
Former-commit-id: de469ece47bd6a50ae9f194c5d5c29cdb7e661df [formerly d0ec74f4b7]
Former-commit-id: 2575b680d1
2014-03-24 16:14:49 -05:00
Nate Jensen
d915d24263 Merge "Issue #2868 plot delegate python now uses PythonCoordinatorJob API, Refactored plot data request, image creation, and sample threading" into development
Former-commit-id: 0d8f4f9894 [formerly 0fa5b14762] [formerly 5df9be36da] [formerly a47c32f4b9 [formerly 5df9be36da [formerly 78dbdcb1d98aa7fff15b3b9a9398c335cb45b923]]]
Former-commit-id: a47c32f4b9
Former-commit-id: 22a246ea5d586e8a71193286dc6d684e75f9915d [formerly 2d97ef8631]
Former-commit-id: b0616edf0e
2014-03-24 15:59:20 -05:00
Mike Duff
dd804a13ff Issue #2936 - Remove the join alert from the nws collaboration feed
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840

Former-commit-id: 0fd2a2a426 [formerly eacc161ee4] [formerly fd31ea7fa5] [formerly ca27ceac1f [formerly fd31ea7fa5 [formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]]]
Former-commit-id: ca27ceac1f
Former-commit-id: 26a0a3d7ea325414e2b4fd69c1a38bcc0d1f1c56 [formerly fc7a71889c]
Former-commit-id: 86fc8d74d5
2014-03-24 14:59:33 -05:00
Nate Jensen
df01318647 Issue #2868 plot delegate python now uses PythonCoordinatorJob API,
Refactored plot data request, image creation, and sample
              threading

Change-Id: I3e1a3dc70b2346aa826ec4509ee7a3e59c61a918

Former-commit-id: 85b411bca3 [formerly 2418c9bdfe] [formerly fe33896e7e] [formerly c4beb293b9 [formerly fe33896e7e [formerly e421731415d798487c96dd1e56b6f02347d9aa26]]]
Former-commit-id: c4beb293b9
Former-commit-id: 3d803664963a310bbf45fe46e8f20c9255a3b529 [formerly 774091461c]
Former-commit-id: 0acb4621f9
2014-03-24 14:59:31 -05:00
Lee Venable
df75b3fdf3 Issue #1426 - fixed arrow buttons and simplified the code.
Former-commit-id: ae20115f26 [formerly 75504da2bc] [formerly 702ebe6881] [formerly 4c80552979 [formerly 702ebe6881 [formerly fc55337ba9768a7b9e6ecde11f8c8ddfd32c4859]]]
Former-commit-id: 4c80552979
Former-commit-id: 62fef10759c19715b0dfa7dbcac04f2cc05c70d1 [formerly 18de63886c]
Former-commit-id: 5b0f8f631f
2014-03-24 14:08:49 -05:00
Ben Steffensmeier
26558fad1e Issue #2874 Initial implementation of RTOFS data.
Former-commit-id: 9e2e500040 [formerly 1c18e800b3] [formerly 55046a8e1e] [formerly 12ed72b0c0 [formerly 55046a8e1e [formerly 11837e612778ea7a1d42fbfac1e0e2b3d3678f1c]]]
Former-commit-id: 12ed72b0c0
Former-commit-id: 17445664d752b4ffa0186bdce951baaffefd1f21 [formerly ab8293c6a1]
Former-commit-id: aadc22091e
2014-03-24 11:10:18 -05:00
Brian.Dyke
402035e7f9 Merge branch 'master_14.1.1' into master_14.2.1
Former-commit-id: 674036b172 [formerly 50e5f4f78d] [formerly 06ee9a6384] [formerly 07b2e04d7a [formerly 06ee9a6384 [formerly 34f830b4933bd6c7149757ce34136c7a18d030bf]]]
Former-commit-id: 07b2e04d7a
Former-commit-id: 1a63c19999c01830d72a5d605c2cc1247fc3b4eb [formerly 14567f20a7]
Former-commit-id: d97b88f433
2014-03-24 07:01:29 -04:00
Lee Venable
1fb169f1ce Issue #2925 - Fixed NPE found during testing.
Former-commit-id: a700d23f6d [formerly cc7d240cfd] [formerly c29981fa99] [formerly 5b73c516d3 [formerly c29981fa99 [formerly 86306076f94bbfe4e063c4e6d82b7140b5911e61]]]
Former-commit-id: 5b73c516d3
Former-commit-id: 0052d9d30c35dc39dd69aece42fc59a0f471c58f [formerly f08d4a827f]
Former-commit-id: 05a4c4e31b
2014-03-21 12:42:13 -05:00
Brian.Dyke
49f7c81de1 OB_14.1.1-24 baseline
Former-commit-id: 8366e88db1 [formerly 37e9d48d45] [formerly 37b6368268] [formerly face1ebeeb [formerly 37b6368268 [formerly 8b1e7457fc58021208e4233502f118cf34df7534]]]
Former-commit-id: face1ebeeb
Former-commit-id: 96a438276ab6f5a4af7ac304e214e79258c0ea3d [formerly 6b2175da93]
Former-commit-id: cfa058a345
2014-03-21 12:43:50 -04:00
Lee Venable
deed3a9c06 Merge "Issue #2925 - added runAsync dispose checks." into development
Former-commit-id: 64d34ed4f9 [formerly d8f6d3eeb4] [formerly 7d4062dc66] [formerly 597fe2b674 [formerly 7d4062dc66 [formerly cb16fae6fd3cebdf1c80fc18dbc2684c27018b3d]]]
Former-commit-id: 597fe2b674
Former-commit-id: d762adb3703d6843664b354516289ef76bb2124d [formerly 88619d51a1]
Former-commit-id: b5e946dc69
2014-03-20 17:49:30 -05:00
Nate Jensen
6648b1e27d Merge "Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image." into development
Former-commit-id: 2bafcb76db [formerly 94c25f784e] [formerly 8a3c03b260] [formerly a47328b3cb [formerly 8a3c03b260 [formerly 8fddee15ee0fbe36c917b06cdf64f76c2b69fc86]]]
Former-commit-id: a47328b3cb
Former-commit-id: 8afd6cacbfee0b65da4e23a075dd05ea687d8f23 [formerly a5cf7bd6e0]
Former-commit-id: bcd700102f
2014-03-20 14:22:57 -05:00
Nate Jensen
a1b495a7e0 Merge "Issue #2791 fix NaN handling of smoothed contours." into development
Former-commit-id: 616223209c [formerly d2ad1bf3f2] [formerly f9b86f97e0] [formerly c64f0b2558 [formerly f9b86f97e0 [formerly 347b9555cfe67ee5643b92bd84afbd1e2899acd7]]]
Former-commit-id: c64f0b2558
Former-commit-id: 32458c382ac205016b72c60e7a7b4b49d5521d53 [formerly 59485dbac7]
Former-commit-id: 57907af1e8
2014-03-20 14:19:17 -05:00
Ben Steffensmeier
9d52b9ecf4 Issue #2791 fix NaN handling of smoothed contours.
Former-commit-id: 4680d9d66f [formerly b9cbe28411] [formerly 76fcfe163e] [formerly c5aac15437 [formerly 76fcfe163e [formerly a6f8a0bd2758008997555e08ea7245517535b1db]]]
Former-commit-id: c5aac15437
Former-commit-id: 0c3f9d051c5003a7a6bcdcabfe921b98bd997d74 [formerly a9ee8b9b2f]
Former-commit-id: 133767ff26
2014-03-20 13:34:52 -05:00
Ben Steffensmeier
134cd13dee Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image.
Former-commit-id: 5e7cd41675 [formerly ff0dfb0b11] [formerly 286f447a9c] [formerly 14af3282cb [formerly 286f447a9c [formerly db3ffd586611ea8692728ea0de5451cec89421b6]]]
Former-commit-id: 14af3282cb
Former-commit-id: 1b1c88088b01d2a2b0b3c1a4df9c3cfc6fbea3fb [formerly 48dac44df4]
Former-commit-id: 4fbe62066a
2014-03-20 13:31:08 -05:00
Brad Gonzales
02a20c0e37 Issue #2873 Removed 32 bit native libraries and references.
Change-Id: I52debdaa954ebb0193f64bdaadf45f26500aa40f

Former-commit-id: 25050d57f6 [formerly de508133ff] [formerly 08dde4824f] [formerly 189234f162 [formerly 08dde4824f [formerly d0108c2cb27c63c8133a7381b0d2c1bbdb89f1d6]]]
Former-commit-id: 189234f162
Former-commit-id: b1f2574d3b73438b586d2b8edcd4477283696b6d [formerly d303662a51]
Former-commit-id: 0022633626
2014-03-20 13:27:39 -05:00
Ben Steffensmeier
4d284e5780 Issue #2932 improve compatibility of pop skewT and blended resources.
Former-commit-id: 12d5339c48 [formerly 14907292da] [formerly 933b172ca0] [formerly effb0bfcd8 [formerly 933b172ca0 [formerly 49ffd67e77fef3c76f712cdf0eaa9b5e8ecff737]]]
Former-commit-id: effb0bfcd8
Former-commit-id: 181bf9e15da48dfb7597e793bcef70990b517993 [formerly ee3cb7e69a]
Former-commit-id: 99d9ba9645
2014-03-20 13:18:40 -05:00
Lee Venable
726643d800 Issue #2925 - added runAsync dispose checks.
Change-Id: I4048f4b4ae8976d93b1bee89179be527ee3139e5

Former-commit-id: b1d2e221fd [formerly 43cfdc587a] [formerly 112f7a886e] [formerly 397cb233d4 [formerly 112f7a886e [formerly 2ebffdcfca606309daa3ed587f696a95af0b094e]]]
Former-commit-id: 397cb233d4
Former-commit-id: 8bf9e4370bd960a8ee23f520ef69911e15a0ba3f [formerly 2a6f9e8a85]
Former-commit-id: 30f7cac193
2014-03-20 13:09:17 -05:00
Mike Duff
8964d6a60d Issue #2857 - Implement Redbook NCO NDM menus
Change-Id: I93e9f21e8b7e797affe1e52c7baef0217433460b

Former-commit-id: e03e5c8f45 [formerly 645e16792e] [formerly c67f9c4be2] [formerly 4ec18a8178 [formerly c67f9c4be2 [formerly 2ddd856c9297a782340dc0fb9db2a9d36048f760]]]
Former-commit-id: 4ec18a8178
Former-commit-id: e63dd7b97cdada1bb29c5901f8eaaa015a51d9ee [formerly a624cd8053]
Former-commit-id: 80855b8e08
2014-03-20 11:24:48 -05:00
Mike Duff
e5cb254e1f Issue #2856 - Implement Redbook CPC ndm menus
Change-Id: I1ef4007b9f7147a9640754aaf8846028a40d0693

Former-commit-id: 6ad3953d46 [formerly cdee2df27f] [formerly 25c8a0a8aa] [formerly 40319e5fcf [formerly 25c8a0a8aa [formerly 8d9935cbee365c4a8537da610c2aff4d95c50f40]]]
Former-commit-id: 40319e5fcf
Former-commit-id: 31a71f35a6008ebcda10116a7d783af50488d1a0 [formerly 09be0ef28d]
Former-commit-id: af9f9ba2c8
2014-03-20 11:16:35 -05:00
Nate Jensen
0dd42bbdc2 Issue #2919 fix windows error due to gempak library missing
Former-commit-id: a3220cf170 [formerly 6edec10edc] [formerly 747ac58166] [formerly 82ee3e7104 [formerly 747ac58166 [formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]]]
Former-commit-id: 82ee3e7104
Former-commit-id: 8865ef5c8523a5ad4eab9d7ab74db2f4ee390b98 [formerly 24eadadffd]
Former-commit-id: 07d2a4f40c
2014-03-20 09:38:07 -05:00
Mike Duff
22a240a919 Issue #2859 - Implement redbook MPC NDM menus
Change-Id: Ib681435386ea8e4335f5984ddbee2213633cac8e

Former-commit-id: f49bb3b30c [formerly 4be30fdc5b] [formerly 059ac9c52a] [formerly e479bd7055 [formerly 059ac9c52a [formerly 619efadc2230af13707f124534d3caf2fdfaba68]]]
Former-commit-id: e479bd7055
Former-commit-id: 9530e3b61c98479d8b44cd26d6af7c2592220ee4 [formerly bb07c57f3e]
Former-commit-id: 0b94340d7e
2014-03-19 14:40:00 -05:00
steve.naples
8d9a51770d ASM #428 Updated SATPRE file header to correct reftime.
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204

Former-commit-id: 20399400cb [formerly 64b19f2e41] [formerly d0f4df4ad9] [formerly 1aa970164f [formerly d0f4df4ad9 [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]]]
Former-commit-id: 1aa970164f
Former-commit-id: 5c8cd26c00210e720cf38e0d3c939e91ef07f9f2 [formerly 9c9ddaba6a]
Former-commit-id: 885ceb834b
2014-03-19 18:16:41 +00:00
Lee Venable
9c2583527b Merge "Issue #2433 - Implement view by priority check box menus review comments" into development
Former-commit-id: b94ed41ba2 [formerly 12aa173989] [formerly 96ea26a9a2] [formerly ab3de987b4 [formerly 96ea26a9a2 [formerly 27cb84fc6629e94927a4e80cba9586df20805b0a]]]
Former-commit-id: ab3de987b4
Former-commit-id: 8daa78433782df24239da5092047d00e8f37b314 [formerly 9784b3737e]
Former-commit-id: 4ed1e7327e
2014-03-19 08:54:39 -05:00
Nate Jensen
e6c3f1ebde Merge "Issue #2895 fixed telestration when leadership returns to a previous leader" into development
Former-commit-id: 5cabc0fae4 [formerly bc9f494604] [formerly 3ee42187e6] [formerly d44fee0588 [formerly 3ee42187e6 [formerly ad4deae1563ea5f311c3428cefb82bf156392310]]]
Former-commit-id: d44fee0588
Former-commit-id: 72132a253e2e7256f06ae4c2302a82771786c200 [formerly 99643d9545]
Former-commit-id: 116c66b685
2014-03-18 17:01:44 -05:00
Mike Duff
abdb23de45 Issue #2433 - Implement view by priority check box menus
review comments

Change-Id: I63c984c328336ebe9d6d06dbc48780051e3ea2e7

Former-commit-id: ff60e94886 [formerly 9d24291927] [formerly a7e568e799] [formerly 202a822384 [formerly a7e568e799 [formerly ca228b57089101c61f9d3f76d7edc4ba96c41b61]]]
Former-commit-id: 202a822384
Former-commit-id: ba75492450a6de73eb2eca3f12050a20d3ebb3d1 [formerly 980e398584]
Former-commit-id: b0554f903f
2014-03-18 16:42:58 -05:00
Nate Jensen
a1a8f1301d Merge "Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. Peer review comments" into development
Former-commit-id: 350786f305 [formerly 61c5a25407] [formerly 85e3ac041a] [formerly 7e7745cd7b [formerly 85e3ac041a [formerly 5e03b83061e1cd7f1a15e939c2bc98d3b99cf393]]]
Former-commit-id: 7e7745cd7b
Former-commit-id: 7e6b7e93a2aaaab43dd435634d25d8d512cd812b [formerly 3e32812f13]
Former-commit-id: e3bc322d49
2014-03-18 13:13:53 -05:00
Nate Jensen
52e60a68a9 Issue #2895 fixed telestration when leadership returns to a previous
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: 1447abe995 [formerly 68b60eba47] [formerly e75d3dfb7c] [formerly 2fc1030fad [formerly e75d3dfb7c [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]]
Former-commit-id: 2fc1030fad
Former-commit-id: 389d920f6cf85e74cfa2b1864b84d9f952b0b23a [formerly ca1ec93450]
Former-commit-id: 8589374171
2014-03-18 12:52:01 -05:00
Nate Jensen
0eb6080598 Merge "Issue #2798 - Fix issue with color not changing for existing user changing site." into development
Former-commit-id: 5cc3fd4451 [formerly b5f2064207] [formerly 5f79ece006] [formerly e9be36b08c [formerly 5f79ece006 [formerly 1c87269eac595b61cc54c1e39ec8624ba55fd6d8]]]
Former-commit-id: e9be36b08c
Former-commit-id: fb49f6167522402ef7ee3b3b6d33a4fef770eb46 [formerly a4728542c5]
Former-commit-id: 8ebc031a07
2014-03-18 12:38:48 -05:00