Commit graph

4752 commits

Author SHA1 Message Date
Brian Clements
dc074a9650 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: 453604eca5fca9e5d14ba1842dc7f76f1e0180ca
2014-02-19 08:32:26 -06:00
Lee Venable
6e60748b41 Merge "Issue #2596 - Add check for null coordinates." into development
Former-commit-id: e3517f5144c386038c4d535d79e62ec02d504f9f
2014-02-18 18:08:10 -06:00
Nate Jensen
698a4f827d Merge "Issue #2672 Fix radar dataaccess from pure python." into development
Former-commit-id: 6c8fba6afd4b5e28b425b6058e40130a1dd0b518
2014-02-18 17:35:39 -06:00
Mike Duff
a6509aad8c Issue #2596 - Add check for null coordinates.
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75

Former-commit-id: 11f3705080210161e6915309a4aec423b307cce8
2014-02-18 17:32:32 -06:00
Nate Jensen
020d54c48a Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: e483f4311d00726f023d30e6d3f4e813c559390e
2014-02-18 14:51:13 -06:00
Ben Steffensmeier
3e0cba04c0 Issue #2672 Fix radar dataaccess from pure python.
Former-commit-id: 8beef8db2ffe599c9167dbd61aed8243d3a0af0e
2014-02-18 13:57:28 -06:00
Lee Venable
adec7acc7c 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: 81d300630a64d9077e5b3a801e722fd10de4119e
2014-02-18 12:21:30 -06:00
Ron Anderson
a860ff3e6e Merge "Issue #2758 Fix MHSEmulator to pass small files" into development
Former-commit-id: ecece1009e1508451569b3d065e30820819a0502
2014-02-18 12:12:25 -06:00
Nate Jensen
c63289fa14 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: bf0a607b05ffb042e998d2c9940091137da21dc0
2014-02-18 11:22:19 -06:00
Brian Clements
a28fcf0dc5 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: 231c3cd84e3c86caba81708581be911e771aa774
2014-02-18 11:11:33 -06:00
Brian Clements
f6b2827434 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: ff23569984eee43927c10ca041ca7e0ca4d40a3b
2014-02-18 10:03:12 -06:00
Brian Clements
d4f3fe7629 Issue #2755 removed subscription plugin jar from rpms
Former-commit-id: 59921407164c798a0748475d84ca0ad32bf7bfcb
2014-02-18 09:00:21 -06:00
Nate Jensen
e70f0d21ab Merge "Issue #2751 fixed blocked icon for roster entries" into development
Former-commit-id: 4f02e79ed2211fa9e406e3bc2c633256c6e85faf
2014-02-18 08:48:00 -06:00
Brian Clements
a94b366e26 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: 7f3a2f5e631176426ece6384719f3b1c9b00105a
2014-02-17 17:11:36 -06:00
Brian Clements
3b5648c055 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: 9a4b091f7e2655f48fd061021d161c4eb2e63dd8
2014-02-17 16:39:43 -06:00
Bryan Kowal
f5afe830a7 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: 71c960bfc67fd78d3ffee8a14005d4391f4bc2aa
2014-02-17 14:41:10 -06:00
Nate Jensen
5675869906 Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
Former-commit-id: ef860082c4cd6159233323b89e0b73e272224f38
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
937b3071d4 Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
Former-commit-id: 3f7342fc4f280180af46290b9afc7a047e16ce4a
2014-02-17 14:02:57 -06:00
Nate Jensen
30632fbd84 Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
Former-commit-id: 4778976c7175121841fc9ca69a814daf9d466c6c
2014-02-17 11:22:53 -06:00
Max Schenkelberg
acad670229 Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc

Former-commit-id: e0a5ec0a713f06eab93d86671a43334110b60b0c
2014-02-17 11:07:45 -06:00
Nate Jensen
723ff23ee9 Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
Former-commit-id: 4b48313cb3509bebcfdd79e1df3d746a2d12c6af
2014-02-14 10:50:38 -06:00
Max Schenkelberg
6309f9b34b Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df

Former-commit-id: 8b3deac27c76c6827ad2ad7863f91a3b8fbe7fa4
2014-02-14 10:47:42 -06:00
Ron Anderson
4309016948 Issue #2758 Fix MHSEmulator to pass small files
Change-Id: I760be79c1119708bdcc0ed472b575d9f88fd5707

