xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6159 commits 31 branches 40 tags 3.8 GiB
Commit graph

6159 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lee Venable
09c582a70a Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client. 
Former-commit-id: 6418906d23 [formerly 2401caa24f] [formerly 6418906d23 [formerly 2401caa24f] [formerly a176a26618 [formerly 363ddb4af1075686fc5a1d80df884f59d93d7b99]]]
Former-commit-id: a176a26618
Former-commit-id: db11f9af58 [formerly ab5d8d6204]
Former-commit-id: da158b0d70
 2014-06-23 15:37:10 -05:00
Richard Peter
87d11319f2 Merge "Omaha #3133 remove unnecessary plugins" into omaha_14.4.1 
Former-commit-id: 8c8691738d [formerly 3771f4713c] [formerly 8c8691738d [formerly 3771f4713c] [formerly deb9d6f6f4 [formerly 20678aae188feb5cc9333d98533708cd03da5fa6]]]
Former-commit-id: deb9d6f6f4
Former-commit-id: 5b6a02e5f6 [formerly 4deef37141]
Former-commit-id: 972a376136
 2014-06-23 14:45:16 -05:00
Nate Jensen
284ddc9583 Merge "Omaha #3133 remove dead plugin" into omaha_14.4.1 
Former-commit-id: f714c75bfc [formerly e2826c52c0] [formerly f714c75bfc [formerly e2826c52c0] [formerly 988e2877e1 [formerly c81ee641c5e84cd1c85f31210250ca19d3674d6a]]]
Former-commit-id: 988e2877e1
Former-commit-id: f5b68cc357 [formerly b17e12606e]
Former-commit-id: f48422449c
 2014-06-23 14:24:14 -05:00
Nate Jensen
6d3b2d3119 Omaha #3133 remove unnecessary register buddies 
Change-Id: I2ddc877d402d34a2db78d665f304da5fe212aaf4

Former-commit-id: 6077794cc9 [formerly 9219e1e254] [formerly 6077794cc9 [formerly 9219e1e254] [formerly 53633a6ed4 [formerly c91a7d4084be3753ad51afd11b46b621af0bc878]]]
Former-commit-id: 53633a6ed4
Former-commit-id: 1117e5b995 [formerly 5062338b2d]
Former-commit-id: 3239b1956b
 2014-06-23 14:13:19 -05:00
Nate Jensen
1d76825805 Omaha #3133 remove dead plugin 
Change-Id: I0558c70b2c3c84ba3ed4f4c966bfd8dbd3c0369c

Former-commit-id: 65a42a5689 [formerly 1c2b5a5c4e] [formerly 65a42a5689 [formerly 1c2b5a5c4e] [formerly 6ba15e68b2 [formerly 22bcc1db6482f662d79be82e585912ce8c451d7e]]]
Former-commit-id: 6ba15e68b2
Former-commit-id: 92adc389fc [formerly 14d9616890]
Former-commit-id: f0833bdb17
 2014-06-23 14:09:20 -05:00
Nathan Bowler
bb83588aae Omaha #3272 Throw UnrecognizedDataException instead of a NPE when records weren't found. Switch to slf4j. Updated Manifest per Code review and removed trailing space. 
Change-Id: I9a512dcd140e02d092897df4f306c1c25ea84377

Former-commit-id: 705a20e39d [formerly d1cde2f291] [formerly 705a20e39d [formerly d1cde2f291] [formerly e2e6724043 [formerly ca5b7fa9d91d085f0684320a4582a974a4356063]]]
Former-commit-id: e2e6724043
Former-commit-id: 062106864b [formerly 61b2e5e6f5]
Former-commit-id: ef7161188a
 2014-06-23 15:03:00 -04:00
Dave Hladky
68ad68a6f5 Omaha #3306 Made DPA SSL comms work 
Change-Id: I4ef3086f4abadf35c910386c823c914c7892156d

Former-commit-id: 67d1468c8c [formerly c6a1a5592c] [formerly 67d1468c8c [formerly c6a1a5592c] [formerly 47cc398e91 [formerly 9061033cd5f8299435b5aa83410e2d99f477d07e]]]
Former-commit-id: 47cc398e91
Former-commit-id: 05360ecd9f [formerly df958f67c5]
Former-commit-id: 3c48f43e37
 2014-06-23 13:03:25 -05:00
