Brian.Dyke
a19f01c620
Merged 13.5.5 -2 and -3 into 1412
...
Former-commit-id: 4e921dbeab89e61635144b441ae0015155376c59
2014-04-24 13:01:50 -04:00
Brian Clements
f888819646
Issue #2955 ignore duplicate session invites
...
Former-commit-id: a48b12b8aaeea250680c0726f72425eac170ecd7
2014-04-24 09:25:54 -05:00
Lee Venable
df05a79d63
Issue #3040 - Fixed contact request and group name issues.
...
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e
Former-commit-id: badc9fa46aebe7f7da25c3a115294a37b30aa507
2014-04-23 18:24:25 -05:00
Nate Jensen
07fec6a69c
Issue #2623 remove ecf plugins from being included in cave
...
Change-Id: I2a822440735cee1cc7ef9e556dff3c49ae976d18
Former-commit-id: 98e3e2137ecb9ce14f8dfd295791a79a897867a2
2014-04-23 17:29:00 -05:00
Richard Peter
026575b202
Merge "Issue #2947 Fixes for derived products with multiple records per frame." into development
...
Former-commit-id: 820dfe6db6a1a7abf3c753aebe3d51ead31cd3cc
2014-04-23 17:25:25 -05:00
Ben Steffensmeier
c19d52db72
Issue #2947 Fixes for derived products with multiple records per frame.
...
Former-commit-id: f47911308acb9d0a90304233da304bdbd0d002e4
2014-04-23 17:14:02 -05:00
Ron Anderson
221a06e467
Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
...
Fixed Wx parsing for AvnFPS
Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73
Former-commit-id: e636563052042d2dbfab6a4e476b71004b28c165
2014-04-23 17:04:16 -05:00
Nate Jensen
ad6e4712d6
Merge "Issue #2822 shared display invitations always go to cave" into development
...
Former-commit-id: 2a61b602d55922e5b7f5002f794449880c2cc1a7
2014-04-23 15:30:44 -05:00
Nate Jensen
c193eac6e8
Merge "Issue #3060 safety checks for SWT widgets being disposed" into development
...
Former-commit-id: 0f33d8dfe65574db7cfbf37f7fc34393707538d3
2014-04-23 14:24:33 -05:00
Brian Clements
f3ee7b453a
Issue #2822 shared display invitations always go to cave
...
if user is logged in to a client that supports shared displays, invites always go there
behaviour unchanged if not logged into a client that supports shared displays
added better resource name than 'Smack' for cave clients
Former-commit-id: 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3
2014-04-23 14:16:42 -05:00
Lee Venable
331dc3397f
Issue #3053 - updated list selection dialog to be more configurable and fixed subset action.
...
Change-Id: Ib65472679cf5c04f8c11b8fe3fe552058d9e6986
Former-commit-id: 4554f647e0f6de78f5ade64e1371fc8d9ba6a65c
2014-04-23 14:07:29 -05:00
Brian.Dyke
2a4fe3dbae
Merge branch 'master_14.2.1' into master_14.2.2
...
Former-commit-id: 64ca88d2ed7de18f9ed1f57edd2286bbc552135f
2014-04-23 14:05:50 -04:00
Nate Jensen
426f103e7b
Issue #3060 safety checks for SWT widgets being disposed
...
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2
Former-commit-id: 0c391f8c7f1694c6939419b5fcc4a6a963092ae3
2014-04-23 12:26:27 -05:00
brian.dyke
805af72ef8
Merge branch 'master_14.3.1' into asm_14.3.1
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
Former-commit-id: 3f3c0a55218af9f27abce65c0ec3e8704485c36e
2014-04-22 16:50:57 -04:00
Nate Jensen
9ec6169646
Merge "Issue #2903 added connection tests to session close methods" into development
...
Former-commit-id: 81b95799744bd155cc0df1147bb8a5372ea2fee4
2014-04-22 12:53:08 -05:00
Nate Jensen
fe3ff669a7
Merge "Issue #3056 made venue participant equals method case insensitive" into development
...
Former-commit-id: d6f1435a902615724aed2ff0279a6deb29933ce1
2014-04-22 12:50:27 -05:00
Nate Jensen
42d0d7681d
Merge "Issue #3038 added initialized flag to session feed view" into development
...
Former-commit-id: a7f36cd46b29887c3210f45e83f83fd24f52b314
2014-04-22 12:49:02 -05:00
Brian Clements
50f3f420eb
Issue #2903 added connection tests to session close methods
...
fixes illegal state exception problem when booted from xmpp server
Former-commit-id: d570c81caed35576e867df15c2a8d900135fef5f
2014-04-22 12:36:40 -05:00
Nate Jensen
d03afcdcba
Issue #2984 remove unnecessary dependencies
...
Change-Id: I2066a1e903680068e0d25f7faa99bc7bda2b8877
Former-commit-id: 290ec544e38e71332be2072435aff3b933c649ab
2014-04-22 12:03:44 -05:00
Brian Clements
1adbf6253a
Issue #3056 made venue participant equals method case insensitive
...
needed since collaboration server lower cases room names
lower cased on creation so in memory matches what is on the server
Former-commit-id: 7a2423f4a90597706e52ce0f89bacb1a0e10f067
2014-04-22 11:55:36 -05:00
Nate Jensen
c161a2ba50
Merge "Issue #2060 dropping grid dataURI column" into development
...
Former-commit-id: d9876133fcb3975c8c7e58ff2ee75ca90dc8a0dd
2014-04-22 10:42:11 -05:00
Brian Clements
717cdf4280
Issue #3038 added initialized flag to session feed view
...
differentiates between roster population and new joins
Former-commit-id: 9b6c20ac39765120efc523c03a3d11d4b21c1748
2014-04-22 10:01:27 -05:00
Ron Anderson
8026973c95
Merge "Issue #2998 Fix regression made in earlier check in." into development
...
Former-commit-id: 2a78a1d70ab05322a8a69f96865cb3eba0fa6397
2014-04-21 17:55:22 -05:00
Nate Jensen
a37a2afe18
Issue #2060 dropping grid dataURI column
...
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e
Former-commit-id: 1aab87d9572089a09351ebdfb8fbcef884866feb
2014-04-21 17:34:39 -05:00
Ron Anderson
ed99abbb9d
Issue #2998 Fix regression made in earlier check in.
...
Change-Id: Ic7c915fef09b3398e2946d8e7688e5d2997acc71
Former-commit-id: 8c48d369b3b6af0222b541ccfa9230495d4cb0f9
2014-04-21 17:26:29 -05:00
Nate Jensen
1a617796cb
Merge "Issue #2997 Fix Geostationary projection to work with GeoTools 10.5" into development
...
Former-commit-id: 1fde0217948dad64221d0348f9e45a8e1430cdd7
2014-04-21 17:08:17 -05:00
Nate Jensen
e401fca661
Merge "Issue #2822 fixed check for topic subscription before leader transfer" into development
...
Former-commit-id: 74946a00033737aae24aabbfc333d661598cd6f2
2014-04-21 15:13:53 -05:00
Ron Anderson
665246d72e
Issue #2997 Fix Geostationary projection to work with GeoTools 10.5
...
Change-Id: Id9f3dc3af07548039509e4121cafd2e02a01453c
Former-commit-id: 2b67417e6128e3cd4cafa5c8f2ac23c10be2b300
2014-04-21 14:25:53 -05:00
Lee Venable
3c45a24efb
Issue #3041 - added dispose check to runAsync call and cleaned up code.
...
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da
Former-commit-id: ed2fc05f61861efe6c70b8fc73ad10d27bb73c12
2014-04-21 13:47:31 -05:00
Ron Anderson
750c054ab0
Merge "Issue #2998 Fixed null pointer in AttributeViewer. Improved sizing of displayAttributes." into development
...
Former-commit-id: 3038cbecf8efc76c76cdc86702986069788b6a02
2014-04-21 13:25:11 -05:00
Brian Clements
6c47c78038
Issue #2822 fixed check for topic subscription before leader transfer
...
now only checks if the bare ID (no resource) is subscribed to topic
added method to check for same ID using multiple handles
Former-commit-id: 09d7a1113a6254d8f01cf42d863e9365aac23cc7
2014-04-21 13:07:14 -05:00
Ron Anderson
811f05f164
Issue #2998 Fixed null pointer in AttributeViewer.
...
Improved sizing of displayAttributes.
Change-Id: I40b3dc486a713f6ba6ce6f5075ffce1eb6555f93
Former-commit-id: 0fac12a4f17de189a88e6dd4415f6364afc4f459
2014-04-21 13:03:50 -05:00
Lee Venable
dd7f0a82f9
Merge "Issue #2891 - Fix refresh of Utilization Graph" into development
...
Former-commit-id: 194b601d5938ba599abc5dd9e29f0a62a7713cb0
2014-04-21 12:59:00 -05:00
Nate Jensen
5c223a8ce3
Merge "Issue #2947 Improve support for Satellite combined products." into development
...
Former-commit-id: 4f1ca4c4dfeb84b582bfe7fe8375fb9f619cdd94
2014-04-21 12:39:56 -05:00
Dave Hladky
61fc2fea51
Issue #3012 Various fixes.
...
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded
Former-commit-id: 212e15c397fe22c3bc074e054d608c0094ce8dad
2014-04-21 12:26:47 -05:00
Ben Steffensmeier
043d9c8b8d
Issue #2947 Improve support for Satellite combined products.
...
Former-commit-id: 891422a7d324514d5ee82d3d195e923c27fc58ef
2014-04-21 11:57:01 -05:00
Nate Jensen
327e1ab78b
Merge "Issue #2984 remove unnecessary dependencies on edex" into development
...
Former-commit-id: 7de7469b6fa8acc42bf15a60f5096506d1cfc215
2014-04-21 11:47:10 -05:00
Ron Anderson
c2a1533ff8
Merge "Issue #3030 Avoid GeoTools Resampler2D infinite recursion." into development
...
Former-commit-id: a74c24200e9911ff4f2023d9fb1be77516b4c09a
2014-04-21 11:44:10 -05:00
Nate Jensen
2253938ed5
Issue #2984 remove unnecessary dependencies on edex
...
Change-Id: Iad6ebd93d0ec6cd3823042f8ef2653dac963c746
Former-commit-id: 39d1f72292414d008c0899dac616e76c8c0f2512
2014-04-21 11:32:41 -05:00
Mike Duff
59241fed1d
Issue #2891 - Fix refresh of Utilization Graph
...
Change-Id: Ib5fb5cb5a367459ab306dc223ab11172310d6cd8
Former-commit-id: acb92afe49544fc0a1d9f5b08c7ec2d2e8016c16
2014-04-21 10:55:43 -05:00
Brad Gonzales
3fb2835dd3
Issue #3001 Changed ccfp-common.xml to used common. Fixed version in com.raytheon.viz.aviation/META-INF/MANIFEST.MF.
...
Change-Id: I118afa785fff93251950f0f10e72979174de35cb
Former-commit-id: cd85b148b6b267779d1fe8b510f14f63c45db77a
2014-04-21 10:22:57 -05:00
Mike Duff
b288bd46de
Issue #3000 - Split bufrmos plugin into common and edex.
...
Change-Id: Id3142b8746cfb28966e7378a522e4db775dfcf37
Former-commit-id: 3fd04e796b7c409c67c06517265648e576852352
2014-04-21 09:50:18 -05:00
Nate Jensen
cdd56443f0
Merge "Issue #2955 - Made chat invitation dialogs non-modal" into development
...
Former-commit-id: f4ced5dc67106d959dd97a35e589a266fe8089ce
2014-04-21 09:29:23 -05:00
Mike Duff
ead90bc794
Issue #2955 - Made chat invitation dialogs non-modal
...
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023
Former-commit-id: bb61e3c39d5dabf7e698726f0a093d8cf4f7088a
2014-04-21 09:00:42 -05:00
Ron Anderson
76c5bb67a5
Issue #3030 Avoid GeoTools Resampler2D infinite recursion.
...
Change-Id: Ie2dc0a66e8f15648b1a76a0d54efb36795223345
Former-commit-id: 123ddd451854e93063f518b0ece746b1109df9d1
2014-04-21 08:38:52 -05:00
Brad Gonzales
1a43f04b16
Issue #3001 Renamed com.raytheon.edex.plugin.ccfp to com.raytheon.uf.edex.plugin.ccfp.
...
Amend: Updates from peer review.
Change-Id: Ib5719f711234005e021bc4d8dec899289d8b447b
Former-commit-id: 9374912aeb3e3a642d34a0aec75bcda7c707bcf9
2014-04-18 15:16:41 -05:00
Brian.Dyke
1aec3b3698
Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2
...
Former-commit-id: 178acb792036869e903beea636c7216e1d3a4f58
2014-04-17 14:42:44 -04:00
Brian.Dyke
12a482e1d7
Merged 14.2.1 -17, -18 into 1422-3
...
Former-commit-id: 712064db471de93da585f9c765bb4dfbe510df53
2014-04-17 14:42:35 -04:00
Ron Anderson
6b226db27c
Merge "Issue #2664 Fix NullPointerException when no .prj file present" into development
...
Former-commit-id: de57933506ad588c8da38a49de6a2cd5530e2091
2014-04-17 13:13:03 -05:00
Ron Anderson
f4823976f3
Issue #2664 Fix NullPointerException when no .prj file present
...
Change-Id: I2716eca6b71d79657f19feadb931a23ee3e44f4d
Former-commit-id: 66db062f94a5136902bac5cd5df8cbf30305a30a
2014-04-17 11:38:40 -05:00