Former-commit-id: 82cf8e81625ebf809ce62b1e21b4db8d5ef0a098
2014-02-13 15:53:15 -06:00
Nate Jensen
e05f1eae96 Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: cd0a838d34c9d7533bf59a477a17f4cb1af75a00
2014-02-13 15:35:53 -06:00
Nate Jensen
2643d01b74 Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: af0e70e20c2a5ca276e9b819285d34c0113cafe7
2014-02-13 14:02:55 -06:00
Nate Jensen
ee5b9b65bf Merge "Issue #2751 user identity refactor" into development
Former-commit-id: f652f28862822a0fd063a173fbb323b4b16394fb
2014-02-13 14:01:53 -06:00
Brian Clements
ef52908906 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: e91ae6eacf4af9e25afc213c3cd0c269c8d465f4
2014-02-13 13:51:39 -06:00
Brian Clements
579f7c826d 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: 0c4a7915870f374cb4e728303939335cb0691c84
2014-02-13 09:47:02 -06:00
Ben Steffensmeier
41983df7a0 Issue #2672 Fix problems encountered in data access layer.
Former-commit-id: ec95d1af0696b1f9b0b105143e26ea40937b28a8
2014-02-12 18:37:02 -06:00
Nate Jensen
6093312861 Merge "Issue #2799 fixed double click chat not working for roster entries" into development
Former-commit-id: 381c3f6c6585f414c27b771168746f6dd838df0c
2014-02-12 17:34:27 -06:00
Nate Jensen
b79e5e02f9 Merge "Issue #2648 Add AlertMessage output. Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e" into development
Former-commit-id: 42e771181972a04c898c6fe30f8b1c6b70cedafd
2014-02-12 17:34:15 -06:00
Ben Steffensmeier
f45ec64979 Issue #2648 Add AlertMessage output.
Change-Id: I34818b15ce9a85c3b58b2475a0b1e94a596bf06e

Former-commit-id: 47826e8d3e4570c9f970fc30f5dac462611b91bf
2014-02-12 17:08:23 -06:00
Brian Clements
1bf3a09056 Issue #2799 fixed double click chat not working for roster entries
Former-commit-id: 06cfbcccff89fd79efd3188c45653dce160fc90a
2014-02-12 17:06:44 -06:00
Brian Clements
81ddf87b04 Issue #2797 fixed presence bug
a defensive copy was needed when sending presence to rooms


Former-commit-id: d0dab4bce76b45b71f4238d5a04c440cee936eaf
2014-02-12 16:54:46 -06:00
Richard Peter
70e9bef750 Merge "Issue #2655 fix textlightning distribution regex" into development
Former-commit-id: b1ba10c3b69187b762c962801a937adeb6ef5867
2014-02-12 15:34:43 -06:00
Nate Jensen
eec72c5956 Merge "Issue #2793 improved error handling for packet extension" into development
Former-commit-id: 3ccf0beb3b0cf77c168b529d69f291b8c295cbb1
2014-02-12 15:06:43 -06:00
Nate Jensen
a6c562d3f0 Issue #2655 fix textlightning distribution regex
Change-Id: Ia8900e8baa05d831c984fbf355034ca189364d99

Former-commit-id: 48825cb03da5bde6f8b1252fe2e366119535f8f3
2014-02-12 15:03:45 -06:00
Brian Clements
e381edcd60 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: 808727ce287116be8c8e2a93ce0fc4b3a996c0ef
2014-02-12 14:22:33 -06:00
Brian Clements
0765451a9d 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: ae5f2d2b547241e7ba9c22aabaf64fceceb1b563
2014-02-12 09:13:48 -06:00
Slav Korolev
43802c3a5f Issue #2763. Made LFCR correction of input data.
Former-commit-id: ea2d524767ea5eef74cda5fa5fbff886da1d3bc9
2014-02-11 14:48:07 -05:00
Ben Steffensmeier
3d08979eee Issue #2672 Allow One extra null byte in RemoteRequestRouteWrapper.
Former-commit-id: 7463bf7c3efbdf8eb184f24bfc9c6a12c57d5006
2014-02-10 17:39:32 -06:00
Nate Jensen
93c84e2f95 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: 30172e9189354a7be4581dfcf8c519dfdf7b8e8e
2014-02-10 11:26:10 -06:00
Matt Nash
4252e58992 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: a1ca74f1b2ad0176ab38e4a41bb7df62e06cc0c1
2014-02-10 08:40:25 -06:00
Brian Clements
7d6e116b9f 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: 24343a796d0089824dde2f7039cdf93ed0ebf88c
2014-02-07 10:06:06 -06:00
Ben Steffensmeier
25ad0e327c Issue #2672 Handle envelopes in data access requests of points and lightning.
Change-Id: Id9a56e9f8027a2f489561c241e2f34dd92dce400

Former-commit-id: efe32c8302834b1c53a5f65850aff8f12437d3bb
2014-02-06 14:04:14 -06:00
Ben Steffensmeier
97eef922ef Issue #2672 Fix serialization of jts envelopes.
Former-commit-id: 42b0e215a3e2bfe4ca8d789f025c49d8f35f6a6c
2014-02-06 11:27:07 -06:00
Nate Jensen
d863bf208c Merge "Issue #2672 Handle envelopes in data access requests of gridded types. Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c" into development
Former-commit-id: 94cf3a44a8c2942c09e8fa596f734f3a0047d37a
2014-02-05 17:09:17 -06:00
Ben Steffensmeier
9c439866d5 Issue #2672 Handle envelopes in data access requests of gridded types.
Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c

Former-commit-id: f634fe40e6fa7a8a3af575e79cb3d996761db983
2014-02-05 15:57:08 -06:00
Slav Korolev
c7c40a3467 Issue #2757. Added filter for removed stations and cleaned code.
Change-Id: I9998cf3bd20b2ec43956284257ee3dfcb8b52534

Former-commit-id: b613a9d5b7e9b1c17fa354c9c6b617da040d1d71
2014-02-04 15:21:22 -05:00
Brian Clements
cfa3c9e0e8 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: 74daa7109149073c615d13c25092f6d08a77b936
2014-02-03 15:34:58 -06:00