Nate Jensen
fde6ed28ce Omaha #3133 remove unnecessary plugins 
Change-Id: Id9930080f742143e707c14ba96e770389f7aaf09

Former-commit-id: b92a2671f3 [formerly 5e30984a41] [formerly b92a2671f3 [formerly 5e30984a41] [formerly 2f85537a55 [formerly 04d26bedbe8d6ccf7a353159f27b133aff42970e]]]
Former-commit-id: 2f85537a55
Former-commit-id: 123679b8ec [formerly 544b0f0dd9]
Former-commit-id: 8bcc2155c6
 2014-06-23 13:00:44 -05:00
Nate Jensen
b54b30e037 Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1 
Former-commit-id: 718d941c23 [formerly 61640d5c22] [formerly 718d941c23 [formerly 61640d5c22] [formerly 172f18a5b1 [formerly 449a40d7981b0814f9cc7feb62f52b2259e83e5f]]]
Former-commit-id: 172f18a5b1
Former-commit-id: 4e8d9343dd [formerly 48995ed5ca]
Former-commit-id: 217a0999d0
 2014-06-23 12:12:03 -05:00
Brad Gonzales
59e3eed9f3 Omaha #3197 moved ncep edex plugins that are only needed by the national centers to a separate rpm. 
Removed the ingest modes excludes since they are not needed (the rpm is only installed where it is needed.)

Amend:  Commented out local deploy of National Central Operations EDEX plugins and added a comment.
        Updated comment.

Change-Id: I98cfd70ec3d1917404fe7c4b70b380224ef7d14d

Former-commit-id: 955e37bca7 [formerly 57b49b4868] [formerly 955e37bca7 [formerly 57b49b4868] [formerly a6138bfc17 [formerly 6159b6ec34966762e7dd8ce2f66c24004d11bd95]]]
Former-commit-id: a6138bfc17
Former-commit-id: e9dca26ebf [formerly 1d4903be35]
Former-commit-id: fc0ed548f0
 2014-06-23 10:49:35 -05:00
Brian Clements
bb58783ca4 Omaha #3281 peer2peer chat view improvements 
bounced chat messages now result in error messages in window
fixed view secondary id bug with userids (removed resource from key)

Change-Id: I76a68bf290b0c5205361bc6c78fda99336d7c62d

Former-commit-id: f053e9b084 [formerly 9d626a97e5] [formerly f053e9b084 [formerly 9d626a97e5] [formerly 93a1ee71c4 [formerly a31b7f213081f384bd23d53a431ce53593254c25]]]
Former-commit-id: 93a1ee71c4
Former-commit-id: 3eb4cd513c [formerly a9827ef8e8]
Former-commit-id: 7060fe3fba
 2014-06-20 09:04:15 -05:00
Brian Clements
a8e31ffa21 Omaha #3281 collaboration views persist between perspectives 
fixed bug that prevented re-opening collaboration after views were closed

Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3

Former-commit-id: 21fca2e662 [formerly 9aa5a87c4b] [formerly 21fca2e662 [formerly 9aa5a87c4b] [formerly fd95df3bc0 [formerly b84f7571415871f2983b913cf816ed227b24bbac]]]
Former-commit-id: fd95df3bc0
Former-commit-id: 74c62e0bf9 [formerly 795fa49ced]
Former-commit-id: 5560b12a5a
 2014-06-20 08:53:54 -05:00
Nate Jensen
cc90e21628 Omaha #3245 remove -vm argument 
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13

Former-commit-id: 02372893b6 [formerly 123b22d90a] [formerly 02372893b6 [formerly 123b22d90a] [formerly d60d2b5caf [formerly 003c2d49ecc20cfae2cdefb14119e7d0b143e4c6]]]
Former-commit-id: d60d2b5caf
Former-commit-id: 98e2cb8d62 [formerly ef20c3192e]
Former-commit-id: 7af79aca86
 2014-06-19 14:44:24 -05:00
