Commit graph

4990 commits

Author SHA1 Message Date
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
Nate Jensen
0c4de50218 Issue #2704 fix alertviz connectivity checks
Former-commit-id: adfb9c293456aeced60e3ab41575d8b3b0f635b8
2014-02-17 17:10:07 -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
15ff4ab5d7 Issue #2812 made getHostname() use getWsId().getHostname for consistency
and working on windows


Former-commit-id: 6e020ed9403fcd2e1c27ed9ab8443497ba645933
2014-02-17 11:58:04 -06:00
Nate Jensen
be75cc3731 Issue #2813 fix xml serialization of subscriptions
Former-commit-id: 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba
2014-02-17 11:37:48 -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
Steve Harris
267cc881a4 Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: a494febee5f45d211797843d56077ac0ef358dbf
2014-02-17 08:54:34 -06:00
Ron Anderson
fae824482b Merge "Issue #2528 Fix display of data on somewhat identical projections. Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26" into omaha_14.2.1
Former-commit-id: ddb195c3032b80221e63f21eb113eaab5d50b124
2014-02-17 08:56:48 -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
Mike Duff
ac62d322ed Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
Former-commit-id: a2dcb434e8d72e0046c6af9900e0abd093f9bcbc
2014-02-14 08:53:40 -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
Ben Steffensmeier
54a17c012d Issue #2528 Fix display of data on somewhat identical projections.
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26

Former-commit-id: dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa
2014-02-13 13:27:32 -06:00
Ron Anderson
51c9d27a39 Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
Former-commit-id: 10bbf4bf6e5be7ff8bb138113991f7292a3390b1
2014-02-13 10:46:27 -06:00
Ron Anderson
fcf45916f4 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad
2014-02-13 10:10:34 -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
Lee Venable
7099472204 Issue #2773 - added code to help prevent eclipse bug from occurring.
Former-commit-id: 7b3700b5ad07c677755844f969b5c31f31be138b
2014-02-12 13:47:20 -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
Ron Anderson
af4f8de839 Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1
Former-commit-id: caf31f2a88227c7ed9141676feb937822f4d03ce
2014-02-11 17:16:07 -06:00
Ron Anderson
a665530831 Issue #2719 Update NHA GFE domain
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: 28008b46b5d68e544dace5f721b283c222701699
2014-02-11 17:07:01 -06:00
Brian.Dyke
575e328123 14.1.1-18 baseline
Former-commit-id: a8009c4ee3effc8586b830244db8db716ec0f37c
2014-02-11 15:52:50 -05: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
43a8b80ef2 Issue #2765 Fix aliases for probability parameters.
Former-commit-id: 11bbfb8275cfafb411d1d5d9732b021f0011712a
2014-02-11 11:35:03 -06:00
Lee Venable
5c256dc19c Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
Former-commit-id: c75877624ab414c1a45bc7326c49aa99c8ec3021
2014-02-11 09:15:44 -06: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
75ca70fba6 Issue #2704 smarter thin client connectivity dialog and connection
checking

Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af

Former-commit-id: 36d571557def95e0eb1350c4e68cbe3e225f282a
2014-02-10 16:48:29 -06:00
Max Schenkelberg
7822511754 Issue #2680 fixed samplers in structs issues with GLSL spec.
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9

Former-commit-id: 4f3635fc682c2a1746e188dac0f371676c9e0be9
2014-02-10 13:43:16 -06:00
Lee Venable
27be4297e6 Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1
Former-commit-id: 213ecfda92272947cda51d9c3d00b117a3d52a76
2014-02-10 11:50:07 -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
Nate Jensen
5c7c14a6c4 Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1
Former-commit-id: 1ae3057ce4fbbb5e60b27cf21d75de72b7e00c3e
2014-02-10 09:53:41 -06:00