Nate Jensen
ec6d8585e1
Merge "Issue #2700 fixed subscribe request group input" into development
...
Former-commit-id: d8e2d2837e
[formerly 2643d01b74
[formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]
Former-commit-id: 2643d01b74
Former-commit-id: f2b32fa1ae
2014-02-13 14:02:55 -06:00
Brian Clements
01653c76de
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: 0ac7ff81cf
[formerly ef52908906
[formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]
Former-commit-id: ef52908906
Former-commit-id: 16ed18e0c6
2014-02-13 13:51:39 -06:00
Ron Anderson
ce72867ab9
Merge "Issue #2788 Fix topo for large areas." into omaha_14.2.1
...
Former-commit-id: 42fd9c8f9a
[formerly 51c9d27a39
[formerly 10bbf4bf6e5be7ff8bb138113991f7292a3390b1]]
Former-commit-id: 51c9d27a39
Former-commit-id: 21e95cc2f0
2014-02-13 10:46:27 -06:00
Ron Anderson
69ee4792ad
Issue #2788 Fix topo for large areas.
...
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df
Former-commit-id: 2f067699f2
[formerly fcf45916f4
[formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]
Former-commit-id: fcf45916f4
Former-commit-id: 3e78908bb5
2014-02-13 10:10:34 -06:00
Brian Clements
a0eb8342bf
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: caa8360ac7
[formerly 579f7c826d
[formerly 0c4a7915870f374cb4e728303939335cb0691c84]]
Former-commit-id: 579f7c826d
Former-commit-id: 2d72c0f475
2014-02-13 09:47:02 -06:00
Nate Jensen
1841c4f7bf
Merge "Issue #2799 fixed double click chat not working for roster entries" into development
...
Former-commit-id: 94b8b7eb04
[formerly 6093312861
[formerly 381c3f6c6585f414c27b771168746f6dd838df0c]]
Former-commit-id: 6093312861
Former-commit-id: ed87998c31
2014-02-12 17:34:27 -06:00
Brian Clements
2a687e7ac5
Issue #2799 fixed double click chat not working for roster entries
...
Former-commit-id: 9d7490a158
[formerly 1bf3a09056
[formerly 06cfbcccff89fd79efd3188c45653dce160fc90a]]
Former-commit-id: 1bf3a09056
Former-commit-id: 1e19c8d62c
2014-02-12 17:06:44 -06:00
Brian Clements
b8a1c8f56d
Issue #2797 fixed presence bug
...
a defensive copy was needed when sending presence to rooms
Former-commit-id: 23e2039028
[formerly 81ddf87b04
[formerly d0dab4bce76b45b71f4238d5a04c440cee936eaf]]
Former-commit-id: 81ddf87b04
Former-commit-id: 22031aa87d
2014-02-12 16:54:46 -06:00
Nate Jensen
1bf941fc58
Merge "Issue #2793 improved error handling for packet extension" into development
...
Former-commit-id: 5e6656581b
[formerly eec72c5956
[formerly 3ccf0beb3b0cf77c168b529d69f291b8c295cbb1]]
Former-commit-id: eec72c5956
Former-commit-id: fa42c40bc7
2014-02-12 15:06:43 -06:00
Brian Clements
87a7bf82e5
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: b0714ba659
[formerly e381edcd60
[formerly 808727ce287116be8c8e2a93ce0fc4b3a996c0ef]]
Former-commit-id: e381edcd60
Former-commit-id: 3034ac5994
2014-02-12 14:22:33 -06:00
Lee Venable
328aebb4a6
Issue #2773 - added code to help prevent eclipse bug from occurring.
...
Former-commit-id: ce08022db7
[formerly 7099472204
[formerly 7b3700b5ad07c677755844f969b5c31f31be138b]]
Former-commit-id: 7099472204
Former-commit-id: 8073fd22b1
2014-02-12 13:47:20 -06:00
Brian Clements
88db377b41
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: ddf5b2a3ef
[formerly 0765451a9d
[formerly ae5f2d2b547241e7ba9c22aabaf64fceceb1b563]]
Former-commit-id: 0765451a9d
Former-commit-id: 8f07ae2a42
2014-02-12 09:13:48 -06:00
Brian.Dyke
1f27652aa3
14.1.1-18 baseline
...
Former-commit-id: 1d6a9456b7
[formerly 575e328123
[formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]
Former-commit-id: 575e328123
Former-commit-id: f05a2220cd
2014-02-11 15:52:50 -05:00
Lee Venable
6773d174ec
Merge "Issue #2704 smarter thin client connectivity dialog and connection checking" into omaha_14.2.1
...
Former-commit-id: f078971b5d
[formerly 5c256dc19c
[formerly c75877624ab414c1a45bc7326c49aa99c8ec3021]]
Former-commit-id: 5c256dc19c
Former-commit-id: c7cfd49622
2014-02-11 09:15:44 -06:00
Nate Jensen
24bbf4949d
Issue #2704 smarter thin client connectivity dialog and connection
...
checking
Change-Id: I90d3b47ba6fa80eac2a9a6933c4038d9536830af
Former-commit-id: fd43d9e095
[formerly 75ca70fba6
[formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]
Former-commit-id: 75ca70fba6
Former-commit-id: c28085118f
2014-02-10 16:48:29 -06:00
Max Schenkelberg
7de6ff30da
Issue #2680 fixed samplers in structs issues with GLSL spec.
...
Change-Id: I2375e4c273f6cd340f253d71ae7eadc8ed9a38e9
Former-commit-id: a8a67634f9
[formerly 7822511754
[formerly 4f3635fc682c2a1746e188dac0f371676c9e0be9]]
Former-commit-id: 7822511754
Former-commit-id: 3c1fafe328
2014-02-10 13:43:16 -06:00
Lee Venable
b90abb03c1
Merge "Issue #2453 - Notification Center refactor" into omaha_14.2.1
...
Former-commit-id: 88a9d20316
[formerly 27be4297e6
[formerly 213ecfda92272947cda51d9c3d00b117a3d52a76]]
Former-commit-id: 27be4297e6
Former-commit-id: d6fa79f1a7
2014-02-10 11:50:07 -06:00
Nate Jensen
fb8ce8da65
Merge "Issue #2211 Fix data mapped sampling." into omaha_14.2.1
...
Former-commit-id: a48c1c6783
[formerly 5c7c14a6c4
[formerly 1ae3057ce4fbbb5e60b27cf21d75de72b7e00c3e]]
Former-commit-id: 5c7c14a6c4
Former-commit-id: d16d679809
2014-02-10 09:53:41 -06:00
Mike Duff
c20018d0ba
Issue #2453 - Notification Center refactor
...
Former-commit-id: 2c9d603e50
[formerly eeb78f7f20
[formerly f570a3945ad8e9e8bc4f88989a0ec10da191856a]]
Former-commit-id: eeb78f7f20
Former-commit-id: 61c57d2254
2014-02-07 16:50:50 -06:00
Ben Steffensmeier
e7baa5b186
Issue #2211 Fix data mapped sampling.
...
Former-commit-id: 3d76d6655b
[formerly 724bb85676
[formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]]
Former-commit-id: 724bb85676
Former-commit-id: d219a687c9
2014-02-07 13:00:00 -06:00
Brian Clements
6c6467d235
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: 6518b88fe5
[formerly 7d6e116b9f
[formerly 24343a796d0089824dde2f7039cdf93ed0ebf88c]]
Former-commit-id: 7d6e116b9f
Former-commit-id: 639f774567
2014-02-07 10:06:06 -06:00
David Gillingham
dc8f0dde25
Issue #2509 : Fix baseline merge breakage to ifpIMAGE.
...
Change-Id: Iff39a451b2d61c48fd3c77eda228f2812883ef00
Former-commit-id: e8ffc73893
[formerly 03d36b8309
[formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]
Former-commit-id: 03d36b8309
Former-commit-id: b12e29dd7c
2014-02-07 09:51:42 -06:00
Richard Peter
8ad3c5857b
Merge "Issue #2677 - Don't do overlap checks when updating subs to deactivated." into omaha_14.2.1
...
Former-commit-id: 36d3d21b57
[formerly 64f0cabaef
[formerly daacb19de029a15f94338c84a85116d0435f79be]]
Former-commit-id: 64f0cabaef
Former-commit-id: 82fc0a2ed3
2014-02-05 18:20:36 -06:00
Nate Jensen
6b9561855b
Merge "Issue #2672 Handle envelopes in data access requests of gridded types. Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c" into development
...
Former-commit-id: f00d4c54d8
[formerly d863bf208c
[formerly 94cf3a44a8c2942c09e8fa596f734f3a0047d37a]]
Former-commit-id: d863bf208c
Former-commit-id: d3d0dc5f77
2014-02-05 17:09:17 -06:00
Mike Duff
3691146e34
Issue #2677 - Don't do overlap checks when updating subs to deactivated.
...
Change-Id: Ia974111d9810f27ef2b073304cd248de292275bd
Former-commit-id: 6b01c2957f
[formerly 101c08818d
[formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]
Former-commit-id: 101c08818d
Former-commit-id: bafe19bbd5
2014-02-05 16:08:01 -06:00
Ben Steffensmeier
f3eebf56f5
Issue #2672 Handle envelopes in data access requests of gridded types.
...
Change-Id: I4a58e6489e2173457d50e6f3c06e2e8fffdb678c
Former-commit-id: dc5b5526a3
[formerly 9c439866d5
[formerly f634fe40e6fa7a8a3af575e79cb3d996761db983]]
Former-commit-id: 9c439866d5
Former-commit-id: b84bf8c891
2014-02-05 15:57:08 -06:00
Brian.Dyke
6d35a4b1bc
Issue #124
...
Former-commit-id: 0cc11ddfd3
[formerly 439f053309
[formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]
Former-commit-id: 439f053309
Former-commit-id: 3ba93b175e
2014-02-04 16:56:47 -05:00
Brian.Dyke
89422cef7c
Issue #83
...
Former-commit-id: fb15dd5dfb
[formerly 484119f6b0
[formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]
Former-commit-id: 484119f6b0
Former-commit-id: f2e56b268c
2014-02-04 16:32:42 -05:00
Slav Korolev
91972c1b42
Issue #2757 . Added filter for removed stations and cleaned code.
...
Change-Id: I9998cf3bd20b2ec43956284257ee3dfcb8b52534
Former-commit-id: fa59172d87
[formerly c7c40a3467
[formerly b613a9d5b7e9b1c17fa354c9c6b617da040d1d71]]
Former-commit-id: c7c40a3467
Former-commit-id: cbd17ea025
2014-02-04 15:21:22 -05:00
Mike Duff
8d92217e94
Issue #2722 - Add auto refresh to sub manager dialog
...
Former-commit-id: ab9621698f
[formerly 04ee397f2b
[formerly f678a39b37040bd637cf210f73aaef0841bda36e]]
Former-commit-id: 04ee397f2b
Former-commit-id: 227eb23157
2014-02-04 12:45:33 -06:00
Brian.Dyke
4c6eb0c001
14.1.1-17 baseline
...
Former-commit-id: 23280af290
[formerly 180d1356cd
[formerly 810229668fd7ff81b5c426161d496fc62e24b75c]]
Former-commit-id: 180d1356cd
Former-commit-id: f3d34b0c38
2014-02-04 12:33:46 -05:00
Brian Clements
ddbfe9a763
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: 6ea009a2e1
[formerly cfa3c9e0e8
[formerly 74daa7109149073c615d13c25092f6d08a77b936]]
Former-commit-id: cfa3c9e0e8
Former-commit-id: bebd62c6b6
2014-02-03 15:34:58 -06:00
Lee Venable
39021a203a
Merge "Issue #2757 . Fixed issues in Area Configuration Dialogs." into development
...
Former-commit-id: c44b120176
[formerly 19b883a407
[formerly ecb833d823cf072f4e02b312fe320c2ade5162a2]]
Former-commit-id: 19b883a407
Former-commit-id: 72a4a12e89
2014-02-03 14:31:28 -06:00
Ben Steffensmeier
fc0d044bd9
Issue #2764 Ensure GFEGridResource gets added to procedure xml context, fix gridded displays work for all float buffers.
...
Change-Id: I50ff9be715357b6719d083de411f31c1a3e05834
Former-commit-id: 97a64f89f1
[formerly 8865177c6b
[formerly 10d1070016b9a8a960f15e5dcf316d4f2aee5e90]]
Former-commit-id: 8865177c6b
Former-commit-id: 921401ffe9
2014-02-03 14:07:07 -06:00
Brian Clements
83d6ca0855
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: 16c1aaed3e
[formerly 1ff4ed1ae9
[formerly f10f42753c541d4003b4c67a84a1d50e033941d3]]
Former-commit-id: 1ff4ed1ae9
Former-commit-id: 21c75d1d01
2014-02-03 12:59:57 -06:00
Everett Kladstrup
aac0fd726e
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: 80ad25754b
[formerly bd50a38d87
[formerly 604ae156f8b235e2e1736863b419547289403240]]
Former-commit-id: bd50a38d87
Former-commit-id: 90df04614d
2014-02-03 09:02:58 -06:00
Slav Korolev
7b3702c186
Issue #2757 . Fixed issues in Area Configuration Dialogs.
...
Change-Id: Ic3d3d5c41df6c8d80aac8e434e4c42a5ef9d1ecf
Former-commit-id: a768f540f0
[formerly ea573d2c30
[formerly 81826338bda946aff4ac8a7b9ea83c2eb72397d5]]
Former-commit-id: ea573d2c30
Former-commit-id: 6013121a99
2014-02-03 09:50:01 -05:00
Brian Clements
dc59e8fa2d
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: b0402be1d3
[formerly b88eaeb73e
[formerly 4d860337ea821975b6ddb4846f102199347a4dcc]]
Former-commit-id: b88eaeb73e
Former-commit-id: 7176bf59b8
2014-01-31 13:10:35 -06:00
Nate Jensen
1b845abe22
Merge "Issue #2312 Java 6 compatibility, fix legend menus." into development
...
Former-commit-id: 0f1f50650c
[formerly 62f86b0a02
[formerly 4bd377297daea932f4907f7119208461f7f79281]]
Former-commit-id: 62f86b0a02
Former-commit-id: 6112fd394c
2014-01-31 12:00:00 -06:00
Nate Jensen
d83c0b2e99
Merge "Issue #2698 added handles to venues" into development
...
Former-commit-id: 50da1236dd
[formerly 4a3c89c722
[formerly 0e6750826ed7f36e92a6cd451138bc3562149aad]]
Former-commit-id: 4a3c89c722
Former-commit-id: 003e6bf0d2
2014-01-31 11:59:34 -06:00
Brian Clements
bd410b2529
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: 3250eb34f5
[formerly 3e585945d6
[formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]
Former-commit-id: 3e585945d6
Former-commit-id: 4e2cb3f7ae
2014-01-31 09:44:31 -06:00
Bryan Kowal
0e89136215
Issue #2754 - fix ant xpath error; gfe is now dependent on kml (unrelated to this change)
...
Former-commit-id: 678fb83ded
[formerly 6fd129379f
[formerly e027cf42b3b395a834f91512e269e41377f673ef]]
Former-commit-id: 6fd129379f
Former-commit-id: 6e19ac4acf
2014-01-30 18:11:48 -06:00
Ben Steffensmeier
17e58bb339
Issue #2312 Java 6 compatibility, fix legend menus.
...
Former-commit-id: fe5f0118da
[formerly 7ab61aaa23
[formerly 2853536477d39459de3cbb4eef7670734cfad5f8]]
Former-commit-id: 7ab61aaa23
Former-commit-id: 27fbb0f870
2014-01-30 16:12:10 -06:00
Bryan Kowal
54d0d4fd55
Issue #2754 - now more accomodative for the com.raytheon.uf.viz.application.feature feature dependency
...
Former-commit-id: ee95e4de7e
[formerly d88019d902
[formerly 5e007018d1cd6064ba114d92d3943e23d8c3e17e]]
Former-commit-id: d88019d902
Former-commit-id: 635548dae3
2014-01-29 14:25:38 -06:00
Ron Anderson
a0e9e35891
Merge "Issue #2703 Hook GFEResource into KML Export. Change-Id: I3baeb829dec4fa650fa9cb86e4fe602b6ad47963" into development
...
Former-commit-id: f4f89c79a2
[formerly 61f35e86ec
[formerly a3ea22b1db8418f5367b6ffa029f9aa159003398]]
Former-commit-id: 61f35e86ec
Former-commit-id: d0e821e5d1
2014-01-29 14:24:26 -06:00
Nate Jensen
ab82a7fdb2
Merge "Issue #2698 made sessions private and invite only" into development
...
Former-commit-id: 004999bbec
[formerly 52c3b71049
[formerly db4447bf109981ded541bff929687040cc28953a]]
Former-commit-id: 52c3b71049
Former-commit-id: 1977b026ee
2014-01-29 11:01:45 -06:00
Brian Clements
190400fc34
Issue #2698 made sessions private and invite only
...
removed venue info because you can't get it for private rooms
improved error handling for existing room when attempting to create
fixed default compression config
Former-commit-id: 5b9f694930
[formerly c498307b30
[formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]
Former-commit-id: c498307b30
Former-commit-id: 1f1be20d41
2014-01-29 10:16:15 -06:00
Max Schenkelberg
b63edcc8a7
Issue #2680 Fixed various OpenGL errors
...
Change-Id: I7ed70adcb1591a9feb66a4fe80c3249f2e6b339b
(cherry picked from commit 037cd48c62
[formerly 5d488d27b9
] [formerly 83c600ada9
] [formerly f4765d1577
[formerly 83c600ada9
[formerly 59d4c2b9965a7c208863af8f5a3ba4145ea2bbf4]]])
Former-commit-id: d566ed9927
[formerly 0c840cf724
[formerly 6c3817256b4cf6b5deca8d73d0df1d1f89b4ea82]]
Former-commit-id: 0c840cf724
Former-commit-id: 122c3442f8
2014-01-29 10:15:38 -06:00
Steve Harris
f562540e7c
Merge branch 'omaha_14.2.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.application/src/com/raytheon/uf/viz/application/VizApplication.java
Former-commit-id: 1aea63a1f6
[formerly 1738185503
[formerly d1fb8bcf1780b94bf23ce60dc4a6e0a10b37fe45]]
Former-commit-id: 1738185503
Former-commit-id: 14ba3b29f4
2014-01-29 09:41:57 -06:00
Greg Armendariz
ddf3e9785f
Issue #2754 - Remove extra character
...
Former-commit-id: 1017abdc78
[formerly 9cc089b369
[formerly 5979ad555987210e07e32eb5336e7cb427ac06c3]]
Former-commit-id: 9cc089b369
Former-commit-id: 6ff868a167
2014-01-29 08:43:09 -06:00