Nate Jensen
1d44a9f517 Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1 
Former-commit-id: 3971e05c4c [formerly 644fdf50c7] [formerly 3971e05c4c [formerly 644fdf50c7] [formerly caf278ca5c [formerly 741f2710372a713c53e70602395bf7c54fd17cdf]]]
Former-commit-id: caf278ca5c
Former-commit-id: ad63e5b322 [formerly 977a3818f1]
Former-commit-id: d67339b3a9
 2014-06-19 13:42:06 -05:00
Nate Jensen
255d1859f4 Omaha #3255 fix cave install of data delivery 
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e

Former-commit-id: 76658aa485 [formerly eff82573df] [formerly 76658aa485 [formerly eff82573df] [formerly f01e19946c [formerly bc22cda0a2bcdb550ad4d57a9be522336d4bc633]]]
Former-commit-id: f01e19946c
Former-commit-id: 6990acc1a7 [formerly cb5d6fe187]
Former-commit-id: 43cdc7fccb
 2014-06-19 13:15:40 -05:00
Brian Clements
cadb1091fb Omaha #3214 added pulse and cloud flash rendering to cave 
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce

Former-commit-id: 6345119f9b [formerly 7dd90e6f85] [formerly 6345119f9b [formerly 7dd90e6f85] [formerly a18069809a [formerly 136bb5feca753f83f53d9d1e9381061853edc402]]]
Former-commit-id: a18069809a
Former-commit-id: bd2288e066 [formerly 6d5cbf29a5]
Former-commit-id: 74d4ebf071
 2014-06-19 12:50:56 -05:00
Nate Jensen
201d03f319 Merge "Omaha #3226 fixed lightning decrypt validation, added initialization vector" into omaha_14.4.1 
Former-commit-id: 472e6ec591 [formerly 557aa84227] [formerly 472e6ec591 [formerly 557aa84227] [formerly 3f5c895d64 [formerly f829356f22771dbcb408da598bfe80b11cbd8de9]]]
Former-commit-id: 3f5c895d64
Former-commit-id: 31e4d9573f [formerly 920ec92736]
Former-commit-id: 6fc60d3edb
 2014-06-19 12:14:58 -05:00
Benjamin Phillippe
00e06c15fb Omaha #3255 Removed security plugin from ebxml common plugin to fix build 
Former-commit-id: 44c5a9efe8 [formerly df37c55132] [formerly 44c5a9efe8 [formerly df37c55132] [formerly 2c646cf054 [formerly ee89581aeb3d2f640656f37c2e4118a78dee5ca0]]]
Former-commit-id: 2c646cf054
Former-commit-id: 4b480fa686 [formerly f1d3019bf0]
Former-commit-id: a43a3a94c7
 2014-06-19 11:03:04 -05:00
Nate Jensen
813921a97c Merge "Omaha #3255 Remove cxf from cave feature to fix build" into omaha_14.4.1 
Former-commit-id: c19f10ddd4 [formerly 66cb3d5f03] [formerly c19f10ddd4 [formerly 66cb3d5f03] [formerly 27df878d86 [formerly 73c71e83588237e0a39d173c648f68a8e35bf119]]]
Former-commit-id: 27df878d86
Former-commit-id: d34ee39b1c [formerly 918e5664bb]
Former-commit-id: 9c0adc1c15
 2014-06-19 10:59:35 -05:00
Benjamin Phillippe
7dd8c59365 Omaha #3255 Remove cxf from cave feature to fix build 
Former-commit-id: 8428c676d7 [formerly 8d2605199e] [formerly 8428c676d7 [formerly 8d2605199e] [formerly fc024e6d4c [formerly b6f01bfe3f45ab4c3299879db44763994f7f8222]]]
Former-commit-id: fc024e6d4c
Former-commit-id: d9298ddd4f [formerly a90b1891b1]
Former-commit-id: fb3ea7760d
 2014-06-19 10:58:11 -05:00
