David Gillingham
|
d918c5e1fa
|
Issue #2476: Fix indent error in SmartScript._getGridsResult().
Change-Id: I625d9f0c6c47d51b0ec99bcdb1d8dadeeaddfe67
Former-commit-id: 7c39d4e45b [formerly 3df38a8d41] [formerly e1df69e312] [formerly 7c39d4e45b [formerly 3df38a8d41] [formerly e1df69e312] [formerly 0e74638eb2 [formerly e1df69e312 [formerly 9e190cf63a11fa641a60f13f8f93baec649d4893]]]]
Former-commit-id: 0e74638eb2
Former-commit-id: 2cd30bab98 [formerly 1ed80f471c] [formerly 90a0e1bc7e0ea65d26c6784350bcc46d6a2824c9 [formerly d0b188d577]]
Former-commit-id: 253f6827d6bd7e24ee2c90bede0d9493ee7db128 [formerly 50f9ad420b]
Former-commit-id: be9ed341f5
|
2013-11-07 11:36:49 -06:00 |
|
Nate Jensen
|
723a53858c
|
Merge "Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common" into development
Former-commit-id: 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 767bed3f13 [formerly b01d5b16e0] [formerly f5feb9330f] [formerly 38a5ae5e5f [formerly f5feb9330f [formerly 3f1ac5ed48b694da9dc1cd0067db9e584d4520e1]]]]
Former-commit-id: 38a5ae5e5f
Former-commit-id: 794d57fe7b [formerly c27c435cea] [formerly 6bfd1d4e327eb46835ec16594b542ffb4c74bf7e [formerly 1b7ac545f8]]
Former-commit-id: ac8b2a6231c9af1c1a85121d551f6695b476f896 [formerly acec588299]
Former-commit-id: acccf2c827
|
2013-11-07 10:21:42 -06:00 |
|
Nate Jensen
|
dcbee2bb80
|
Merge "Issue #2493 remove mesowest." into development
Former-commit-id: 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 6320f7f03c [formerly 7c0d9a7df8] [formerly 0f4ba6f90e] [formerly 1da0e31b88 [formerly 0f4ba6f90e [formerly 2c506552014e60344c5b2014bed32edab2630f47]]]]
Former-commit-id: 1da0e31b88
Former-commit-id: d2bb313a16 [formerly 048d52722f] [formerly 60a2289740b7f6e8da01f653e591eb2ce94a6c58 [formerly aef895c447]]
Former-commit-id: 5e1c394f1e0afad2bb68c0406f91df8e82544280 [formerly 0ae0e070c9]
Former-commit-id: f9be4065ec
|
2013-11-06 17:07:10 -06:00 |
|
Lee Venable
|
51842a1676
|
Merge "Issue #2358 - Move config file management code to the subscription manager dialog." into development
Former-commit-id: 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 6392968c7e [formerly 326e4e31a7] [formerly 8585080cd1] [formerly 20726d4e7c [formerly 8585080cd1 [formerly 13672783e6a5e452cb4105669a98708329b35541]]]]
Former-commit-id: 20726d4e7c
Former-commit-id: a6557a089e [formerly 9a8a813cf8] [formerly 907b407668322fa5a6d3d3f60d0cc9f6969d6ada [formerly 0c4566c411]]
Former-commit-id: 17cb4eac030cecf14dfda06979b1f5d64d077baf [formerly 5627ef0cc8]
Former-commit-id: 3cc206a34f
|
2013-11-06 15:42:40 -06:00 |
|
Max Schenkelberg
|
fe791cc7f7
|
Issue #2492 Implemented support for colormapping in different units than the data comes in as. Other changes include NPE fix in RecordTileSetRenderable, glsl cleanup to use structs for code sharing, a topo display fix, and moved viirs colormaps to common
Amend: Fixed precision issue with float comparison, made factory better synchronized.
Change-Id: Ie72d8d26ca5dc5ee1a0b5c14ca726edbee3bc1a2
Former-commit-id: 3af5098e1b [formerly d7c8b8f662] [formerly 3369fbec2d] [formerly 3af5098e1b [formerly d7c8b8f662] [formerly 3369fbec2d] [formerly c28fd2b38d [formerly 3369fbec2d [formerly ae724ecce3d4c65f8845f3278f9b5eeb5b04908a]]]]
Former-commit-id: c28fd2b38d
Former-commit-id: f88d913d31 [formerly e4b7f3618c] [formerly aa835a1580556a0e2e44448d20c96e5e1b78baed [formerly d53db3ddb6]]
Former-commit-id: 2e6b0a3f93931cd0f795d381bd6ddbc9268e4f25 [formerly 751b8f2315]
Former-commit-id: 53363b9bf7
|
2013-11-06 15:07:18 -06:00 |
|
Ben Steffensmeier
|
235cea183a
|
Issue #2493 remove mesowest.
Former-commit-id: c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly c40ec16df3 [formerly f761c701cf] [formerly d0b7966458] [formerly 36916fedcd [formerly d0b7966458 [formerly 9a2fe6fa13d424c254b4ed071b743837dfb2e702]]]]
Former-commit-id: 36916fedcd
Former-commit-id: 726d1728fd [formerly 5d31aad5c2] [formerly 80b4ead107b43174bee5092e0af3bc24e421205f [formerly baebe37ba6]]
Former-commit-id: 855d5e9d4e64a0a70aaec8f5743dc44310b552bb [formerly afe014af99]
Former-commit-id: 925d8bca38
|
2013-11-06 13:42:38 -06:00 |
|
Slav Korolev
|
67bcc06687
|
Issue #2486. Fixed an error of editing subset box. Corrected the regions and zoom handling defects.
Former-commit-id: ff13287f05 [formerly cc90a7af4b] [formerly 076865bb61] [formerly ff13287f05 [formerly cc90a7af4b] [formerly 076865bb61] [formerly c25204d75b [formerly 076865bb61 [formerly 04a119deb8248366e9efe9b5ac19c76e60a925e2]]]]
Former-commit-id: c25204d75b
Former-commit-id: 5cd1d585b1 [formerly 8fbf625667] [formerly 2d965e7d5b9ce80b4a1638b7546c6d8d63a4d209 [formerly 3223cd19cd]]
Former-commit-id: 101603d2c5fe98d981f819cb5aec1f27534314e0 [formerly b8ebc9ac63]
Former-commit-id: a2e60dbe60
|
2013-11-06 14:38:55 -05:00 |
|
Mike Duff
|
0280c05aa7
|
Issue #2358 - Move config file management code to the subscription manager dialog.
Change-Id: I61b8093b1306404006c5d01b73874997054c4f2f
Former-commit-id: e8a14d975d [formerly 65f9da04a9] [formerly e1180868e7] [formerly e8a14d975d [formerly 65f9da04a9] [formerly e1180868e7] [formerly 35c4911e7e [formerly e1180868e7 [formerly 100fe3e61e5156dba32419005da4473bcd6d1e8b]]]]
Former-commit-id: 35c4911e7e
Former-commit-id: 89c7970f8b [formerly e1b9c9daa8] [formerly 046ac466943d54b80185d43c7b3cbf79bd485473 [formerly 7e28ffcaad]]
Former-commit-id: 61abd603abd41c6ab9bfa16115d3995c7257e435 [formerly 39dda9d18c]
Former-commit-id: 4cede401ec
|
2013-11-06 12:00:04 -06:00 |
|
Ben Steffensmeier
|
74a25404a0
|
Issue #2485 Remove ncccfp
Change-Id: Ida05b2c7e1a3541603822b8b91bb635f9af3fa64
Former-commit-id: 3273b6fc5f [formerly 4639cd69f4] [formerly 5b53cb4c98] [formerly 3273b6fc5f [formerly 4639cd69f4] [formerly 5b53cb4c98] [formerly 1d35086e8d [formerly 5b53cb4c98 [formerly 619f054e44fe9689d178e9aa6fd6455915d7e99e]]]]
Former-commit-id: 1d35086e8d
Former-commit-id: 41a54ad666 [formerly b64221f27b] [formerly 5548cad8f6d7873bdd2beafefec42e2d00821e99 [formerly 8aefe5ff02]]
Former-commit-id: ba475ead914b07016d89a22aaa936b7307336535 [formerly a97ec9b8e5]
Former-commit-id: 5cf9a6ed01
|
2013-11-05 17:33:41 -06:00 |
|
Nate Jensen
|
ec5482009d
|
Issue #2361 remove ISerializableObject from redbook and hydro
Change-Id: Ib48dea5d734f19a9919da9fea752b5e0f38a2141
Former-commit-id: 16074e6a14 [formerly 27f09b8096] [formerly 6064000389] [formerly 16074e6a14 [formerly 27f09b8096] [formerly 6064000389] [formerly b36d28c9fd [formerly 6064000389 [formerly 2626a79c976ac016352a091bdf66890e929edc85]]]]
Former-commit-id: b36d28c9fd
Former-commit-id: 3cfb49215f [formerly 5d2ec98600] [formerly e86e430428d15356370e7a0929a62a10de34aaa1 [formerly 3e3400dc7c]]
Former-commit-id: 2c3aadd73710a197c7d25f5c10c535419d7755b1 [formerly 27b1f123f0]
Former-commit-id: f15331607d
|
2013-11-04 14:30:00 -06:00 |
|
Ben Steffensmeier
|
4dfe17eca2
|
Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: c91c0d3f1a [formerly d386c6bc76] [formerly ff5f08d23a] [formerly c91c0d3f1a [formerly d386c6bc76] [formerly ff5f08d23a] [formerly 5a928e6ad5 [formerly ff5f08d23a [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]]]]
Former-commit-id: 5a928e6ad5
Former-commit-id: dd2bb59742 [formerly d38879158d] [formerly c694721b6dae8a56fdf9390a3bc7d8934e8b3711 [formerly 08e73de883]]
Former-commit-id: 6bf4ce1b85d10c2151244620ecdee96d3fb2244e [formerly a0f4c08cfd]
Former-commit-id: dacf863d66
|
2013-11-04 13:01:49 -06:00 |
|
Lee Venable
|
df31e0e089
|
Merge "Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler." into development
Former-commit-id: 04c2b7d6a8 [formerly bfc83fa74e] [formerly 0b3346d699] [formerly 04c2b7d6a8 [formerly bfc83fa74e] [formerly 0b3346d699] [formerly 3e7b7cec8f [formerly 0b3346d699 [formerly 325439c2d4243f775d3ccb8af7f332bf13d4aad0]]]]
Former-commit-id: 3e7b7cec8f
Former-commit-id: 07e89ee05d [formerly c7d03bf267] [formerly 608f6b9d8262abfc44e2d399f8c52580ba4437af [formerly f6f1b16c0c]]
Former-commit-id: 0c17348ed817ee9581a108ac2cd15b5da9890b49 [formerly 52da34fc55]
Former-commit-id: ade7b14670
|
2013-11-02 10:43:48 -05:00 |
|
Slav Korolev
|
ca6efe6484
|
Issue #2431. Changed labels on the table.
Former-commit-id: 858b167938 [formerly 8874f76878] [formerly dd1ff63737] [formerly 858b167938 [formerly 8874f76878] [formerly dd1ff63737] [formerly 0801f8dedd [formerly dd1ff63737 [formerly 5599d13b9cbac3806c636b629d502aacc1f621b4]]]]
Former-commit-id: 0801f8dedd
Former-commit-id: 4b225552e2 [formerly 6b3481ca26] [formerly 77ecd7c42b3304b4ff77b15d1213ecb427f5661a [formerly 7d0198b356]]
Former-commit-id: 5146d816bee2418137c01850b925e11cdce09d47 [formerly f8e429a1b9]
Former-commit-id: e4a2b6d619
|
2013-11-01 15:06:19 -04:00 |
|
Ron Anderson
|
a9c8950fe6
|
Merge "Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product." into development
Former-commit-id: 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly 5e4227410c [formerly a15c620fc8] [formerly 9e9dd04bfd] [formerly cc991ed528 [formerly 9e9dd04bfd [formerly 6346ae61d0639325fa199db525f4e34402b39224]]]]
Former-commit-id: cc991ed528
Former-commit-id: a0f67a006f [formerly f453d92818] [formerly c1140f67ed8f586264c71a61de18f87988cedd70 [formerly deb89a88f5]]
Former-commit-id: b4e8d1a865f6177e1d0672dcd506844aafc34864 [formerly 84adff8e96]
Former-commit-id: 638b57e188
|
2013-11-01 11:07:39 -05:00 |
|
Slav Korolev
|
50d1a73c83
|
Issue #2486. Fixed an error of editing subset box. Corrected mouse wheel handler.
Former-commit-id: 2487e015b9 [formerly feb9d8db5a] [formerly 7ca47690af] [formerly 2487e015b9 [formerly feb9d8db5a] [formerly 7ca47690af] [formerly f7d1939b36 [formerly 7ca47690af [formerly 7d16b7dd07d83975366505140d7a8df2c5c89cf2]]]]
Former-commit-id: f7d1939b36
Former-commit-id: 9c8b7d1e96 [formerly fcbe5d09da] [formerly 3a1615d06dc67187bd2ec2e01aff550ea0b6e6b1 [formerly 386db59985]]
Former-commit-id: f9f5e3df75e6feba297093a0bd714b22f8fc7384 [formerly 57fc9a2183]
Former-commit-id: 884ca2167c
|
2013-11-01 11:03:06 -04:00 |
|
Nate Jensen
|
3efcc68e75
|
Merge "Issue #2491 Fix collaboration Xml." into development
Former-commit-id: caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly caa08095d8 [formerly b986638bc5] [formerly 43b2f50a0a] [formerly 0270e6bde3 [formerly 43b2f50a0a [formerly 311f84bcd1e10f9fd52df836673c9bb6012ee8a0]]]]
Former-commit-id: 0270e6bde3
Former-commit-id: 685c6034b2 [formerly 6ed6df6ed0] [formerly 1d11102b6e40b4f27646f1cf7aba32281be912e3 [formerly 47fc100053]]
Former-commit-id: 3b5342860c273add5e1cf001ce17db765d7f54d6 [formerly 6164feb2da]
Former-commit-id: 3858434dc3
|
2013-10-31 18:11:13 -05:00 |
|
David Gillingham
|
dc6a531641
|
Issue #1843: Ensure user-selected ETN makes it back into the final transmitted product.
Change-Id: Id5aede1ba07019150b3a43b45f067a5740d657af
Former-commit-id: 320ef0eb71 [formerly f404f1560c] [formerly 6e1cca2966] [formerly 320ef0eb71 [formerly f404f1560c] [formerly 6e1cca2966] [formerly c4f5cc53bb [formerly 6e1cca2966 [formerly 194799b7d3fb719987523a77ba9b3c69a11bb69f]]]]
Former-commit-id: c4f5cc53bb
Former-commit-id: 82721bfe07 [formerly 3776f258a3] [formerly 345b0c83f25f83ef27ba6cbf8e70827c774b053d [formerly 3bac577a31]]
Former-commit-id: 5b6106d6a9109e95e2fa9e2742d6f3022a33ac54 [formerly 5df42898ad]
Former-commit-id: 4862c1d171
|
2013-10-31 14:07:20 -05:00 |
|
Ben Steffensmeier
|
a15afe6f6c
|
Issue #2491 Fix collaboration Xml.
Former-commit-id: 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly 0bcf7f77c0 [formerly a5f970e238] [formerly 3d36cec7be] [formerly fdeff81da2 [formerly 3d36cec7be [formerly 64517ab3139be3cc21d5df7ff9d36709435bd7cd]]]]
Former-commit-id: fdeff81da2
Former-commit-id: d27369f59b [formerly 89c999410e] [formerly 6d36de8b83b8bd6d75e28507dfdb4314d2a89f81 [formerly 49ffb7e92c]]
Former-commit-id: 8474d807f157d7a0e7fc99090b358e9a371bb8fe [formerly a0e805ded6]
Former-commit-id: a92af46f59
|
2013-10-31 14:06:37 -05:00 |
|
Ron Anderson
|
2b4809ead7
|
Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()
Change-Id: I5d47498c2056de1c217927102770092bb57a372c
Former-commit-id: f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly f0529e0eee [formerly b61ccc1609] [formerly 38e33092a2] [formerly 42e924e021 [formerly 38e33092a2 [formerly 19246ae601e292bd26ba8ba6b9446ef8d82ee663]]]]
Former-commit-id: 42e924e021
Former-commit-id: dd1b50d116 [formerly 2f23072e41] [formerly e573e83de25a263065e03ab739ab5d58c0ca7fb1 [formerly eef9d2dfb0]]
Former-commit-id: 6420457c498cf2f6184538b3831ba133f0623c15 [formerly e3a0440825]
Former-commit-id: 49ea9c0444
|
2013-10-31 14:04:55 -05:00 |
|
Nate Jensen
|
b7c11ac174
|
Merge "Issue #2491 Bug fixes and clean up all remaining resource datas. Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6" into development
Former-commit-id: 7648e116ad [formerly b17891ba0e] [formerly ccf3d5b1e9] [formerly 7648e116ad [formerly b17891ba0e] [formerly ccf3d5b1e9] [formerly de50a9214b [formerly ccf3d5b1e9 [formerly fc3adf193a8afacfec4c36feae4a3f1384119922]]]]
Former-commit-id: de50a9214b
Former-commit-id: 2aa3471a8a [formerly c9d9070600] [formerly c89ecfda3d23b19bae8caa3e9277339aa3c12a03 [formerly d6fcc98e76]]
Former-commit-id: ae9c745301a10896244f2d9c9846983381ddd2ac [formerly c24d8c63cd]
Former-commit-id: 3c1f343be5
|
2013-10-31 12:24:23 -05:00 |
|
Richard Peter
|
2baf599758
|
Merge "Issue #2292 - refactor and move overlap/duplicate checks to edex. Peer review comments" into development
Former-commit-id: 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly 2b9cf07bfe [formerly 5048d010f5] [formerly 3139055873] [formerly b482eb2b48 [formerly 3139055873 [formerly 1f07e88f442c0426a9006a2f139d6eef9395ad51]]]]
Former-commit-id: b482eb2b48
Former-commit-id: 7b0ad6bacc [formerly fca3d73aa7] [formerly f7dbb5f3661236898b603e2fdf7604e44f42274a [formerly 73462fa134]]
Former-commit-id: 1019515624c081b6c221e0d3722489ce94b4ad06 [formerly 300f907c46]
Former-commit-id: ab890140fb
|
2013-10-31 11:46:25 -05:00 |
|
Mike Duff
|
e48beadbc6
|
Issue #2292 - refactor and move overlap/duplicate checks to edex.
Peer review comments
Change-Id: I33df9cc7e368778943e25420d18b343781304c7a
Former-commit-id: fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly fbcf271899 [formerly c1bd170f8a] [formerly f123fa11f5] [formerly 3fc811102e [formerly f123fa11f5 [formerly f7405c2acfef95b57b79cf6d8ac3348017e64a59]]]]
Former-commit-id: 3fc811102e
Former-commit-id: ce2afdf1b3 [formerly b0c54d7c17] [formerly ac9b1be9e56f34d03174be87fbb48c2a6a187cdc [formerly 4da0648461]]
Former-commit-id: ece01cf9cf7d6b3d925c922f4d1d6fe84edf0f17 [formerly 26ca1b4d72]
Former-commit-id: 5ff3fe2791
|
2013-10-31 09:22:50 -05:00 |
|
David Gillingham
|
c7e966b43e
|
Issue #1843: Return status back to client when contacting one of the
configured ETN partners fails.
Change-Id: I5bd49f6930c317ba21725ff53f6ab65d548f037c
Former-commit-id: ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly ab3b629a6b [formerly c58160c9a9] [formerly 297fd6c3d4] [formerly b7b29a1fdb [formerly 297fd6c3d4 [formerly 18a09da6aba3caf83f4c4df71f2fcffb63043fb1]]]]
Former-commit-id: b7b29a1fdb
Former-commit-id: 2ddacaea30 [formerly 68b0b2e3db] [formerly 0f0aefb2c1b9d5dfbee8cd33020b863e61f2b01f [formerly 996817f124]]
Former-commit-id: 88b3c16c68fc66755ed20e6b4157548ca26d3124 [formerly eef2c93d6c]
Former-commit-id: 75acd532a1
|
2013-10-30 11:34:46 -05:00 |
|
Ben Steffensmeier
|
e193ba7f0f
|
Issue #2491 Bug fixes and clean up all remaining resource datas.
Change-Id: I6cb8948a984f298d938e1b6baa9bf4af5fe6d4c6
Former-commit-id: a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly a4cbc8020a [formerly e15fecc459] [formerly 5b395f7417] [formerly 27a392f90e [formerly 5b395f7417 [formerly 2412d6f094f98a8c24491ab43a2a88cf696758af]]]]
Former-commit-id: 27a392f90e
Former-commit-id: 8ec09e8f61 [formerly 78efdb7572] [formerly 08cc956d9a9abcf58a33328430ea1253b6f6e00d [formerly 418c259567]]
Former-commit-id: a33b0178c5a7309ae9c12ac4f7b2267997da8f07 [formerly 9d87eb50e2]
Former-commit-id: 02b9133d50
|
2013-10-29 17:35:55 -05:00 |
|
Nate Jensen
|
89b3b81ab3
|
Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code
Former-commit-id: a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly a18df07586 [formerly 554a9cddf3] [formerly f3143ba7b4] [formerly 6880a18f1a [formerly f3143ba7b4 [formerly 0c24c900ce938982306bad9307f3b1ef27b362bb]]]]
Former-commit-id: 6880a18f1a
Former-commit-id: dced4c4d11 [formerly 19043faeaa] [formerly df19f622b8df95f3d1447cd1c6c599d088ba4b1c [formerly f2751f017e]]
Former-commit-id: 15fd50423e5c76bf2d7d7f54653759492ef97c8d [formerly e8c199f108]
Former-commit-id: f2184b9379
|
2013-10-29 14:33:53 -05:00 |
|
Mike Duff
|
589da45d3f
|
Issue #2430 - Implement the percent used bandwidth utilization graph.
Change-Id: Iad1d750ec1bb0a66a833f8358e27a80d0d6b42c5
Former-commit-id: cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly cff7e321f0 [formerly 2d7c38290e] [formerly 6d5f697300] [formerly 25e4a4741c [formerly 6d5f697300 [formerly 5b628ac782fc8b76729c74fe8bf995a7fc634aaa]]]]
Former-commit-id: 25e4a4741c
Former-commit-id: 3f502364c9 [formerly 4beb79d5a7] [formerly 1328f5fc6ad281525c7abd057dcd30572f31ff3d [formerly 73ecb9af6b]]
Former-commit-id: ae4c63d618c1eb58242c2ffdaf294d319749571c [formerly 2c7dbda379]
Former-commit-id: 26941f1033
|
2013-10-29 13:49:47 -05:00 |
|
Ben Steffensmeier
|
9c4692235f
|
Issue #2491 Move ncep bundles off od SerializationUtil.
Former-commit-id: ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly ca73be2ecb [formerly 9c62c3bae2] [formerly a4174430f7] [formerly 204b47c67d [formerly a4174430f7 [formerly ddaa8e9ded31fb0676f949d5a98a30ad1709a25b]]]]
Former-commit-id: 204b47c67d
Former-commit-id: 7e0cb095c2 [formerly 09347cdd5a] [formerly 479b38fd22c3992c7e8afaec4ff032e7fa45f9d9 [formerly 9540b309b3]]
Former-commit-id: 4bf44aa82f7b082680aa650f926af4dfec1c5040 [formerly fd931a3e64]
Former-commit-id: c57dc46dfc
|
2013-10-29 12:28:07 -05:00 |
|
Nate Jensen
|
553475c0a2
|
Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly f62f7dc851 [formerly ac65672cb2 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]]]
Former-commit-id: f62f7dc851
Former-commit-id: 7ac7a7ce3d [formerly 9dc4378fc4] [formerly 236fe4b18811523bce5e5090bd5f361fa56869a5 [formerly 87917f3548]]
Former-commit-id: 0e9c2c54cf24b0469949784c3ccb934967d72820 [formerly 98118ccced]
Former-commit-id: b2072949f9
|
2013-10-28 13:27:17 -05:00 |
|
Ben Steffensmeier
|
d74e82bcc5
|
Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07
Former-commit-id: 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 5b439696df [formerly 65522e83c9 [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]]]
Former-commit-id: 5b439696df
Former-commit-id: 285a0af019 [formerly 54a39977f5] [formerly ae5d9cd5f9d93524f8b356e1b865d0b7966eab25 [formerly 6866344496]]
Former-commit-id: a70f5f2f9ec94543623b1366018f66b21d4873b5 [formerly e3e621660f]
Former-commit-id: c0ba7d0acc
|
2013-10-28 13:16:23 -05:00 |
|
Ron Anderson
|
b0f0709755
|
Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 306a5d72f4 [formerly 3575496955] [formerly 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1]]
Former-commit-id: 53c38fe54d2869c9707556e4244b69af6f55a908 [formerly 1daa0f8649]
Former-commit-id: 643624f1a9
|
2013-10-28 12:59:44 -05:00 |
|
Ben Steffensmeier
|
5ac77f7f76
|
Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]]
Former-commit-id: 44a6f05986
Former-commit-id: 2400380daf [formerly 0e3cf8b47f] [formerly 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]]
Former-commit-id: d4c767bc5d9a92f47044beb03900b35fdf1a24a2 [formerly 0c3bb6ef3e]
Former-commit-id: 47d3fb8249
|
2013-10-28 10:14:08 -05:00 |
|
Nate Jensen
|
7068ef91de
|
Merge "Issue #2491 fix d2d xy bundles." into development
Former-commit-id: 3843a2fe2d [formerly b8d194e4cd] [formerly ca2e057635] [formerly 3843a2fe2d [formerly b8d194e4cd] [formerly ca2e057635] [formerly cda57ce742 [formerly ca2e057635 [formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]]]
Former-commit-id: cda57ce742
Former-commit-id: 91c89ad6e6 [formerly 4938d287fe] [formerly e024ea40dde60c244a0a5d34215ef2a3de55bd6d [formerly fad56e0c5f]]
Former-commit-id: 2afabcbb665bf52059f4323b46d5d543310c7c5f [formerly b48d5d53c3]
Former-commit-id: 5d8c27a87a
|
2013-10-28 09:31:28 -05:00 |
|
Nate Jensen
|
f76f5e9257
|
Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: fa1bd6b2a4 [formerly 8aa02150c4] [formerly ca27ae050bf35e88c84ec39cb3554276213a3fe7 [formerly aa0e2ca80a]]
Former-commit-id: 0b16e90747665fb5bad2de4fb36673726f33e59a [formerly 2741cb4348]
Former-commit-id: 8feeb6be16
|
2013-10-28 09:07:04 -05:00 |
|
Nate Jensen
|
14125ffbc6
|
Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly 15fbcd6984 [formerly 5840b34e67 [formerly 9d43ad381967fff847f33025461a31bb31816819]]]]
Former-commit-id: 15fbcd6984
Former-commit-id: a2bf6fb3fb [formerly e46c285eed] [formerly a46bb24ed422dbd3fd41b66e023bd7c2d4fc36e7 [formerly 68a8dbe064]]
Former-commit-id: 574be25a0b8cf316624f8a62bcea2d308e351fac [formerly 6dcd593f32]
Former-commit-id: 80e84760aa
|
2013-10-28 09:05:01 -05:00 |
|
Ben Steffensmeier
|
20d9922f17
|
Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: 694511af94 [formerly 4eea088717] [formerly ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456]]
Former-commit-id: 122ec98ee5a18fcf8773f9c00abd54bcb37bbc42 [formerly 5645da0b45]
Former-commit-id: ddd58aa99c
|
2013-10-25 15:50:10 -05:00 |
|
Ben Steffensmeier
|
a81a780533
|
Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: 54130af4c9 [formerly a629f974a5] [formerly 88ad284e71] [formerly 54130af4c9 [formerly a629f974a5] [formerly 88ad284e71] [formerly 3150d960e8 [formerly 88ad284e71 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]]
Former-commit-id: 3150d960e8
Former-commit-id: 13829ffd04 [formerly 237d947086] [formerly a38be6aaa816c5c84d60730b77824580d18d9898 [formerly 4311d8ea4c]]
Former-commit-id: d023f86bfbb89cb22f672fa575f06062ce7c63be [formerly 39768a50c1]
Former-commit-id: 5e0fc1b98a
|
2013-10-25 15:42:53 -05:00 |
|
Ben Steffensmeier
|
fed726dd48
|
Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly cac1f07cbb [formerly c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]]
Former-commit-id: cac1f07cbb
Former-commit-id: e03a1c1202 [formerly ce9653ab15] [formerly cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9 [formerly a06bdc56d6]]
Former-commit-id: 65760735e4213dff6ee5ff8730b9a56f136c8d54 [formerly 3955ac729f]
Former-commit-id: 7f38aac48c
|
2013-10-25 15:31:39 -05:00 |
|
Ben Steffensmeier
|
91e76a843a
|
Issue #2491 fix d2d xy bundles.
Former-commit-id: bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly 86ba5b9f09 [formerly 5b6e32f47e [formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]]]
Former-commit-id: 86ba5b9f09
Former-commit-id: ed7e75b748 [formerly 8248ea2b3b] [formerly abfcb4c0128db0fe3c621473959c887bb4552882 [formerly ddf45e1cf4]]
Former-commit-id: 3ccecf75b62e442a4753a4c621bced1a16209986 [formerly 7272087374]
Former-commit-id: 0fd0580788
|
2013-10-25 14:46:43 -05:00 |
|
Nate Jensen
|
e95a9d9144
|
Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]]
Former-commit-id: 5a99163569
Former-commit-id: 264555b5d7 [formerly b511177fa1] [formerly 4719aa1e26e1f8f1e10b15401b23c42814a2069f [formerly cf63b37257]]
Former-commit-id: aa9fcf1acc90fd6b11cfb0a4d5eca4720d7a4f65 [formerly c4161d09ba]
Former-commit-id: 213478f84b
|
2013-10-24 20:02:18 -05:00 |
|
Nate Jensen
|
b9dcdb5c57
|
Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
Former-commit-id: c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly b1244552e4 [formerly b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]]
Former-commit-id: b1244552e4
Former-commit-id: e6e0942d70 [formerly 3a1856b168] [formerly 7e842a91bf165a8db2e89fabd3906c256ec6db0e [formerly 803c9a8217]]
Former-commit-id: 644254ee88425258cfd9ef4563cdae5a400c8634 [formerly 9b582b0d83]
Former-commit-id: 9dc852ba9c
|
2013-10-24 19:52:13 -05:00 |
|
Dave Hladky
|
dbdd2b4b2a
|
Issue #2484 Added originatingSite to id for Subscription registry objects.
Former-commit-id: 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 36d7c60914 [formerly 3c33f6e5ea [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]]]
Former-commit-id: 36d7c60914
Former-commit-id: e44f20606e [formerly db33e9cafa] [formerly 84058224c1b44f8002df97e875e14dd66e8446ce [formerly 2b5ffeab74]]
Former-commit-id: a1a65c2049f48990c7a3dd437ec75aeb77d12bc8 [formerly 916f035c87]
Former-commit-id: 7f8ff13d44
|
2013-10-24 13:52:45 -05:00 |
|
Ben Steffensmeier
|
a14d315ae5
|
Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b
Former-commit-id: f98448d19f [formerly a935ffadf7] [formerly bfc3faf08f] [formerly f98448d19f [formerly a935ffadf7] [formerly bfc3faf08f] [formerly fa0a0619bc [formerly bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 3b4ae67ded [formerly 09a3276d51] [formerly 0c6ad2e7a6ad44d264169d56b0486e1f819a8499 [formerly d927e6b2d7]]
Former-commit-id: af4e8832b224839d1a54437070e9f5572038a410 [formerly 5971562d1a]
Former-commit-id: d1d057ae57
|
2013-10-24 11:28:06 -05:00 |
|
Richard Peter
|
776b6ac204
|
Merge "Issue #2446 Added cluster lock and check for purgeable data to publish." into development
Former-commit-id: ddcfb3785f [formerly 32131b3b27] [formerly 2220ce9aa3] [formerly ddcfb3785f [formerly 32131b3b27] [formerly 2220ce9aa3] [formerly b5072746fe [formerly 2220ce9aa3 [formerly d41377864a0a20fa6e09f6a035e33402b0d79c16]]]]
Former-commit-id: b5072746fe
Former-commit-id: ca392195cb [formerly feb1655ae3] [formerly c433dcb03f3a6c8f1b7988a97befddc483c4253f [formerly f71d65d257]]
Former-commit-id: cb8cd359a1c87b2bc7f5d6308e30c68d34e6a1aa [formerly ea9b5e6c4a]
Former-commit-id: 25e3b7e114
|
2013-10-23 16:57:28 -05:00 |
|
Ron Anderson
|
7a6209b7a5
|
Issue #2446 Added cluster lock and check for purgeable data to publish.
Change-Id: Ib54c1f917251eb59920254682b1c707b7fdca089
Former-commit-id: 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly cc28fca175 [formerly 002bb6ab89 [formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]]]]
Former-commit-id: cc28fca175
Former-commit-id: 88f6e5d9d7 [formerly 0d9df14596] [formerly 4b9ce7666378daf235ca6c2275644a5d5cc7407a [formerly 20fcbd322e]]
Former-commit-id: bf7072abec62c42c21107a8d66df0a85d338f36d [formerly b9c5d96961]
Former-commit-id: ee845f3634
|
2013-10-23 16:02:40 -05:00 |
|
Nate Jensen
|
360066e5b8
|
Issue #2361 remove dependencies on mesowest and delete dead grichardson code
Former-commit-id: bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]]
Former-commit-id: 2f79b34a77
Former-commit-id: d2af0d52a6 [formerly 2419a99ac7] [formerly a01d69eb125667dc0511591658732e612649a73e [formerly 1adac8829f]]
Former-commit-id: a2aea41bda81ba451fdb55f8030f7d56d6699493 [formerly c9cdcc056a]
Former-commit-id: 41dab56b49
|
2013-10-23 14:52:29 -05:00 |
|
Brad Gonzales
|
17fe979698
|
Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler.
Amend: Also applied old patch to fix tool tips on message bar.
Change-Id: I2f83bbd07be9cb07d51c23a7e068144692f44771
Former-commit-id: 3a450cd3c0 [formerly df1e60b078] [formerly 60d7a13afd] [formerly 3a450cd3c0 [formerly df1e60b078] [formerly 60d7a13afd] [formerly e3883dba15 [formerly 60d7a13afd [formerly 3abca4ca950facaaa5a29cf2aaa6fccdcf469e95]]]]
Former-commit-id: e3883dba15
Former-commit-id: a6b82470eb [formerly 086dfe9ebc] [formerly 626bc6ac4ce722cbc6c9e2cd43b6ed575ca56112 [formerly b8cd1d5446]]
Former-commit-id: 1ca501591be07777618ac2ea857a9cccc4228ac9 [formerly 5b5bb8975d]
Former-commit-id: f71babda9a
|
2013-10-23 14:13:03 -05:00 |
|
Lee Venable
|
2bf50b46b9
|
Issue #2483 - Fixed image memory leak.
Former-commit-id: 1a52e2b388 [formerly 73caae724c] [formerly a2f75e547d] [formerly 1a52e2b388 [formerly 73caae724c] [formerly a2f75e547d] [formerly 3d6547d644 [formerly a2f75e547d [formerly b590a1d5799a94068fe9e444e40bb3819d596071]]]]
Former-commit-id: 3d6547d644
Former-commit-id: 0d399cc52a [formerly 25c7bd679f] [formerly 3d39b70d995dcfb7c2529bb9b72c3ce4df1b010c [formerly 74603afd97]]
Former-commit-id: f5083a1cd8fdfc81b02738eb21c687f754459c86 [formerly 8f1956da81]
Former-commit-id: ce35925120
|
2013-10-23 08:26:49 -05:00 |
|
Nate Jensen
|
a30f43298f
|
Merge "Issue #2361 undo loading maps at startup" into development
Former-commit-id: d936dc839d [formerly 0e5ea7744e] [formerly ced02a508a] [formerly d936dc839d [formerly 0e5ea7744e] [formerly ced02a508a] [formerly 88ca2a78de [formerly ced02a508a [formerly 9e3b9ba67aafbcb0bfe7de147d00c44aa37403ac]]]]
Former-commit-id: 88ca2a78de
Former-commit-id: 223337178c [formerly 250f553532] [formerly a55807d37bbef25e8d8929bb33fd3ccf74c0257c [formerly 173e28b9d9]]
Former-commit-id: a5612755d90d9271066ed3e8223e83ba23762362 [formerly 00307deae3]
Former-commit-id: 3726903ddc
|
2013-10-22 13:05:22 -05:00 |
|
Nate Jensen
|
3c9107b0dc
|
Issue #2361 undo loading maps at startup
Change-Id: If737fe16df0b11dbb2dd510697cba2ffaa5967a4
Former-commit-id: 4879e1d7d3 [formerly e65d392677] [formerly 5e2ebbaad8] [formerly 4879e1d7d3 [formerly e65d392677] [formerly 5e2ebbaad8] [formerly 938e4a3073 [formerly 5e2ebbaad8 [formerly 15c1452f6970515d91b5bcc0c75de1679f561c87]]]]
Former-commit-id: 938e4a3073
Former-commit-id: 9a6f474b0b [formerly 621eaab03a] [formerly 7b549b23c7a05b00918c0b4e70c2fde2005dabc1 [formerly d1ff15485c]]
Former-commit-id: 9f6b770f3d75d9f48fcf482b50635b65aa5b55cf [formerly 4f4af22201]
Former-commit-id: 4a1d2cfad5
|
2013-10-22 12:42:41 -05:00 |
|
Slav Korolev
|
08aaa44cc9
|
Issue #2455. Fixed error from test.
Former-commit-id: 34300d63a1 [formerly f64d667715] [formerly 359c281b1e] [formerly 34300d63a1 [formerly f64d667715] [formerly 359c281b1e] [formerly 981544290e [formerly 359c281b1e [formerly 86967352eba1893eb4ec40187638bfc33d06cc21]]]]
Former-commit-id: 981544290e
Former-commit-id: d56f7ca3a9 [formerly d0aa6f6f26] [formerly 90582b33ceb3e84ea08f1c20ad1a3bd68ef28ea6 [formerly 263244b606]]
Former-commit-id: 79a91e7b36c647374275b3525cb86e52f815bf12 [formerly 0ea9efa8dc]
Former-commit-id: 3324392dad
|
2013-10-22 12:34:34 -04:00 |
|