Commit graph

4726 commits

Author SHA1 Message Date
Nate Jensen
4c3bdc0dfb Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]]
Former-commit-id: a85575a763
Former-commit-id: 740e71adba [formerly 139479b4e1] [formerly 759372ba16bb02e06f0e8472c362cf3299be0ff5 [formerly 11fb06810f]]
Former-commit-id: fe5669f9eeae8061972d1a92d1593cd4aea98162 [formerly 70285796ac]
Former-commit-id: 65068869e1
2014-02-13 15:35:53 -06:00
Nate Jensen
484e8d1625 Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: ec6d8585e1 [formerly f2b32fa1ae] [formerly 2643d01b74] [formerly ec6d8585e1 [formerly f2b32fa1ae] [formerly 2643d01b74] [formerly d8e2d2837e [formerly 2643d01b74 [formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]]]
Former-commit-id: d8e2d2837e
Former-commit-id: 2772ad3c9c [formerly 1f3c4090a0] [formerly e7dc3b65fcb3fa03216ea4dfccc11e35d47a79ef [formerly b31470f7e3]]
Former-commit-id: f21f0c2edda75779b51cb9b768a1562125025411 [formerly 3fb847a74c]
Former-commit-id: 1aeeeffb0d
2014-02-13 14:02:55 -06:00
Nate Jensen
b8aa4f50af Merge "Issue #2751 user identity refactor" into development
Former-commit-id: 8ef1cef675 [formerly da2eb1f068] [formerly ee5b9b65bf] [formerly 8ef1cef675 [formerly da2eb1f068] [formerly ee5b9b65bf] [formerly 38bd5b3d52 [formerly ee5b9b65bf [formerly f652f28862822a0fd063a173fbb323b4b16394fb]]]]
Former-commit-id: 38bd5b3d52
Former-commit-id: b357f36676 [formerly 1ff97122ea] [formerly 01eab6de6dce2a367551819b44b30d8c655ef871 [formerly 34906d5464]]
Former-commit-id: 6a8c932895ce22651536050351866570bb187fb3 [formerly 0b24e2ca7c]
Former-commit-id: 16bfc2e8b5
2014-02-13 14:01:53 -06:00
Brian Clements
85c67054ae Issue #2751 user identity refactor
VenueParticipant no longer a subtype of UserId
New interface for both
refactored base classes to be generic for user types


Former-commit-id: 01653c76de [formerly 16ed18e0c6] [formerly ef52908906] [formerly 01653c76de [formerly 16ed18e0c6] [formerly ef52908906] [formerly 0ac7ff81cf [formerly ef52908906 [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]]]
Former-commit-id: 0ac7ff81cf
Former-commit-id: 21b1a6844a [formerly e6de3a118d] [formerly 01dac7e88270bd83aeb03bd3e6b701e82c5f1b0b [formerly 3ec3ad0543]]
Former-commit-id: f2dc7cf04af4442851840305e26a4b79ceb9be1d [formerly 1cc21dc160]
Former-commit-id: aa06f65038
2014-02-13 13:51:39 -06:00
Brian Clements
36881a8077 Issue #2700 fixed subscribe request group input
user was being added to roster twice, the second time overwrote the group info
changed dialog to pass group info back so we only add once


Former-commit-id: a0eb8342bf [formerly 2d72c0f475] [formerly 579f7c826d] [formerly a0eb8342bf [formerly 2d72c0f475] [formerly 579f7c826d] [formerly caa8360ac7 [formerly 579f7c826d [formerly 0c4a7915870f374cb4e728303939335cb0691c84]]]]
Former-commit-id: caa8360ac7
Former-commit-id: d4afb01ecc [formerly 46ea69990d] [formerly 68affea48bc5b76e4b2afb6e939f8ab5903347db [formerly bafe2972a4]]
Former-commit-id: d73388f45bd1a17bac824f589802ad0559ac404f [formerly 8b618ea95b]
Former-commit-id: a3157035bc
2014-02-13 09:47:02 -06:00
Ben Steffensmeier
7bb5c6f342 Issue #2672 Fix problems encountered in data access layer.
Former-commit-id: 5ed46c8b38 [formerly d663567b36] [formerly 41983df7a0] [formerly 5ed46c8b38 [formerly d663567b36] [formerly 41983df7a0] [formerly 835bcc695d [formerly 41983df7a0 [formerly ec95d1af0696b1f9b0b105143e26ea40937b28a8]]]]
Former-commit-id: 835bcc695d
Former-commit-id: 0bf76e4cd7 [formerly 8fb8ea57d5] [formerly 79d48c0d792ff42c68382190a1ca74d1fb6c0908 [formerly d85014e363]]
Former-commit-id: 66de3a85c2f28ffecd38f610814c84a9430dee90 [formerly 9cc950cf06]
Former-commit-id: 3a49bb1a90
2014-02-12 18:37:02 -06:00
Nate Jensen
6b059bb502 Merge "Issue #2799 fixed double click chat not working for roster entries" into development
Former-commit-id: 1841c4f7bf [formerly ed87998c31] [formerly 6093312861] [formerly 1841c4f7bf [formerly ed87998c31] [formerly 6093312861] [formerly 94b8b7eb04 [formerly 6093312861 [formerly 381c3f6c6585f414c27b771168746f6dd838df0c]]]]
Former-commit-id: 94b8b7eb04
Former-commit-id: 906e7f679a [formerly f53e9523f3] [formerly 5a33efafe8dc13c6044be153e57d9a79150c60c2 [formerly b9e027059f]]
Former-commit-id: f1c22bbd6a9a841cc0f1e2161f7c123c3ecff932 [formerly 78f8a9fbe3]
Former-commit-id: 5771b557ef
2014-02-12 17:34:27 -06:00
Nate Jensen
b761b0b3ab Merge "Issue #2648 Add AlertMessage output. Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e" into development
Former-commit-id: fe1e70c49f [formerly 28235a99cc] [formerly b79e5e02f9] [formerly fe1e70c49f [formerly 28235a99cc] [formerly b79e5e02f9] [formerly fe139ac87f [formerly b79e5e02f9 [formerly 42e771181972a04c898c6fe30f8b1c6b70cedafd]]]]
Former-commit-id: fe139ac87f
Former-commit-id: 23af1cfafc [formerly 5c64b43c04] [formerly b3ea809ccc82b451e317b9bd5c8f2c29ce865f68 [formerly 8ee9d781a2]]
Former-commit-id: bc6086f52e89c4df7b06f9f60e8c976c0a7d12d2 [formerly 423510ca06]
Former-commit-id: e0bcd89020
2014-02-12 17:34:15 -06:00
Ben Steffensmeier
9d8d45edb4 Issue #2648 Add AlertMessage output.
Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e

Former-commit-id: f910b9277c [formerly ca109598ec] [formerly f45ec64979] [formerly f910b9277c [formerly ca109598ec] [formerly f45ec64979] [formerly c96be7613c [formerly f45ec64979 [formerly 47826e8d3e4570c9f970fc30f5dac462611b91bf]]]]
Former-commit-id: c96be7613c
Former-commit-id: 325cc8f289 [formerly 91eaba54df] [formerly c0cfb61f8fb09bae1bcec3cb6646ccc305150c1a [formerly 4cffeac65f]]
Former-commit-id: 0de1cdb7041a8c9c09da681bf298db272978e687 [formerly 27165c51b8]
Former-commit-id: b59ea9ac5a
2014-02-12 17:08:23 -06:00
Brian Clements
098bb233b9 Issue #2799 fixed double click chat not working for roster entries
Former-commit-id: 2a687e7ac5 [formerly 1e19c8d62c] [formerly 1bf3a09056] [formerly 2a687e7ac5 [formerly 1e19c8d62c] [formerly 1bf3a09056] [formerly 9d7490a158 [formerly 1bf3a09056 [formerly 06cfbcccff89fd79efd3188c45653dce160fc90a]]]]
Former-commit-id: 9d7490a158
Former-commit-id: 0145571fe4 [formerly 667a1450cf] [formerly 4759fd1ad623c2d68120a23d29513e3f9b15ecd5 [formerly f22268295e]]
Former-commit-id: 3e3d4092ea498f9a8728a7a6f8ff214aa8d5fdf2 [formerly 5b95f2a058]
Former-commit-id: 2b421aadcb
2014-02-12 17:06:44 -06:00
Brian Clements
a6393ddba3 Issue #2797 fixed presence bug
a defensive copy was needed when sending presence to rooms


Former-commit-id: b8a1c8f56d [formerly 22031aa87d] [formerly 81ddf87b04] [formerly b8a1c8f56d [formerly 22031aa87d] [formerly 81ddf87b04] [formerly 23e2039028 [formerly 81ddf87b04 [formerly d0dab4bce76b45b71f4238d5a04c440cee936eaf]]]]
Former-commit-id: 23e2039028
Former-commit-id: c322557870 [formerly a1ba9c6b9d] [formerly 545e96ec3fe21915f537c29fda28717077dc6a48 [formerly 09859bdee9]]
Former-commit-id: d0b782f566176fb91db12835b9d220a8a8ff0340 [formerly 57dd054176]
Former-commit-id: e286a68dc1
2014-02-12 16:54:46 -06:00
Richard Peter
321ad20826 Merge "Issue #2655 fix textlightning distribution regex" into development
Former-commit-id: 6611c70839 [formerly 172f0a9fa4] [formerly 70e9bef750] [formerly 6611c70839 [formerly 172f0a9fa4] [formerly 70e9bef750] [formerly 3feee2cf50 [formerly 70e9bef750 [formerly b1ba10c3b69187b762c962801a937adeb6ef5867]]]]
Former-commit-id: 3feee2cf50
Former-commit-id: 9709f881bf [formerly 9d183aaa97] [formerly 450dcd5eb62fde046f4116dff0528b7a55567591 [formerly ca851b6d2e]]
Former-commit-id: 93e0574c589b8c8ada189eb6d1e581b277839c38 [formerly 06e025de7d]
Former-commit-id: c810bf2555
2014-02-12 15:34:43 -06:00
Nate Jensen
7a01901abf Merge "Issue #2793 improved error handling for packet extension" into development
Former-commit-id: 1bf941fc58 [formerly fa42c40bc7] [formerly eec72c5956] [formerly 1bf941fc58 [formerly fa42c40bc7] [formerly eec72c5956] [formerly 5e6656581b [formerly eec72c5956 [formerly 3ccf0beb3b0cf77c168b529d69f291b8c295cbb1]]]]
Former-commit-id: 5e6656581b
Former-commit-id: fc4670578b [formerly bac84c698f] [formerly 9b1e3e2f48824cf85d17412f8baa7fdfe44e00c1 [formerly 7247d69202]]
Former-commit-id: e0c49c9df2f0002196949e1e020251f3b52a4797 [formerly 6e33812072]
Former-commit-id: 0f89907aaf
2014-02-12 15:06:43 -06:00
Nate Jensen
5a8ff8dbac Issue #2655 fix textlightning distribution regex
Change-Id: Ia8900e8baa05d831c984fbf355034ca189364d99

Former-commit-id: 2cd9b9ef13 [formerly cf1dcae597] [formerly a6c562d3f0] [formerly 2cd9b9ef13 [formerly cf1dcae597] [formerly a6c562d3f0] [formerly 16d6a29bb9 [formerly a6c562d3f0 [formerly 48825cb03da5bde6f8b1252fe2e366119535f8f3]]]]
Former-commit-id: 16d6a29bb9
Former-commit-id: 31fed91d11 [formerly 929d683210] [formerly a4537d42ffe3e0752006e8f23e4ef3cfdcdc8f60 [formerly 3b918cee5f]]
Former-commit-id: 4f64c1a64bd338816bfb84b1d7486414f2c46b6f [formerly 72330e9b62]
Former-commit-id: 7f3016b679
2014-02-12 15:03:45 -06:00
Brian Clements
1ed8ef5307 Issue #2793 improved error handling for packet extension
any exception thrown while parsing packets disconnects stream
changed to logging parsing problems and returning empty payload so we stay connected
added null check when sending to topic


Former-commit-id: 87a7bf82e5 [formerly 3034ac5994] [formerly e381edcd60] [formerly 87a7bf82e5 [formerly 3034ac5994] [formerly e381edcd60] [formerly b0714ba659 [formerly e381edcd60 [formerly 808727ce287116be8c8e2a93ce0fc4b3a996c0ef]]]]
Former-commit-id: b0714ba659
Former-commit-id: 85e92777e3 [formerly b94bc84429] [formerly 58c131b889ec791b70c5c89334b864ea89665943 [formerly 4406477877]]
Former-commit-id: c748ae3d428d8d4c271e1ef6e7267575a72a1e27 [formerly 73241ebeb7]
Former-commit-id: f23e9fcea0
2014-02-12 14:22:33 -06:00
Brian Clements
73452f84c6 Issue #2699 require non blank handle
previously defaulted to userid if handle left blank
now reprompts for handle
preferences now default to userid to pre-fill handle


Former-commit-id: 88db377b41 [formerly 8f07ae2a42] [formerly 0765451a9d] [formerly 88db377b41 [formerly 8f07ae2a42] [formerly 0765451a9d] [formerly ddf5b2a3ef [formerly 0765451a9d [formerly ae5f2d2b547241e7ba9c22aabaf64fceceb1b563]]]]
Former-commit-id: ddf5b2a3ef
Former-commit-id: 8b275e94b2 [formerly 9c67bcbbcf] [formerly f1871690aa5457b126ba46efaeed7a47b128ed69 [formerly fab4fea177]]
Former-commit-id: e5c43d72b21488421468d6cf473bc494a320eb33 [formerly 8e9f1136ae]
Former-commit-id: 2fc99f92ee
2014-02-12 09:13:48 -06:00
Slav Korolev
8b9c7a68a7 Issue #2763. Made LFCR correction of input data.
Former-commit-id: d715fc58dc [formerly 633a33dd21] [formerly 43802c3a5f] [formerly d715fc58dc [formerly 633a33dd21] [formerly 43802c3a5f] [formerly 47fc09a684 [formerly 43802c3a5f [formerly ea2d524767ea5eef74cda5fa5fbff886da1d3bc9]]]]
Former-commit-id: 47fc09a684
Former-commit-id: b2d7b314d4 [formerly 293af25a13] [formerly b95a9391756e1f2a8fcfd1f7948aee953988e1d7 [formerly 239f37f467]]
Former-commit-id: b78625be88064da354ba65aeab0cdc6fa6a20ab1 [formerly a7d8cfb651]
Former-commit-id: 93db746127
2014-02-11 14:48:07 -05:00
Ben Steffensmeier
9d21df8d15 Issue #2672 Allow One extra null byte in RemoteRequestRouteWrapper.
Former-commit-id: 6d4e5d79de [formerly 3bc210a1f1] [formerly 3d08979eee] [formerly 6d4e5d79de [formerly 3bc210a1f1] [formerly 3d08979eee] [formerly 40bc9df420 [formerly 3d08979eee [formerly 7463bf7c3efbdf8eb184f24bfc9c6a12c57d5006]]]]
Former-commit-id: 40bc9df420
Former-commit-id: aa9542cf3f [formerly 01c4ce8e29] [formerly 889387acc295602e9c38f3f464ee1b9a2ae3734c [formerly a0227d2c4e]]
Former-commit-id: 5457b68aea0e7d4cfc4696bf658becb496aa5176 [formerly 38c9773f38]
Former-commit-id: cf1d48f888
2014-02-10 17:39:32 -06:00
Nate Jensen
9e7286a9ef Merge "Issue #2778 fix bug in JUtilHandler.py where size was None. Also made the registrations an OrderedDict for falling back so we can order how we fall back" into development
Former-commit-id: c6b13c6ddb [formerly 9f2d49e31d] [formerly 93c84e2f95] [formerly c6b13c6ddb [formerly 9f2d49e31d] [formerly 93c84e2f95] [formerly 06679bbd46 [formerly 93c84e2f95 [formerly 30172e9189354a7be4581dfcf8c519dfdf7b8e8e]]]]
Former-commit-id: 06679bbd46
Former-commit-id: 3bbd2ecd54 [formerly 3de470ba73] [formerly ae1bcab5faf9f4ae8ebf24fd40ab993480168286 [formerly 733c21051c]]
Former-commit-id: 91b24fd76c78e97f7a782947aaa35b0404c65b1b [formerly 9f07a9431d]
Former-commit-id: 382de81b9a
2014-02-10 11:26:10 -06:00
Matt Nash
925bac27a8 Issue #2778 fix bug in JUtilHandler.py where size was None. Also made the registrations an OrderedDict for falling back so we can order how we fall back
Change-Id: I31120de5d206ddcade83e2c5455742deb1d6598a

Former-commit-id: dca4590a15 [formerly dccb819738] [formerly 4252e58992] [formerly dca4590a15 [formerly dccb819738] [formerly 4252e58992] [formerly 1ecc4541cf [formerly 4252e58992 [formerly a1ca74f1b2ad0176ab38e4a41bb7df62e06cc0c1]]]]
Former-commit-id: 1ecc4541cf
Former-commit-id: f2831d38e9 [formerly 5ce022cc1e] [formerly cd7ef6447954cfe5ef0495e81b84971fffcd7f8a [formerly f300282a22]]
Former-commit-id: e38a8eb4b4c7f32fa00fffd438101b302161ad61 [formerly 053615e387]
Former-commit-id: 5ad02eb0e3
2014-02-10 08:40:25 -06:00
Brian Clements
1b7e747bad Issue #2699 removed over cautious handle validation
xmpp does not limit the characters that can go in a handle
fixed id from room parsing to account for special characters


Former-commit-id: 6c6467d235 [formerly 639f774567] [formerly 7d6e116b9f] [formerly 6c6467d235 [formerly 639f774567] [formerly 7d6e116b9f] [formerly 6518b88fe5 [formerly 7d6e116b9f [formerly 24343a796d0089824dde2f7039cdf93ed0ebf88c]]]]
Former-commit-id: 6518b88fe5
Former-commit-id: 0dd73fed5a [formerly 6efb4f51d2] [formerly 8705994ebee4fa744b73413cf439e077ecb61c30 [formerly 8742be3a13]]
Former-commit-id: fa2a42a7032255748771e650cfd51cf203641fca [formerly 014b59e1a1]
Former-commit-id: 27f19f406a
2014-02-07 10:06:06 -06:00
Ben Steffensmeier
db3be83354 Issue #2672 Handle envelopes in data access requests of points and lightning.
Change-Id: Id9a56e9f8027a2f489561c241e2f34dd92dce400

Former-commit-id: dad7e3cbcd [formerly cd772d8961] [formerly 25ad0e327c] [formerly dad7e3cbcd [formerly cd772d8961] [formerly 25ad0e327c] [formerly ec8514000f [formerly 25ad0e327c [formerly efe32c8302834b1c53a5f65850aff8f12437d3bb]]]]
Former-commit-id: ec8514000f
Former-commit-id: b4cf53d154 [formerly b28f945bc1] [formerly 3257bc02c61d603531e293f1b4a6de5a7e06614c [formerly 19cb907ac8]]
Former-commit-id: a6410414da895a9defd4419add6f88ee8cbc7464 [formerly 32c8f9f149]
Former-commit-id: a242847062
2014-02-06 14:04:14 -06:00
Ben Steffensmeier
f6e712dac1 Issue #2672 Fix serialization of jts envelopes.
Former-commit-id: abb8ce22a7 [formerly fc783a8e6e] [formerly 97eef922ef] [formerly abb8ce22a7 [formerly fc783a8e6e] [formerly 97eef922ef] [formerly a068650e43 [formerly 97eef922ef [formerly 42b0e215a3e2bfe4ca8d789f025c49d8f35f6a6c]]]]
Former-commit-id: a068650e43
Former-commit-id: 955df80a07 [formerly 1cee24ce50] [formerly 7bec18ddec236a2959cfdac1ea4a19dee06b5284 [formerly 43df5b25d9]]
Former-commit-id: ce54b84ee2d045825b02eb5a653f4c18b0b42d1c [formerly 1be7b9c7dc]
Former-commit-id: 18f05123ca
2014-02-06 11:27:07 -06:00
Nate Jensen
5d659759de Merge "Issue #2672 Handle envelopes in data access requests of gridded types. Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c" into development
Former-commit-id: 6b9561855b [formerly d3d0dc5f77] [formerly d863bf208c] [formerly 6b9561855b [formerly d3d0dc5f77] [formerly d863bf208c] [formerly f00d4c54d8 [formerly d863bf208c [formerly 94cf3a44a8c2942c09e8fa596f734f3a0047d37a]]]]
Former-commit-id: f00d4c54d8
Former-commit-id: 73c1a1141d [formerly 39c9dda92b] [formerly d6bdb302ebbfaa5697bf26f7e3500a04f2afb0ee [formerly 8feed9aadf]]
Former-commit-id: ed6803c9c3c3681f9bbc9d272a5ff55b8bef52ba [formerly e342242032]
Former-commit-id: 1399fdd421
2014-02-05 17:09:17 -06:00
Ben Steffensmeier
7a5bd4acd1 Issue #2672 Handle envelopes in data access requests of gridded types.
Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c

Former-commit-id: f3eebf56f5 [formerly b84bf8c891] [formerly 9c439866d5] [formerly f3eebf56f5 [formerly b84bf8c891] [formerly 9c439866d5] [formerly dc5b5526a3 [formerly 9c439866d5 [formerly f634fe40e6fa7a8a3af575e79cb3d996761db983]]]]
Former-commit-id: dc5b5526a3
Former-commit-id: 3a13cfcb78 [formerly 5b7cf3caec] [formerly 30d66ecdaa170e8c1d59f0f680338dc3d3185bbd [formerly 02a0874646]]
Former-commit-id: f00c9462771aeb9945ef799da6961a92bf2ccca6 [formerly 70cbd6c61d]
Former-commit-id: 1619859812
2014-02-05 15:57:08 -06:00
Slav Korolev
1964f52bc0 Issue #2757. Added filter for removed stations and cleaned code.
Change-Id: I9998cf3bd20b2ec43956284257ee3dfcb8b52534

Former-commit-id: 91972c1b42 [formerly cbd17ea025] [formerly c7c40a3467] [formerly 91972c1b42 [formerly cbd17ea025] [formerly c7c40a3467] [formerly fa59172d87 [formerly c7c40a3467 [formerly b613a9d5b7e9b1c17fa354c9c6b617da040d1d71]]]]
Former-commit-id: fa59172d87
Former-commit-id: 0ebbffc8fc [formerly aea166d7b9] [formerly 9e17821f974894adbc9405dc7e9472062b30ba3c [formerly 4ec22d9530]]
Former-commit-id: 9d5d14a3e49ab60496fd1e6b5d14e240364fd62b [formerly 65ea06a366]
Former-commit-id: bd2141d123
2014-02-04 15:21:22 -05:00
Brian Clements
04f027986f Issue #2699 fixed assumption that usersearch was exact
usersearch returns matches for any part of string
added method to restrict to exact matches only


Former-commit-id: ddbfe9a763 [formerly bebd62c6b6] [formerly cfa3c9e0e8] [formerly ddbfe9a763 [formerly bebd62c6b6] [formerly cfa3c9e0e8] [formerly 6ea009a2e1 [formerly cfa3c9e0e8 [formerly 74daa7109149073c615d13c25092f6d08a77b936]]]]
Former-commit-id: 6ea009a2e1
Former-commit-id: 876b60e15d [formerly bc75d43bc3] [formerly 32509d9365c50f4522e4f0eb5ec73059ee0d9acf [formerly aff354a3d7]]
Former-commit-id: 0e4922ca913a4b5bfebceb41096f25f36219a7f2 [formerly 9370df47fe]
Former-commit-id: cd1b7dec1b
2014-02-03 15:34:58 -06:00
Greg Armendariz
8a8127ab0c Issue #2754 - Fix import
Former-commit-id: 11db377bf8 [formerly 5490e216be] [formerly e611dbe912] [formerly 11db377bf8 [formerly 5490e216be] [formerly e611dbe912] [formerly 2e79658417 [formerly e611dbe912 [formerly 1c9160bd5fe0e8c08ead5a67d9da426834a7669c]]]]
Former-commit-id: 2e79658417
Former-commit-id: 4cc403c2e7 [formerly 744c6fd9b1] [formerly 7f15c3386a71f2f598d58c1cb6cc6594a4e6792d [formerly 23f17b3f63]]
Former-commit-id: 0b20dae07d945ca03185d36e38562999d99055f7 [formerly ac169b4f24]
Former-commit-id: e47453df3b
2014-02-03 14:45:47 -06:00
Lee Venable
94705e9533 Merge "Issue #2757. Fixed issues in Area Configuration Dialogs." into development
Former-commit-id: 39021a203a [formerly 72a4a12e89] [formerly 19b883a407] [formerly 39021a203a [formerly 72a4a12e89] [formerly 19b883a407] [formerly c44b120176 [formerly 19b883a407 [formerly ecb833d823cf072f4e02b312fe320c2ade5162a2]]]]
Former-commit-id: c44b120176
Former-commit-id: 803102f8b3 [formerly 3e3805e1a7] [formerly d7c9c51cbb759b4283d0b5b2756b8b47c1ba7581 [formerly 15f94a61b5]]
Former-commit-id: 0a393f43928fc43da068f439b074fcfb4f402dcd [formerly e65a289e97]
Former-commit-id: c483877308
2014-02-03 14:31:28 -06:00
Nate Jensen
8c0e2fd743 Merge "Issue #2699 added handle config to prefs" into development
Former-commit-id: af3fcacedc [formerly 611faedbeb] [formerly 0c569ed407] [formerly af3fcacedc [formerly 611faedbeb] [formerly 0c569ed407] [formerly f796e81400 [formerly 0c569ed407 [formerly a58ae34cf5b40b7d6732b0de5cce2dd94709ba1e]]]]
Former-commit-id: f796e81400
Former-commit-id: bac8729a30 [formerly 09813c5943] [formerly 7e0d16e011843b31a7f211fc9c640af9bc4b890e [formerly 486702d99e]]
Former-commit-id: 2c46122b28327fe0e0afb6faeda7ffa031e42899 [formerly 5c4a0f61be]
Former-commit-id: 20ed92e4e8
2014-02-03 14:23:23 -06:00
Brian Clements
65afd1e4d2 Issue #2699 added handle config to prefs
default handle autofills session dialogs
is also used to connect to feed venue (error popup if already taken)


Former-commit-id: 83d6ca0855 [formerly 21c75d1d01] [formerly 1ff4ed1ae9] [formerly 83d6ca0855 [formerly 21c75d1d01] [formerly 1ff4ed1ae9] [formerly 16c1aaed3e [formerly 1ff4ed1ae9 [formerly f10f42753c541d4003b4c67a84a1d50e033941d3]]]]
Former-commit-id: 16c1aaed3e
Former-commit-id: c6287ecffc [formerly 2f60d1b579] [formerly a84830a2b6c074a8c5eb328da49682053240a4cd [formerly 7c867338c8]]
Former-commit-id: bc8262effd654ec4296479d2b0c4396a2891766e [formerly 671bfaa75c]
Former-commit-id: 592cf33f35
2014-02-03 12:59:57 -06:00
Greg Armendariz
4157e2d58a Merge "Issue #2754 - Remove commons logging calls" into development
Former-commit-id: 2455535b2d [formerly 4248cf6e93] [formerly 4926d89aec] [formerly 2455535b2d [formerly 4248cf6e93] [formerly 4926d89aec] [formerly 0b8031caa8 [formerly 4926d89aec [formerly 118bc77a245bd1392aefbf2aae4ada5ed4e8ad32]]]]
Former-commit-id: 0b8031caa8
Former-commit-id: 6470de3904 [formerly 9906121d18] [formerly 631bd265f7c9fc500edd39a7c6f13f82caa6d3fe [formerly 1f41ea93a4]]
Former-commit-id: 311288eb598ba810a132b5601bc68cea13826326 [formerly b06cf0eb70]
Former-commit-id: b1739c53cc
2014-02-03 12:24:20 -06:00
Greg Armendariz
5e2df6a0b4 Issue #2754 - Remove commons logging calls
Former-commit-id: 689ca84b3f [formerly efe8011970] [formerly fa27142ec2] [formerly 689ca84b3f [formerly efe8011970] [formerly fa27142ec2] [formerly 6ae002cf46 [formerly fa27142ec2 [formerly 7458fc7a7d3276fb14d963c92f55c89ced838837]]]]
Former-commit-id: 6ae002cf46
Former-commit-id: 05e48bb7f4 [formerly 9f09293f2e] [formerly 5cf42a9b3e606e1eccdf9c5c70d6bb76b2ced605 [formerly accf0505a5]]
Former-commit-id: 9cccab557a978db071ec2a16d72dccc77908920c [formerly e568b3792d]
Former-commit-id: 4600cda583
2014-02-03 12:17:30 -06:00
Steve Harris
95a936e9dc Merge branch 'omaha_14.2.1' into development
Conflicts:
	ncep/gov.noaa.nws.ncep.viz.ui.perspectives/plugin.xml

Former-commit-id: f1a9ec2d1e [formerly ae2b849157] [formerly 7a156e297a] [formerly f1a9ec2d1e [formerly ae2b849157] [formerly 7a156e297a] [formerly 7b59bd41eb [formerly 7a156e297a [formerly debbd62a40cf8d27b1990d1b06f273d09dd9a981]]]]
Former-commit-id: 7b59bd41eb
Former-commit-id: 116d836ab3 [formerly 4a379aa6e5] [formerly 675dc12528eb749e423c405fa15dbe8b66201362 [formerly aa9b488963]]
Former-commit-id: 0dd75fee1d6fbdae1f20d879a1069b131d9cd16f [formerly b9af02c0b3]
Former-commit-id: e6cab2a902
2014-02-03 10:29:16 -06:00
Steve Harris
b016112b8f Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: ab0609007c [formerly 131af8538e] [formerly b2032880ac] [formerly ab0609007c [formerly 131af8538e] [formerly b2032880ac] [formerly eb9d4319dc [formerly b2032880ac [formerly 9133aeccd450b0e241953c588192c2ee33fcbe8e]]]]
Former-commit-id: eb9d4319dc
Former-commit-id: ae4332665e [formerly 6883c64744] [formerly 66f652cd9d2fbc7c64872d432745217d602f2015 [formerly 33aea09906]]
Former-commit-id: 538ff84c8a7daabd62a35c1ea90e3f4c3651fc70 [formerly d8989145ac]
Former-commit-id: 08700a77b1
2014-02-03 10:26:11 -06:00
Nate Jensen
5b3caebb44 Merge "Issue #2725 deriv param to common stage 1" into development
Former-commit-id: 02b4e16810 [formerly 4784c24db0] [formerly c3b7ae533e] [formerly 02b4e16810 [formerly 4784c24db0] [formerly c3b7ae533e] [formerly 12892db76a [formerly c3b7ae533e [formerly 128141724c41850d4ced50efc1edf2c3019604cb]]]]
Former-commit-id: 12892db76a
Former-commit-id: fd89fb819d [formerly 2da30ce9cc] [formerly 50951ba3b4e3e1980a914ea8f034fbffea68bd08 [formerly fccefc9bb1]]
Former-commit-id: 372ba72674ca06621547dab71d90efe18d25428f [formerly 617a429fa1]
Former-commit-id: f67735769e
2014-02-03 10:17:43 -06:00
Greg Armendariz
eaeee421e5 Issue #2754 - Remove logging calls
Change-Id: Ic95b84691dc5cf6cea454f2a70acc9da301eaf05

Former-commit-id: 09c7b0827a [formerly 47347f42ca] [formerly e0394c649c] [formerly 09c7b0827a [formerly 47347f42ca] [formerly e0394c649c] [formerly 2ec1248fcc [formerly e0394c649c [formerly e072739f937ae4f7440efa8290dc9078f5398d7f]]]]
Former-commit-id: 2ec1248fcc
Former-commit-id: d78463d7c0 [formerly 2e03bcff4b] [formerly ed894f91fabab3ccbfd771bbeb3fe7a4650f8144 [formerly e02caca466]]
Former-commit-id: 248c754464869a119f9931cb70528b695817d09a [formerly 47d3f2e498]
Former-commit-id: cad35882f8
2014-02-03 09:29:47 -06:00
Everett Kladstrup
ae802a042f Issue #2725 deriv param to common stage 1
* Removing viz dependencys from derivparam
** Move LevelUtilities to common
** Use spring instead of eclipse plugin extentions
   to configure derived parameter function types
** Use RequestRouter instead of ThriftClient so
   we can use IServerRequest objects in both CAVE
   and EDEX

The next stage will be to clean up exceptions in
derived parameters to stop using VizException and
VizCommunicationException.


Former-commit-id: aac0fd726e [formerly 90df04614d] [formerly bd50a38d87] [formerly aac0fd726e [formerly 90df04614d] [formerly bd50a38d87] [formerly 80ad25754b [formerly bd50a38d87 [formerly 604ae156f8b235e2e1736863b419547289403240]]]]
Former-commit-id: 80ad25754b
Former-commit-id: 2c8d0df351 [formerly 40b796f59b] [formerly 9e9dc4b990dced62032e88e880c8fd835938b081 [formerly 415ccd78fb]]
Former-commit-id: 3e1f282c293b3f64570ac5a8f1deac12c2014e33 [formerly 57f9230654]
Former-commit-id: 3c30f65980
2014-02-03 09:02:58 -06:00
Slav Korolev
4cac912be3 Issue #2757. Fixed issues in Area Configuration Dialogs.
Change-Id: Ic3d3d5c41df6c8d80aac8e434e4c42a5ef9d1ecf

Former-commit-id: 7b3702c186 [formerly 6013121a99] [formerly ea573d2c30] [formerly 7b3702c186 [formerly 6013121a99] [formerly ea573d2c30] [formerly a768f540f0 [formerly ea573d2c30 [formerly 81826338bda946aff4ac8a7b9ea83c2eb72397d5]]]]
Former-commit-id: a768f540f0
Former-commit-id: f6ea436e80 [formerly d2d4672a46] [formerly a981a42007f76a4e25e017ce265ad6fb22a436d4 [formerly 6d9a066c36]]
Former-commit-id: 4f37da138bfd1a624cb5c2b39655d2127c907a2a [formerly baf598a6ff]
Former-commit-id: 559d0f9499
2014-02-03 09:50:01 -05:00
Brian Clements
fb03f7b570 Issue #2700 fixed subscribe back after contact request accept
we were sending the wrong presence type when accepting request
pidgin handled it, but it wasn't to the spec
fixed by adding contact to roster if not already a friend
request authorization dialog doesn't prompt for group if they are already in one


Former-commit-id: dc59e8fa2d [formerly 7176bf59b8] [formerly b88eaeb73e] [formerly dc59e8fa2d [formerly 7176bf59b8] [formerly b88eaeb73e] [formerly b0402be1d3 [formerly b88eaeb73e [formerly 4d860337ea821975b6ddb4846f102199347a4dcc]]]]
Former-commit-id: b0402be1d3
Former-commit-id: 7678703ae0 [formerly 9210aae10a] [formerly 49b91dbbac727f3af22f35a351ce544d8ce31b75 [formerly b651ada4b3]]
Former-commit-id: e467e72241d8923b566978180702bf8b00148966 [formerly 7e1425c419]
Former-commit-id: f2a97eb00e
2014-01-31 13:10:35 -06:00
Nate Jensen
b9a7590177 Merge "Issue #2312 Java 6 compatibility, fix legend menus." into development
Former-commit-id: 1b845abe22 [formerly 6112fd394c] [formerly 62f86b0a02] [formerly 1b845abe22 [formerly 6112fd394c] [formerly 62f86b0a02] [formerly 0f1f50650c [formerly 62f86b0a02 [formerly 4bd377297daea932f4907f7119208461f7f79281]]]]
Former-commit-id: 0f1f50650c
Former-commit-id: 3b3a81cd6c [formerly 38eb172fce] [formerly a28fee8e461c42c0c9bc7679d076645e9c166a04 [formerly 22190c55f0]]
Former-commit-id: 0703b65dd96596094c3b38be47104b7a4ae81005 [formerly 7dedc1ad8d]
Former-commit-id: 21dcf31757
2014-01-31 12:00:00 -06:00
Nate Jensen
7b7a056a6b Merge "Issue #2698 added handles to venues" into development
Former-commit-id: d83c0b2e99 [formerly 003e6bf0d2] [formerly 4a3c89c722] [formerly d83c0b2e99 [formerly 003e6bf0d2] [formerly 4a3c89c722] [formerly 50da1236dd [formerly 4a3c89c722 [formerly 0e6750826ed7f36e92a6cd451138bc3562149aad]]]]
Former-commit-id: 50da1236dd
Former-commit-id: d88b53e706 [formerly 49410a7e53] [formerly a5eb54ad3b3116ec0f71ceca98c9089c2ece8ef2 [formerly 87d49a2b1c]]
Former-commit-id: af68a946f88e0d1b3e9687ddd4339b004e9d14ff [formerly b9130e5e22]
Former-commit-id: 19bc148a55
2014-01-31 11:59:34 -06:00
Brian Clements
3c70c9ff9c Issue #2698 added handles to venues
venues now handle identity differently with VenueParticipant instead of UserId
fixed alias bug due to roster entry change


Former-commit-id: bd410b2529 [formerly 4e2cb3f7ae] [formerly 3e585945d6] [formerly bd410b2529 [formerly 4e2cb3f7ae] [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 3e585945d6 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]]]
Former-commit-id: 3250eb34f5
Former-commit-id: 35b53a61cd [formerly 4190b13ae2] [formerly 15ea8433323667869df6df396f6377d11f2a7079 [formerly 4f4d5c5d69]]
Former-commit-id: bfcea1a4566d36807b6744b7f53ddc0082dc12da [formerly e04cb11154]
Former-commit-id: cf8b85f3d2
2014-01-31 09:44:31 -06:00
Bryan Kowal
c966d2b01d Issue #2754 - fix ant xpath error; gfe is now dependent on kml (unrelated to this change)
Former-commit-id: 0e89136215 [formerly 6e19ac4acf] [formerly 6fd129379f] [formerly 0e89136215 [formerly 6e19ac4acf] [formerly 6fd129379f] [formerly 678fb83ded [formerly 6fd129379f [formerly e027cf42b3b395a834f91512e269e41377f673ef]]]]
Former-commit-id: 678fb83ded
Former-commit-id: 6c7b44fc8a [formerly 9ef27edf5f] [formerly 2b74f17b03d7ffc9219150c073ed97847f0ecc59 [formerly 77370b4e68]]
Former-commit-id: 1e3af9b64d512f695c923395197aae37cccdf84f [formerly cf6c6feccc]
Former-commit-id: 3dda41af98
2014-01-30 18:11:48 -06:00
Ben Steffensmeier
2187bffc08 Issue #2312 Java 6 compatibility, fix legend menus.
Former-commit-id: 17e58bb339 [formerly 27fbb0f870] [formerly 7ab61aaa23] [formerly 17e58bb339 [formerly 27fbb0f870] [formerly 7ab61aaa23] [formerly fe5f0118da [formerly 7ab61aaa23 [formerly 2853536477d39459de3cbb4eef7670734cfad5f8]]]]
Former-commit-id: fe5f0118da
Former-commit-id: e8493ada37 [formerly 1f23bb4cf7] [formerly 7002ef6a0a422a4b9670a1e79551716f01ec90da [formerly e4232ce9a7]]
Former-commit-id: 55b8a243f09ea246fcfd53b8a6521c4cac3719ed [formerly 7acd053aa2]
Former-commit-id: f4a89f93b4
2014-01-30 16:12:10 -06:00
Greg Armendariz
24740cdf4c Merge "Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN events while in there" into omaha_14.2.1
Former-commit-id: 37a226378d [formerly 7fbfe85478] [formerly ed0c724860] [formerly 37a226378d [formerly 7fbfe85478] [formerly ed0c724860] [formerly 5ad9cca7a3 [formerly ed0c724860 [formerly 4df9504e742c2807676521b10e56797fb3a24a68]]]]
Former-commit-id: 5ad9cca7a3
Former-commit-id: 022ed11f9a [formerly b4d9ec0e46] [formerly f18871c65719e369747a6d8b7e2bd4891f8916f2 [formerly 66e79f459e]]
Former-commit-id: bf798c587cc569efb1973356eed83d50492151bc [formerly 677e6ac584]
Former-commit-id: af0af0920b
2014-01-30 13:04:40 -06:00
Nate Jensen
ab58b2f973 Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN
events while in there

Change-Id: I678035f35aef0153fdc92b935bad4372d77d3619

Former-commit-id: 9ff86044a2 [formerly c18e66cc45] [formerly 327c588c9e] [formerly 9ff86044a2 [formerly c18e66cc45] [formerly 327c588c9e] [formerly 906c679b4e [formerly 327c588c9e [formerly 68de7dd0f4e5728cb077dad541ef9369627fced4]]]]
Former-commit-id: 906c679b4e
Former-commit-id: 53afb531fa [formerly af0ac40f47] [formerly a60314b3783b7851cffad12a2adc0d68ac6ecdb3 [formerly 7bd1d802be]]
Former-commit-id: 21c2189b9de73879ebb7e4c047f7d7c980d4918a [formerly ed91c1d6f5]
Former-commit-id: cfb4bdbb21
2014-01-30 12:02:42 -06:00
Ben Steffensmeier
9f58441a68 Issue #2537 Fix modelsounding registration.
Former-commit-id: e5a72cf008 [formerly 12b989a34b] [formerly 819369747e] [formerly e5a72cf008 [formerly 12b989a34b] [formerly 819369747e] [formerly 1db0291792 [formerly 819369747e [formerly e4e476afc2063211523840eaa6f845a4c2264774]]]]
Former-commit-id: 1db0291792
Former-commit-id: 72b05d3cf9 [formerly 17ed6c9664] [formerly bc119a3cae474746e0debcdb5e25680e4dc2f3f3 [formerly 501aec2537]]
Former-commit-id: b88be879742e212d21b088fc3ba1967b730d6073 [formerly d06eb22524]
Former-commit-id: a00d385f2e
2014-01-29 15:36:05 -06:00
Bryan Kowal
d469290095 Issue #2754 - now more accomodative for the com.raytheon.uf.viz.application.feature feature dependency
Former-commit-id: 54d0d4fd55 [formerly 635548dae3] [formerly d88019d902] [formerly 54d0d4fd55 [formerly 635548dae3] [formerly d88019d902] [formerly ee95e4de7e [formerly d88019d902 [formerly 5e007018d1cd6064ba114d92d3943e23d8c3e17e]]]]
Former-commit-id: ee95e4de7e
Former-commit-id: 116f872261 [formerly 89e0e847c9] [formerly 1e726cd962bdd3d3452656fcf23cec9c7816c5da [formerly bd88b563fe]]
Former-commit-id: beb68bc7496a250f5deff315c9eebb221958285c [formerly 1ae4a1d919]
Former-commit-id: 25d38dd699
2014-01-29 14:25:38 -06:00
Ron Anderson
23846fb7d4 Merge "Issue #2703 Hook GFEResource into KML Export. Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963" into development
Former-commit-id: a0e9e35891 [formerly d0e821e5d1] [formerly 61f35e86ec] [formerly a0e9e35891 [formerly d0e821e5d1] [formerly 61f35e86ec] [formerly f4f89c79a2 [formerly 61f35e86ec [formerly a3ea22b1db8418f5367b6ffa029f9aa159003398]]]]
Former-commit-id: f4f89c79a2
Former-commit-id: da9d8b55d6 [formerly ff65b54555] [formerly c22c542a86577176c89c23cb7f84b62f159a84e7 [formerly 2e9389293a]]
Former-commit-id: 987ebba1a7fbc7ce30ac874b9dff60e47e4b3faf [formerly a4daed8dd2]
Former-commit-id: 9dd3dbe791
2014-01-29 14:24:26 -06:00