Nate Jensen
9e888e6848 Merge "Omaha #2061 Fix recco." into omaha_14.4.1 
Former-commit-id: d461865ffa [formerly 95d705424c] [formerly d461865ffa [formerly 95d705424c] [formerly 505cef31a6 [formerly 944598e429d2e4e01fceb0081991d83812055e3f]]]
Former-commit-id: 505cef31a6
Former-commit-id: db7132a68d [formerly 6779d5c62a]
Former-commit-id: 5aa5691dc2
 2014-06-19 10:52:46 -05:00
Nate Jensen
dae2d1fc39 Merge "Omaha #3242 clean up more graphs" into omaha_14.4.1 
Former-commit-id: 870b7964b4 [formerly 9a459f2da7] [formerly 870b7964b4 [formerly 9a459f2da7] [formerly a3fe508711 [formerly 9f08e582b7eaf37741bbcee83692b9efe2859ea1]]]
Former-commit-id: a3fe508711
Former-commit-id: 2586401aa0 [formerly 836fa28a5d]
Former-commit-id: 70eda084ab
 2014-06-19 10:52:28 -05:00
Ben Steffensmeier
a111506648 Omaha #2061 Fix recco. 
Former-commit-id: 6c3a3cc707 [formerly d953e65ac9] [formerly 6c3a3cc707 [formerly d953e65ac9] [formerly 135452a593 [formerly 16f0ae623de79d7a46573f2ec3833403d6cfd79f]]]
Former-commit-id: 135452a593
Former-commit-id: 961a8402cc [formerly 8613e5b11c]
Former-commit-id: 754c076e94
 2014-06-19 10:46:29 -05:00
Brian Clements
2ad045e4c7 Omaha #3226 fixed lightning decrypt validation, added initialization vector 
Change-Id: I8c72ef66f3f65a5bb1c3fdf8a2dd391c0cb5c554

Former-commit-id: 9064c50f01 [formerly da6eea7f57] [formerly 9064c50f01 [formerly da6eea7f57] [formerly 36f8207246 [formerly 38a729b7d5b42ac60004473a4c875b5171a93569]]]
Former-commit-id: 36f8207246
Former-commit-id: b5bc5cf85b [formerly bb69af4aef]
Former-commit-id: 18fd0db668
 2014-06-19 10:32:05 -05:00
Nate Jensen
65a65a4b25 Merge "Omaha #2061 Remove another reference to IDecoderGettable." into omaha_14.4.1 
Former-commit-id: 67d6e9ce3b [formerly 17554ba5c9] [formerly 67d6e9ce3b [formerly 17554ba5c9] [formerly 5d209448da [formerly 5741f0c527a75700bb0f745bbbdaf95929607e9d]]]
Former-commit-id: 5d209448da
Former-commit-id: 44b52b1328 [formerly 413ac17101]
Former-commit-id: f8359db428
 2014-06-19 10:12:18 -05:00
Nate Jensen
55aa294dad Issue #3248 ensure that a locking file output streams obtains the lock 
before calling the FileOutputStream constructor

Change-Id: I210ac789322c975cb93584facb3eec417f5097f2

Former-commit-id: 4558fe5862 [formerly 845483346f] [formerly 4558fe5862 [formerly 845483346f] [formerly 65eb76ff66 [formerly 599f2598f711ce2ae6ac69ed78a90502a84d2716]]]
Former-commit-id: 65eb76ff66
Former-commit-id: 0ea72ce3ed [formerly d1766dc991]
Former-commit-id: 0d1d12158d
 2014-06-19 10:02:34 -05:00
Greg Armendariz
4e06a55342 Omaha #3299 - Fix qpid dependency 
Former-commit-id: 74500b05fc [formerly 9d9ba5a78f] [formerly 74500b05fc [formerly 9d9ba5a78f] [formerly 9d1630a617 [formerly d292734da643f003d9d04e03b32727bf9c007443]]]
Former-commit-id: 9d1630a617
Former-commit-id: 4802ac344e [formerly 58d09cc3ec]
Former-commit-id: 69f085c08c
 2014-06-19 09:56:10 -05:00
Nate Jensen
89d67fbce7 Omaha #3242 clean up more graphs 
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4

