Commit graph

4749 commits

Author SHA1 Message Date
Brian Clements
c420979556 Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client


Former-commit-id: abc01f5475 [formerly 06c16118e1] [formerly dc074a9650] [formerly abc01f5475 [formerly 06c16118e1] [formerly dc074a9650] [formerly 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 30027665ac [formerly 77bb396c9a] [formerly 7c130f893c124249133b51cb750375f7ea62663d [formerly bee7cdb71a]]
Former-commit-id: 2bd4a38066d755ff2faaae6125ca4744d0e08564 [formerly ddc0945e40]
Former-commit-id: b47b194564
2014-02-19 08:32:26 -06:00
Lee Venable
423f0dc2d7 Merge "Issue #2596 - Add check for null coordinates." into development
Former-commit-id: 0db46dd5fb [formerly 1620d0fb22] [formerly 6e60748b41] [formerly 0db46dd5fb [formerly 1620d0fb22] [formerly 6e60748b41] [formerly c871e4c872 [formerly 6e60748b41 [formerly e3517f5144c386038c4d535d79e62ec02d504f9f]]]]
Former-commit-id: c871e4c872
Former-commit-id: 32141b0655 [formerly 110557f42c] [formerly 11bc06e458f731c1f368a4935187371bf65560e2 [formerly d62b4e7621]]
Former-commit-id: 050dbd73eb4b1d6608e257bd0f349b10268f4679 [formerly 875ebbd2e1]
Former-commit-id: 7dca9cdace
2014-02-18 18:08:10 -06:00
Nate Jensen
ee6a119baf Merge "Issue #2672 Fix radar dataaccess from pure python." into development
Former-commit-id: dd821703b6 [formerly 82fde2011c] [formerly 698a4f827d] [formerly dd821703b6 [formerly 82fde2011c] [formerly 698a4f827d] [formerly 713ec598c3 [formerly 698a4f827d [formerly 6c8fba6afd4b5e28b425b6058e40130a1dd0b518]]]]
Former-commit-id: 713ec598c3
Former-commit-id: ce2568b36b [formerly 05edfb90d5] [formerly c65265d8b3848ad6c99e526ec9bdee82f0097eb3 [formerly 79cbb8d79a]]
Former-commit-id: 48aa64701649e8ab565c825ab2b63fe15c4aff21 [formerly 93458ab911]
Former-commit-id: 51e9dec1c0
2014-02-18 17:35:39 -06:00
Mike Duff
3034d493af Issue #2596 - Add check for null coordinates.
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75

Former-commit-id: a370e81065 [formerly 283b0c670c] [formerly a6509aad8c] [formerly a370e81065 [formerly 283b0c670c] [formerly a6509aad8c] [formerly 9754f0d8dd [formerly a6509aad8c [formerly 11f3705080210161e6915309a4aec423b307cce8]]]]
Former-commit-id: 9754f0d8dd
Former-commit-id: 5b1250208e [formerly 40b0540830] [formerly e476bd640b2d122cdc7d40b221ae5ec48126a502 [formerly ecb0d45b24]]
Former-commit-id: a6885defcec5abdff81a4c6c28a63f15bb094b7d [formerly 7ba61e6b53]
Former-commit-id: a4ab323833
2014-02-18 17:32:32 -06:00
Nate Jensen
776486ec44 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: 961239e181 [formerly ac0a10678b] [formerly 020d54c48a] [formerly 961239e181 [formerly ac0a10678b] [formerly 020d54c48a] [formerly b08d96b1e8 [formerly 020d54c48a [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]]
Former-commit-id: b08d96b1e8
Former-commit-id: 2f1c0109b1 [formerly 4bb0997749] [formerly cc96c8c42118f1e42ca1fd6d9fbb3290f8d9ee88 [formerly a6bb05f2e3]]
Former-commit-id: 84feaf6d94e20d2227dfe57960856e8fbe245c47 [formerly 3c9ebe52d3]
Former-commit-id: 337aa2f312
2014-02-18 14:51:13 -06:00
Ben Steffensmeier
21c5a5ebdd Issue #2672 Fix radar dataaccess from pure python.
Former-commit-id: 804bf6a8ed [formerly add98f22b1] [formerly 3e0cba04c0] [formerly 804bf6a8ed [formerly add98f22b1] [formerly 3e0cba04c0] [formerly e19b4518ef [formerly 3e0cba04c0 [formerly 8beef8db2ffe599c9167dbd61aed8243d3a0af0e]]]]
Former-commit-id: e19b4518ef
Former-commit-id: 3b183b18f0 [formerly 2be385e6b8] [formerly eab364eba85832224dcbd55f2f0ec613bcd2e297 [formerly 399e3d3f07]]
Former-commit-id: f96a1fd7e9cbf2b586a75675929cc78df919c52a [formerly 4e57fcf1f2]
Former-commit-id: 4a4ff1e02d
2014-02-18 13:57:28 -06:00
Lee Venable
4a616ecce2 Merge "Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now." into development
Former-commit-id: 03d23a194e [formerly 7f3b6413e6] [formerly adec7acc7c] [formerly 03d23a194e [formerly 7f3b6413e6] [formerly adec7acc7c] [formerly d9bccda151 [formerly adec7acc7c [formerly 81d300630a64d9077e5b3a801e722fd10de4119e]]]]
Former-commit-id: d9bccda151
Former-commit-id: 29dbb922b8 [formerly e74e805bb6] [formerly 38fb8410aa0fdfdd51deb44846ef76d8ab00f3df [formerly 8b8c5d2258]]
Former-commit-id: 5ca26817bbfc00e5ebf03a65bab9da19684a79d7 [formerly 3d2cbdcd21]
Former-commit-id: e4869a93ad
2014-02-18 12:21:30 -06:00
Ron Anderson
c96863f1ef Merge "Issue #2758 Fix MHSEmulator to pass small files" into development
Former-commit-id: 9c9696faaf [formerly fc5aa71b86] [formerly a860ff3e6e] [formerly 9c9696faaf [formerly fc5aa71b86] [formerly a860ff3e6e] [formerly 7ab79d8b3a [formerly a860ff3e6e [formerly ecece1009e1508451569b3d065e30820819a0502]]]]
Former-commit-id: 7ab79d8b3a
Former-commit-id: 317494f1c6 [formerly 5c08871d87] [formerly 166d8ede7f13b683cc58ee2b374e79c43e5d001d [formerly 33adfffab9]]
Former-commit-id: 6dffac05657e4e375e85abee7e3a35b7b37ffeb3 [formerly 97e125cbd2]
Former-commit-id: f82e2401da
2014-02-18 12:12:25 -06:00
Nate Jensen
c70fc017b8 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: d4cc8b1827 [formerly 1738248fac] [formerly c63289fa14] [formerly d4cc8b1827 [formerly 1738248fac] [formerly c63289fa14] [formerly b3c45b303c [formerly c63289fa14 [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]]]
Former-commit-id: b3c45b303c
Former-commit-id: 61ec0df1c9 [formerly 2e468e9ec1] [formerly fc277ab5e1f9070756173bf025bcb61f2b809b18 [formerly 173c646576]]
Former-commit-id: ed2b64cc655ba8b0cf51a4bb0e0c9bed28e112f0 [formerly b1dc1e8849]
Former-commit-id: 1e6b1343b0
2014-02-18 11:22:19 -06:00
Brian Clements
db121a4efb Issue #2793 improved collaboration disconnect handling
collaboration was being shutdown even though smack was trying to reconnect
changed to notify of disconnect, but not shutdown until reconnect fails


Former-commit-id: 1c8f5dd579 [formerly 9095a1584f] [formerly a28fcf0dc5] [formerly 1c8f5dd579 [formerly 9095a1584f] [formerly a28fcf0dc5] [formerly 7028f7fd4d [formerly a28fcf0dc5 [formerly 231c3cd84e3c86caba81708581be911e771aa774]]]]
Former-commit-id: 7028f7fd4d
Former-commit-id: 0d7ae9a2ff [formerly 9d9c4c7c27] [formerly e913208b8ecd6b9c2ea3cdbd0d843cace61bfdfe [formerly 510c39713f]]
Former-commit-id: 579bbaa900c71d117ad2479ec769dcf6440b16cf [formerly 3bf2a08c57]
Former-commit-id: c38397e00b
2014-02-18 11:11:33 -06:00
Brian Clements
c0da4f94d4 Issue #2756 new collaboration openfire plugin and http service
new servlet http service that communicates with openfire for configuration
new openfire plugin to reflect new http service
openfire and http service no longer need to be on same machine
moved http header parsing code from ogc to common util
updated collaboration http code to prefer XML instead of HTML


Former-commit-id: 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 68fac79fe7 [formerly f0c89ef6c6] [formerly f6b2827434] [formerly 5b4f1e8288 [formerly f6b2827434 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 74d08f1d19 [formerly 02319f36e4] [formerly 9b1edc285732dbc80b9bea2223564bca70eef005 [formerly a1d9e40bd4]]
Former-commit-id: 30b1054d786354e5944fa7b6968a4b2cddf1c07a [formerly 5889341612]
Former-commit-id: f866ac4365
2014-02-18 10:03:12 -06:00
Brian Clements
9541ad494a Issue #2755 removed subscription plugin jar from rpms
Former-commit-id: fa44883db0 [formerly 944a874c5b] [formerly d4f3fe7629] [formerly fa44883db0 [formerly 944a874c5b] [formerly d4f3fe7629] [formerly 248db98ddf [formerly d4f3fe7629 [formerly 59921407164c798a0748475d84ca0ad32bf7bfcb]]]]
Former-commit-id: 248db98ddf
Former-commit-id: b4f07d06d8 [formerly 08bffb26ca] [formerly 7166a474368c6d544978e9fc3dc6315a0b97411b [formerly 5faad2ccca]]
Former-commit-id: 7f1ad017ab813f8c9c511fb8b8dc724035f30eb3 [formerly a8dfacc21b]
Former-commit-id: fa98f1c415
2014-02-18 09:00:21 -06:00
Nate Jensen
39c0ec7c2c Merge "Issue #2751 fixed blocked icon for roster entries" into development
Former-commit-id: 35b4de0640 [formerly 0228d24f1d] [formerly e70f0d21ab] [formerly 35b4de0640 [formerly 0228d24f1d] [formerly e70f0d21ab] [formerly aa7413fd4c [formerly e70f0d21ab [formerly 4f02e79ed2211fa9e406e3bc2c633256c6e85faf]]]]
Former-commit-id: aa7413fd4c
Former-commit-id: f348686037 [formerly c3756326a6] [formerly 5d71389eedc005620646fd52ef65be20efafb64e [formerly f1b7bf1c2a]]
Former-commit-id: 8e4c99a20c5adae37d57191553a32c7be955c059 [formerly a08dea4b08]
Former-commit-id: 72a40614fb
2014-02-18 08:48:00 -06:00
Brian Clements
393036071a Issue #2751 fixed blocked icon for roster entries
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels


Former-commit-id: ab8f47413f [formerly e894019715] [formerly a94b366e26] [formerly ab8f47413f [formerly e894019715] [formerly a94b366e26] [formerly 3307f5ea5e [formerly a94b366e26 [formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]]]
Former-commit-id: 3307f5ea5e
Former-commit-id: f5a25c9030 [formerly 02d3a9ae7e] [formerly 0a4ca2ccc03c0b3bc7d6e3a7885088347d34525e [formerly 476d0c3257]]
Former-commit-id: 6d18992103101e38f58bfbe34e30a1e17a53251b [formerly 6574733eba]
Former-commit-id: df4c4af7e9
2014-02-17 17:11:36 -06:00
Brian Clements
bc8a458ec1 Issue #2800 added equals/hashcode to classes used in roster tree
tree view uses hashmap to decide if a node is new
tree was collapsing groups/sessions on refresh since it thought they were new nodes


Former-commit-id: ca8869b8ef [formerly 6d71686332] [formerly 3b5648c055] [formerly ca8869b8ef [formerly 6d71686332] [formerly 3b5648c055] [formerly 3dfd8fbafb [formerly 3b5648c055 [formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]]]
Former-commit-id: 3dfd8fbafb
Former-commit-id: 430832e3e5 [formerly 0d07e417fc] [formerly 1370e6bd4a52b34c5890edb1080fbc043e98ad05 [formerly 9dc2967e3f]]
Former-commit-id: 3ebb5f33f5ce9ac8c549c18cb180ee4d4ec6493e [formerly cd7abc37fc]
Former-commit-id: fab5759a01
2014-02-17 16:39:43 -06:00
Bryan Kowal
347439ff96 Issue #2712 - Python Overrider can now determine whether or not it is running in Jep so that the main module can be used at all times now.
Amend: add a default value for localization site in the pure overrider.

Change-Id: I6056c274a10def96ba69786b58ba284146e49160

Former-commit-id: 8493f0581f [formerly bb3a067f93] [formerly f5afe830a7] [formerly 8493f0581f [formerly bb3a067f93] [formerly f5afe830a7] [formerly e0b0d88e46 [formerly f5afe830a7 [formerly 71c960bfc67fd78d3ffee8a14005d4391f4bc2aa]]]]
Former-commit-id: e0b0d88e46
Former-commit-id: dc3c609086 [formerly b5d4574294] [formerly 0fabd8efb5af94eb16e9f5943156b46b011fbfcc [formerly d4ce52459e]]
Former-commit-id: 1f4c4d080742176ec073740e722e466292bd26b6 [formerly f5e65b5e56]
Former-commit-id: 14488904e5
2014-02-17 14:41:10 -06:00
Nate Jensen
f1bcc326a2 Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
Former-commit-id: a416577b25 [formerly 2367c79c1c] [formerly 5675869906] [formerly a416577b25 [formerly 2367c79c1c] [formerly 5675869906] [formerly f4260a617e [formerly 5675869906 [formerly ef860082c4cd6159233323b89e0b73e272224f38]]]]
Former-commit-id: f4260a617e
Former-commit-id: 7ad4c20f9c [formerly 1639f43f50] [formerly a1e31a6cfa24652c733363259ac1b8f622ca78e3 [formerly 96014c806d]]
Former-commit-id: 787c9ceff358b8246697af5f50e1b69a64f19733 [formerly e4fb5e0067]
Former-commit-id: 083a66dc4e
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
52842bed96 Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
Former-commit-id: 386b6a2499 [formerly 2cf496ca84] [formerly 937b3071d4] [formerly 386b6a2499 [formerly 2cf496ca84] [formerly 937b3071d4] [formerly ca90137801 [formerly 937b3071d4 [formerly 3f7342fc4f280180af46290b9afc7a047e16ce4a]]]]
Former-commit-id: ca90137801
Former-commit-id: 028bfc35f6 [formerly fb5b367ecc] [formerly a03c7a16df951c26dd80622d531ce31fa0468d4d [formerly 0f6f60a132]]
Former-commit-id: a78a80a74c0fd4582b22dd78f96fea8968d00e02 [formerly 47c3c6845b]
Former-commit-id: e0c97ad986
2014-02-17 14:02:57 -06:00
Nate Jensen
8dcf5a38de Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
Former-commit-id: ed76393cd8 [formerly 0fe9842582] [formerly 30632fbd84] [formerly ed76393cd8 [formerly 0fe9842582] [formerly 30632fbd84] [formerly 063d85ee22 [formerly 30632fbd84 [formerly 4778976c7175121841fc9ca69a814daf9d466c6c]]]]
Former-commit-id: 063d85ee22
Former-commit-id: 0f317fd808 [formerly 1169f85a3b] [formerly 093db405d1aefe30cccccface11ebc8d6dd8a73e [formerly 996663ccee]]
Former-commit-id: 150ccb5428947127467df703c7b7c02b85c6ddf7 [formerly a5bf31934f]
Former-commit-id: 2680629a5b
2014-02-17 11:22:53 -06:00
Max Schenkelberg
f0bb17a9ad Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc

Former-commit-id: 554e0caec5 [formerly 1de140a526] [formerly acad670229] [formerly 554e0caec5 [formerly 1de140a526] [formerly acad670229] [formerly 6a2a33abe1 [formerly acad670229 [formerly e0a5ec0a713f06eab93d86671a43334110b60b0c]]]]
Former-commit-id: 6a2a33abe1
Former-commit-id: 748a81d884 [formerly ff9fdc63b0] [formerly 7dc8449a5e82576a7bd9606d850f4cf935b98369 [formerly 91f707537b]]
Former-commit-id: 47d033372feb3f59c0ac7d3bd8fc996c8ff8caa6 [formerly d06e5fc107]
Former-commit-id: 7c8a15b609
2014-02-17 11:07:45 -06:00
Nate Jensen
0b4b1850e6 Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
Former-commit-id: fa87ba3138 [formerly 56aa06888f] [formerly 723ff23ee9] [formerly fa87ba3138 [formerly 56aa06888f] [formerly 723ff23ee9] [formerly f3d107580f [formerly 723ff23ee9 [formerly 4b48313cb3509bebcfdd79e1df3d746a2d12c6af]]]]
Former-commit-id: f3d107580f
Former-commit-id: d3c66cb748 [formerly b1c976ac17] [formerly 3c542c9dc0344fdd95a9ebb261104f938b7b0aa3 [formerly dbc420e917]]
Former-commit-id: 7a4b435c4d5fe4925d9005abfe4973b2630fb3f6 [formerly 4963b3cc23]
Former-commit-id: 256a44e1ca
2014-02-14 10:50:38 -06:00
Max Schenkelberg
c6b69c6e58 Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df

Former-commit-id: 38aae37f01 [formerly 4d656b5d06] [formerly 6309f9b34b] [formerly 38aae37f01 [formerly 4d656b5d06] [formerly 6309f9b34b] [formerly c8e93190f2 [formerly 6309f9b34b [formerly 8b3deac27c76c6827ad2ad7863f91a3b8fbe7fa4]]]]
Former-commit-id: c8e93190f2
Former-commit-id: db72c9efca [formerly b311aba5d5] [formerly 1c98b48279c1d2eb2dd2a33cad63c8a665916563 [formerly 3571135645]]
Former-commit-id: e29d9ec91d5916874942ed927bab31b9f20f3c65 [formerly d374fc9f5d]
Former-commit-id: 316e7ca511
2014-02-14 10:47:42 -06:00
Ron Anderson
a945dddecd Issue #2758 Fix MHSEmulator to pass small files
Change-Id: I760be79c1119708bdcc0ed472b575d9f88fd5707

Former-commit-id: 0f73b51155 [formerly 027cb2ef91] [formerly 4309016948] [formerly 0f73b51155 [formerly 027cb2ef91] [formerly 4309016948] [formerly acf250cf4d [formerly 4309016948 [formerly 82cf8e81625ebf809ce62b1e21b4db8d5ef0a098]]]]
Former-commit-id: acf250cf4d
Former-commit-id: c77d1c7e95 [formerly dabeb6272d] [formerly f87301a77024861d1059f1b2eeace7cf70fdcb78 [formerly d7170d1ea8]]
Former-commit-id: 54e1b8fdc2d65f02a4cd050658d7ab90532028e9 [formerly 650818a98c]
Former-commit-id: 3566e55f33
2014-02-13 15:53:15 -06:00
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