Ben Steffensmeier
e0c97ad986
Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
...
Former-commit-id: 2cf496ca84937b3071d42cf496ca84937b3071d4ca90137801ca90137801fb5b367ecc0f6f60a13247c3c6845b
2014-02-17 14:02:57 -06:00
Nate Jensen
695d03b815
Issue #2812 made getHostname() use getWsId().getHostname for consistency
...
and working on windows
Former-commit-id: c8e70cd6b115ff4ab5d7c8e70cd6b115ff4ab5d72486e391922486e39192b801b36ca70314d61773e6dae7a23c
2014-02-17 11:58:04 -06:00
Nate Jensen
2680629a5b
Merge "Issue #2804 Fixed non-managed indicies in GLGeometryObject2D" into development
...
Former-commit-id: 0fe984258230632fbd840fe984258230632fbd84063d85ee22063d85ee221169f85a3b996663cceea5bf31934f
2014-02-17 11:22:53 -06:00
Max Schenkelberg
7c8a15b609
Issue #2804 Fixed non-managed indicies in GLGeometryObject2D
...
Change-Id: Iaf789050c28a94747e182150a2fcabb36f8b99cc
Former-commit-id: 1de140a526acad6702291de140a526acad6702296a2a33abe16a2a33abe1ff9fdc63b091f707537bd06e5fc107
2014-02-17 11:07:45 -06:00
Steve Harris
7805eac857
Merge branch 'master_14.2.1' into omaha_14.2.1
...
Former-commit-id: d0352c69d4267cc881a4d0352c69d4267cc881a49fcc5ad9309fcc5ad930146412a8bde115197bb728aa3dd195
2014-02-17 08:54:34 -06:00
Nate Jensen
256a44e1ca
Merge "Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D" into development
...
Former-commit-id: 56aa06888f723ff23ee956aa06888f723ff23ee9f3d107580ff3d107580fb1c976ac17dbc420e9174963b3cc23
2014-02-14 10:50:38 -06:00
Max Schenkelberg
316e7ca511
Issue #2804 Moved wireframe shape clipping to JTSCompiler from GLGeometryObject2D
...
Change-Id: Ibddb69f78873ed26015c0bc2fb973279154032df
Former-commit-id: 4d656b5d066309f9b34b4d656b5d066309f9b34bc8e93190f2c8e93190f2b311aba5d53571135645d374fc9f5d
2014-02-14 10:47:42 -06:00
Mike Duff
fe38928d33
Issue #2806 - Disable activate/deactivate buttons when viewing subscriptions from another site.
...
Former-commit-id: 43ea3b0918ac62d322ed43ea3b0918ac62d322ed346dc4afff346dc4afff6601dff4835b3a55d11fc5f33b0ed0
2014-02-14 08:53:40 -06:00
Nate Jensen
65068869e1
Issue #2751 first cut of transfer leadership
...
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9
Former-commit-id: 63d5f94cbbe05f1eae9663d5f94cbbe05f1eae96a85575a763a85575a763139479b4e111fb06810f70285796ac
2014-02-13 15:35:53 -06:00
Nate Jensen
1aeeeffb0d
Merge "Issue #2700 fixed subscribe request group input" into development
...
Former-commit-id: f2b32fa1ae2643d01b74f2b32fa1ae2643d01b74d8e2d2837ed8e2d2837e1f3c4090a0b31470f7e33fb847a74c
2014-02-13 14:02:55 -06:00
Brian Clements
aa06f65038
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: 16ed18e0c6ef5290890616ed18e0c6ef529089060ac7ff81cf0ac7ff81cfe6de3a118d3ec3ad05431cc21dc160
2014-02-13 13:51:39 -06:00
Ron Anderson
3598139635
Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
...
Former-commit-id: 21e95cc2f051c9d27a3921e95cc2f051c9d27a3942fd9c8f9a42fd9c8f9aca11555427b84a83eb6f828738b81f
2014-02-13 10:46:27 -06:00
Ron Anderson
7447a71c10
Issue #2788 Fix topo for large areas.
...
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 3e78908bb5fcf45916f43e78908bb5fcf45916f42f067699f22f067699f2d9b82b4ebe2d7c87ac84d298aabe40
2014-02-13 10:10:34 -06:00
Brian Clements
a3157035bc
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: 2d72c0f475579f7c826d2d72c0f475579f7c826dcaa8360ac7caa8360ac746ea69990dbafe2972a48b618ea95b
2014-02-13 09:47:02 -06:00
Nate Jensen
5771b557ef
Merge "Issue #2799 fixed double click chat not working for roster entries" into development
...
Former-commit-id: ed87998c316093312861ed87998c31609331286194b8b7eb0494b8b7eb04f53e9523f3b9e027059f78f8a9fbe3
2014-02-12 17:34:27 -06:00
Brian Clements
2b421aadcb
Issue #2799 fixed double click chat not working for roster entries
...
Former-commit-id: 1e19c8d62c1bf3a090561e19c8d62c1bf3a090569d7490a1589d7490a158667a1450cff22268295e5b95f2a058
2014-02-12 17:06:44 -06:00
Brian Clements
e286a68dc1
Issue #2797 fixed presence bug
...
a defensive copy was needed when sending presence to rooms
Former-commit-id: 22031aa87d81ddf87b0422031aa87d81ddf87b0423e203902823e2039028a1ba9c6b9d09859bdee957dd054176
2014-02-12 16:54:46 -06:00
Nate Jensen
0f89907aaf
Merge "Issue #2793 improved error handling for packet extension" into development
...
Former-commit-id: fa42c40bc7eec72c5956fa42c40bc7eec72c59565e6656581b5e6656581bbac84c698f7247d692026e33812072
2014-02-12 15:06:43 -06:00
Brian Clements
f23e9fcea0
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: 3034ac5994e381edcd603034ac5994e381edcd60b0714ba659b0714ba659b94bc84429440647787773241ebeb7
2014-02-12 14:22:33 -06:00
Lee Venable
3a195bd22e
Issue #2773 - added code to help prevent eclipse bug from occurring.
...
Former-commit-id: 8073fd22b170994722048073fd22b17099472204ce08022db7ce08022db7a7302a3232c74ae6b83d5ae2a544ca
2014-02-12 13:47:20 -06:00
Brian Clements
2fc99f92ee
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: 8f07ae2a420765451a9d8f07ae2a420765451a9dddf5b2a3efddf5b2a3ef9c67bcbbcffab4fea1778e9f1136ae
2014-02-12 09:13:48 -06:00
Brian.Dyke
f47dd3ef59
14.1.1-18 baseline
...
Former-commit-id: f05a2220cd575e328123f05a2220cd575e3281231d6a9456b71d6a9456b7d61ae6c5f4c5857c30f2d1db845406
2014-02-11 15:52:50 -05:00
Lee Venable
c1543acd86
Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
...
Former-commit-id: c7cfd496225c256dc19cc7cfd496225c256dc19cf078971b5df078971b5dab6fab419942fdfa496422aab74e8d
2014-02-11 09:15:44 -06:00
Nate Jensen
93a740106d
Issue #2704 smarter thin client connectivity dialog and connection
...
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: c28085118f75ca70fba6c28085118f75ca70fba6fd43d9e095fd43d9e095c0256ac19e21119894979e09da8bb6
2014-02-10 16:48:29 -06:00
Max Schenkelberg
560bc77a16
Issue #2680 fixed samplers in structs issues with GLSL spec.
...
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9
Former-commit-id: 3c1fafe32878225117543c1fafe3287822511754a8a67634f9a8a67634f9dd872433c7e2e9eaaf359d6d418d48
2014-02-10 13:43:16 -06:00
Lee Venable
1a8f530d0d
Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1
...
Former-commit-id: d6fa79f1a727be4297e6d6fa79f1a727be4297e688a9d2031688a9d2031665e6fa1963d975dcf01e78df434dba
2014-02-10 11:50:07 -06:00
Nate Jensen
2effa29507
Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1
...
Former-commit-id: d16d6798095c7c14a6c4d16d6798095c7c14a6c4a48c1c6783a48c1c67833047063c6e57aa6788839459523de9
2014-02-10 09:53:41 -06:00
Mike Duff
a87ce0b532
Issue #2453 - Notification Center refactor
...
Former-commit-id: 61c57d2254eeb78f7f2061c57d2254eeb78f7f202c9d603e502c9d603e507535b51fe74a87525df0f005aa3d8d
2014-02-07 16:50:50 -06:00
Ben Steffensmeier
eb65002cf6
Issue #2211 Fix data mapped sampling.
...
Former-commit-id: d219a687c9724bb85676d219a687c9724bb856763d76d6655b3d76d6655ba37a910f676a95dd6242a8c075d7e3
2014-02-07 13:00:00 -06:00
Brian Clements
27f19f406a
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: 639f7745677d6e116b9f639f7745677d6e116b9f6518b88fe56518b88fe56efb4f51d28742be3a13014b59e1a1
2014-02-07 10:06:06 -06:00
David Gillingham
e20060f1da
Issue #2509 : Fix baseline merge breakage to ifpIMAGE.
...
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00
Former-commit-id: b12e29dd7c03d36b8309b12e29dd7c03d36b8309e8ffc73893e8ffc73893ad8c40032f94ec272ab206d68cc0be
2014-02-07 09:51:42 -06:00
Richard Peter
8471e5dd46
Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
...
Former-commit-id: 82fc0a2ed364f0cabaef82fc0a2ed364f0cabaef36d3d21b5736d3d21b57c3c1205848c965993d1715c2f761be
2014-02-05 18:20:36 -06:00
Nate Jensen
1399fdd421
Merge "Issue #2672 Handle envelopes in data access requests of gridded types. Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c" into development
...
Former-commit-id: d3d0dc5f77d863bf208cd3d0dc5f77d863bf208cf00d4c54d8f00d4c54d839c9dda92b8feed9aadfe342242032
2014-02-05 17:09:17 -06:00
Mike Duff
377beb33a8
Issue #2677 - Don't do overlap checks when updating subs to deactivated.
...
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd
Former-commit-id: bafe19bbd5101c08818dbafe19bbd5101c08818d6b01c2957f6b01c2957f9edf5912186a2f75e8d5bb43ec00b1
2014-02-05 16:08:01 -06:00
Ben Steffensmeier
1619859812
Issue #2672 Handle envelopes in data access requests of gridded types.
...
Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c
Former-commit-id: b84bf8c8919c439866d5b84bf8c8919c439866d5dc5b5526a3dc5b5526a35b7cf3caec02a087464670cbd6c61d
2014-02-05 15:57:08 -06:00
Brian.Dyke
4b9bccad66
Issue #124
...
Former-commit-id: 3ba93b175e439f0533093ba93b175e439f0533090cc11ddfd30cc11ddfd3e1d788683d90b4e7ebf0ff2ccb40e4
2014-02-04 16:56:47 -05:00
Brian.Dyke
42e17bf5f3
Issue #83
...
Former-commit-id: f2e56b268c484119f6b0f2e56b268c484119f6b0fb15dd5dfbfb15dd5dfb3c160bb05ef088dab5ef870b355263
2014-02-04 16:32:42 -05:00
Slav Korolev
bd2141d123
Issue #2757 . Added filter for removed stations and cleaned code.
...
Change-Id: I9998cf3bd20b2ec43956284257ee3dfcb8b52534
Former-commit-id: cbd17ea025c7c40a3467cbd17ea025c7c40a3467fa59172d87fa59172d87aea166d7b94ec22d953065ea06a366
2014-02-04 15:21:22 -05:00
Mike Duff
267f0aac0b
Issue #2722 - Add auto refresh to sub manager dialog
...
Former-commit-id: 227eb2315704ee397f2b227eb2315704ee397f2bab9621698fab9621698ff7566298b2e984863c1cbb919f7d09
2014-02-04 12:45:33 -06:00
Brian.Dyke
b8f7317b9d
14.1.1-17 baseline
...
Former-commit-id: f3d34b0c38180d1356cdf3d34b0c38180d1356cd23280af29023280af290f1cc9d6ee2947ec5fd96948fffa361
2014-02-04 12:33:46 -05:00
Brian Clements
cd1b7dec1b
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: bebd62c6b6cfa3c9e0e8bebd62c6b6cfa3c9e0e86ea009a2e16ea009a2e1bc75d43bc3aff354a3d79370df47fe
2014-02-03 15:34:58 -06:00
Lee Venable
c483877308
Merge "Issue #2757 . Fixed issues in Area Configuration Dialogs." into development
...
Former-commit-id: 72a4a12e8919b883a40772a4a12e8919b883a407c44b120176c44b1201763e3805e1a715f94a61b5e65a289e97
2014-02-03 14:31:28 -06:00
Ben Steffensmeier
f81c6dd1b9
Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
...
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834
Former-commit-id: 921401ffe98865177c6b921401ffe98865177c6b97a64f89f197a64f89f11f343429482be72739b5d05d31fa34
2014-02-03 14:07:07 -06:00
Brian Clements
592cf33f35
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: 21c75d1d011ff4ed1ae921c75d1d011ff4ed1ae916c1aaed3e16c1aaed3e2f60d1b5797c867338c8671bfaa75c
2014-02-03 12:59:57 -06:00
Everett Kladstrup
3c30f65980
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: 90df04614dbd50a38d8790df04614dbd50a38d8780ad25754b80ad25754b40b796f59b415ccd78fb57f9230654
2014-02-03 09:02:58 -06:00
Slav Korolev
559d0f9499
Issue #2757 . Fixed issues in Area Configuration Dialogs.
...
Change-Id: Ic3d3d5c41df6c8d80aac8e434e4c42a5ef9d1ecf
Former-commit-id: 6013121a99ea573d2c306013121a99ea573d2c30a768f540f0a768f540f0d2d4672a466d9a066c36baf598a6ff
2014-02-03 09:50:01 -05:00
Brian Clements
f2a97eb00e
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: 7176bf59b8b88eaeb73e7176bf59b8b88eaeb73eb0402be1d3b0402be1d39210aae10ab651ada4b37e1425c419
2014-01-31 13:10:35 -06:00
Nate Jensen
21dcf31757
Merge "Issue #2312 Java 6 compatibility, fix legend menus." into development
...
Former-commit-id: 6112fd394c62f86b0a026112fd394c62f86b0a020f1f50650c0f1f50650c38eb172fce22190c55f07dedc1ad8d
2014-01-31 12:00:00 -06:00
Nate Jensen
19bc148a55
Merge "Issue #2698 added handles to venues" into development
...
Former-commit-id: 003e6bf0d24a3c89c722003e6bf0d24a3c89c72250da1236dd50da1236dd49410a7e5387d49a2b1cb9130e5e22
2014-01-31 11:59:34 -06:00
Brian Clements
cf8b85f3d2
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: 4e2cb3f7ae3e585945d64e2cb3f7ae3e585945d63250eb34f53250eb34f54190b13ae24f4d5c5d69e04cb11154
2014-01-31 09:44:31 -06:00