Former-commit-id: 9e317cb9bc [formerly aca7b46243] [formerly 9e317cb9bc [formerly aca7b46243] [formerly 7bb2aebd59 [formerly 667817cf9473889f8c5cc39dd71814f1181a3805]]]
Former-commit-id: 7bb2aebd59
Former-commit-id: 88607607d7 [formerly 33f36374d0]
Former-commit-id: a1467e4361
 2014-06-18 18:23:36 -05:00
Nate Jensen
da89b20f75 Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1 
Former-commit-id: a83159ff6a [formerly 55bd088ce5] [formerly a83159ff6a [formerly 55bd088ce5] [formerly 835b65b7b8 [formerly 43684d4c0fe8f4b79ef384c08d01d2bdd51990e6]]]
Former-commit-id: 835b65b7b8
Former-commit-id: 135656f5f5 [formerly 19383d86f2]
Former-commit-id: c02a5a88eb
 2014-06-18 17:17:17 -05:00
Nate Jensen
76f8d24c33 Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1 
Former-commit-id: 393718bf41 [formerly f0e0866155] [formerly 393718bf41 [formerly f0e0866155] [formerly fbd7e64fe2 [formerly 84257c99914950f412f1e3d8c12b691fb428086f]]]
Former-commit-id: fbd7e64fe2
Former-commit-id: 9e8f46a84c [formerly 098712e6a0]
Former-commit-id: ddae1dc541
 2014-06-18 17:17:04 -05:00
Nate Jensen
697c53e6bb Merge "Omaha #3242 fix errors that can occur if a user zooms or pans while the time series is still loading" into omaha_14.4.1 
Former-commit-id: 43a6ca22ac [formerly 0db147238d] [formerly 43a6ca22ac [formerly 0db147238d] [formerly 9a76fd4db0 [formerly 968613aaa91648a8e860eff88293744ddc00464c]]]
Former-commit-id: 9a76fd4db0
Former-commit-id: 2e569fea17 [formerly 7867dc1ff6]
Former-commit-id: a57ea807ea
 2014-06-18 17:07:19 -05:00
Nate Jensen
d68030a1cc Omaha #3242 thread safety for inset map 
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857

Former-commit-id: 33f858e951 [formerly 9b98b63bb5] [formerly 33f858e951 [formerly 9b98b63bb5] [formerly 30e76a1fd5 [formerly d06eedeefc7997f6c881cf267c7f24979afbd9d7]]]
Former-commit-id: 30e76a1fd5
Former-commit-id: 40ca9ab166 [formerly a32552846d]
Former-commit-id: 3a7c95c110
 2014-06-18 17:02:10 -05:00
Nate Jensen
e46c6a4ed4 Omaha #3242 fix errors that can occur if a user zooms or pans while the 
time series is still loading

Change-Id: Ibcdc9681c651731f7da554c8cca40e260303aebb

Former-commit-id: b6ba8c0a3d [formerly a18fa3f026] [formerly b6ba8c0a3d [formerly a18fa3f026] [formerly 3ba4931eee [formerly 7999e026e8ff02ccb0f155af8770b0d8aac43339]]]
Former-commit-id: 3ba4931eee
Former-commit-id: 51e5563415 [formerly a990471021]
Former-commit-id: 4e673d8358
 2014-06-18 16:48:48 -05:00
Nate Jensen
c65c47c798 Omaha #3242 fix error if user zooms on cross section before it's loaded 
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830

Former-commit-id: aa579b85e7 [formerly 1add8fca08] [formerly aa579b85e7 [formerly 1add8fca08] [formerly 46c843f51a [formerly 4a7eebe03c9cd84702e6cda1258503da725a10bb]]]
Former-commit-id: 46c843f51a
Former-commit-id: 18ce2d6635 [formerly 32038939b3]
Former-commit-id: 4c44afbf22
 2014-06-18 16:37:49 -05:00
Nate Jensen
bf95e2a827 Omaha #3242 support ensemble id in time series legends 
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08

Former-commit-id: 73082de461 [formerly 1a8995fc2d] [formerly 73082de461 [formerly 1a8995fc2d] [formerly e10a73c17b [formerly 453c1eecf4f08203b4c6e2a74ad5dc366d85d359]]]
Former-commit-id: e10a73c17b
Former-commit-id: d6f84d8281 [formerly a575c57ecc]
Former-commit-id: 1d244a4a95
 2014-06-18 15:37:14 -05:00
Benjamin Phillippe
77f29751bb Omaha #3255 Fix build 
Former-commit-id: ebecdaeb36 [formerly 3864eb622e] [formerly ebecdaeb36 [formerly 3864eb622e] [formerly bc9e7f1cb3 [formerly cd985e372ebdd705e1e93c4760fc02f229ddfddd]]]
Former-commit-id: bc9e7f1cb3
Former-commit-id: 22b5114802 [formerly 4bb4c753ba]
Former-commit-id: 953bf4a72f
 2014-06-18 14:03:23 -05:00
Benjamin Phillippe
55e4811fe8 Omaha #3255 Fixing Build 
Former-commit-id: a50a8e79a1 [formerly 621a3f1a5c] [formerly a50a8e79a1 [formerly 621a3f1a5c] [formerly 7e7cecceea [formerly a2a18d6f4a9f536172c264eeeee3ff51e225981f]]]
Former-commit-id: 7e7cecceea
Former-commit-id: d59ea2591d [formerly f6dc8523d7]
Former-commit-id: 07c5831045
 2014-06-18 13:57:27 -05:00
Nate Jensen
2e803f21b3 Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1 
Former-commit-id: 0167a89312 [formerly 042b69ba9a] [formerly 0167a89312 [formerly 042b69ba9a] [formerly 9fd4e4a8d9 [formerly b209ae6772fe33ca73a130468c4c314f86ffeba5]]]
Former-commit-id: 9fd4e4a8d9
Former-commit-id: fdebae41d5 [formerly 806b3b1490]
Former-commit-id: 5d1cf81f99
 2014-06-18 12:14:45 -05:00
Ben Steffensmeier
3d6aa182fa Omaha #2061 Remove another reference to IDecoderGettable. 
Former-commit-id: a55d42d479 [formerly cc72f9d983] [formerly a55d42d479 [formerly cc72f9d983] [formerly 7b356e8ce0 [formerly bdca92f18fa4a7348dd82d9f2348583398dd5c30]]]
Former-commit-id: 7b356e8ce0
Former-commit-id: b01f99e5f2 [formerly 49fc12968f]
Former-commit-id: 95dceeab13
 2014-06-18 12:12:01 -05:00
Nate Jensen
86a57cc2c5 Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1 
Former-commit-id: 079828ecce [formerly b3e73d78cc] [formerly 079828ecce [formerly b3e73d78cc] [formerly 32bc3e4056 [formerly 5d378ca9529b48bd0a1422aec3263310f8350161]]]
Former-commit-id: 32bc3e4056
Former-commit-id: b6c7e0dfd2 [formerly c59136990b]
Former-commit-id: 7872e29f1b
 2014-06-18 11:11:34 -05:00
Nate Jensen
787b6d8a60 Omaha #3274 fix generation of viz .ini files 
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7

Former-commit-id: f958ca8de2 [formerly 465a0fef71] [formerly f958ca8de2 [formerly 465a0fef71] [formerly 17dc45e7ca [formerly dd628b80f7798bb66d3c54568b9549e66870ddec]]]
Former-commit-id: 17dc45e7ca
Former-commit-id: fe17c9b8b9 [formerly a9fc46a6fb]
Former-commit-id: 4129bd518d
 2014-06-18 10:03:17 -05:00
Benjamin Phillippe
a8d99c348d Omaha #3255 Dependency cleanup 
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e

Former-commit-id: b41f79658f [formerly 270caaadde] [formerly b41f79658f [formerly 270caaadde] [formerly c2ed8a39d1 [formerly dbac62df979f23402594dc6439b53e7884ea1bd1]]]
Former-commit-id: c2ed8a39d1
Former-commit-id: 38abcb36f5 [formerly 447fb0572a]
Former-commit-id: 5d908f2288
 2014-06-18 09:54:40 -05:00
Steve Harris
a6d5652425 Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts (these go to ufcore):
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/AbstractGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/cmenu/ChangePointStyleAction.java


Former-commit-id: 9de49b59ea [formerly cc7e6bc52a] [formerly 9de49b59ea [formerly cc7e6bc52a] [formerly 676948e239 [formerly da50f581c90ea0cca5f43c45c44cb8ac045a6c8c]]]
Former-commit-id: 676948e239
Former-commit-id: 586f563839 [formerly 18b2a1df08]
Former-commit-id: 545d6da097
 2014-06-18 08:52:25 -05:00
Nate Jensen
3923c96927 Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1 
Former-commit-id: 344a6b80ef [formerly a2783be56a] [formerly 344a6b80ef [formerly a2783be56a] [formerly 764f977bf6 [formerly 4468390aaf89456e93b45fca20aeca7fb96d8c12]]]
Former-commit-id: 764f977bf6
Former-commit-id: 686f6f67a0 [formerly bc5cedb1c8]
Former-commit-id: 7011f15929
 2014-06-17 18:09:33 -05:00
Nate Jensen
f21b672114 Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1 
Former-commit-id: bb60b170e8 [formerly dcab909b4b] [formerly bb60b170e8 [formerly dcab909b4b] [formerly 7fc256d076 [formerly c632bf24ee15cc85da9d7e7fb0a295912bf06b78]]]
Former-commit-id: 7fc256d076
Former-commit-id: 1f9f0ba7f3 [formerly a499624f5f]
Former-commit-id: f94209e681
 2014-06-17 17:01:46 -05:00
Brian Clements
ed95461c36 Issue #2903 prevent shared display crash from missing point style enum value 
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173

Former-commit-id: b8a0a60df6 [formerly 9946f78241] [formerly b8a0a60df6 [formerly 9946f78241] [formerly 5d03048fff [formerly 5d298b39786d37aa365ccfe2c337214d1e46f1a9]]]
Former-commit-id: 5d03048fff
Former-commit-id: dbe778cbe0 [formerly 59d92634b0]
Former-commit-id: 48e634b14a
 2014-06-17 17:01:23 -05:00
Nate Jensen
11753fc2d3 Omaha #3245 fix GFE starting without a cave data 
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7

Former-commit-id: 2ce0e5aee5 [formerly 19aa9dc96e] [formerly 2ce0e5aee5 [formerly 19aa9dc96e] [formerly 8ab7d86a8f [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]]]
Former-commit-id: 8ab7d86a8f
Former-commit-id: 5129fee3e6 [formerly 451b265ce6]
Former-commit-id: e59c180fdc
 2014-06-17 16:31:20 -05:00
Nate Jensen
aec31b09bc Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1 
Former-commit-id: 12ef85f665 [formerly 7fb85a1acc] [formerly 12ef85f665 [formerly 7fb85a1acc] [formerly c05ae83ea2 [formerly 2c2b3891003076484539ef5fa7d6772b6336c635]]]
Former-commit-id: c05ae83ea2
Former-commit-id: f925285131 [formerly 0d71d5dc2b]
Former-commit-id: 181da0bc6a
 2014-06-17 16:24:42 -05:00
Brian Clements
3702533a45 Omaha #3078 collaboration shared display data over private chat 
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf

Former-commit-id: b518cb2418 [formerly 9a427606ae] [formerly b518cb2418 [formerly 9a427606ae] [formerly add8286d52 [formerly a51847aff197f805a4e48c9ecdb0c16f874e6a78]]]
Former-commit-id: add8286d52
Former-commit-id: 13bf7e0793 [formerly 06b7415cec]
Former-commit-id: a993d1f90a
 2014-06-17 14:32:17 -05:00
Nate Jensen
1b2612e117 Merge "Omaha #3110 Fix typos in revision comment and log message. Changed to log number of messages in queue instead of number being added to queue." into omaha_14.4.1 
Former-commit-id: bd2ef07395 [formerly d8dc6eceef] [formerly bd2ef07395 [formerly d8dc6eceef] [formerly acd7620d7a [formerly 6efd831efcc5372c7e7bfd52265d13de382407ee]]]
Former-commit-id: acd7620d7a
Former-commit-id: fe52a8f7f8 [formerly 485aced54c]
Former-commit-id: 479ccb41f4
 2014-06-17 14:21:55 -05:00