Commit graph

2718 commits

Author SHA1 Message Date
Mike Duff
a4ab323833 Issue #2596 - Add check for null coordinates.
Change-Id: I18f7a129ec428e51b36ac5b76cae194cf2c01e75

Former-commit-id: 283b0c670c [formerly a6509aad8c] [formerly 283b0c670c [formerly a6509aad8c] [formerly 9754f0d8dd [formerly 11f3705080210161e6915309a4aec423b307cce8]]]
Former-commit-id: 9754f0d8dd
Former-commit-id: 40b0540830 [formerly ecb0d45b24]
Former-commit-id: 7ba61e6b53
2014-02-18 17:32:32 -06:00
Nate Jensen
337aa2f312 Merge "Issue #2756 new collaboration openfire plugin and http service" into development
Former-commit-id: ac0a10678b [formerly 020d54c48a] [formerly ac0a10678b [formerly 020d54c48a] [formerly b08d96b1e8 [formerly e483f4311d00726f023d30e6d3f4e813c559390e]]]
Former-commit-id: b08d96b1e8
Former-commit-id: 4bb0997749 [formerly a6bb05f2e3]
Former-commit-id: 3c9ebe52d3
2014-02-18 14:51:13 -06:00
Nate Jensen
1e6b1343b0 Merge "Issue #2793 improved collaboration disconnect handling" into development
Former-commit-id: 1738248fac [formerly c63289fa14] [formerly 1738248fac [formerly c63289fa14] [formerly b3c45b303c [formerly bf0a607b05ffb042e998d2c9940091137da21dc0]]]
Former-commit-id: b3c45b303c
Former-commit-id: 2e468e9ec1 [formerly 173c646576]
Former-commit-id: b1dc1e8849
2014-02-18 11:22:19 -06:00
Brian Clements
c38397e00b 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: 9095a1584f [formerly a28fcf0dc5] [formerly 9095a1584f [formerly a28fcf0dc5] [formerly 7028f7fd4d [formerly 231c3cd84e3c86caba81708581be911e771aa774]]]
Former-commit-id: 7028f7fd4d
Former-commit-id: 9d9c4c7c27 [formerly 510c39713f]
Former-commit-id: 3bf2a08c57
2014-02-18 11:11:33 -06:00
Brad Gonzales
b0421675ff Issue #2771 For Data Delivery CAVE now request current id from
the registry EDEX.  Added DATA_DELIVERY_ID to environment that is used instead
of site id for identification when participating in the federation
and subscription identification.

Amend: Created common data delivery package com.raytheon.uf.edex.datadelivery. Moved DataDeliveryIdUtil there.
       Created ClusterIdUtil.  DataDeliveryIdUtil uses that utility.  It also verifies the id against the awips sites.
       Changed centralRegistry.sh to  set CLUSTER_ID to NCF.
       Handle cases where site id is HAK or HUS.
       Check for empty id setting in Cluster ID Util.
       Return full id for Data Delivery ID.
       Simplify Data Delivery ID and return Cluster ID.

Change-Id: Iee140b5626e1962217cca2deb6d1483ebf265911

Former-commit-id: 379c0fb46c [formerly 19460ed0d7] [formerly 379c0fb46c [formerly 19460ed0d7] [formerly ba4e308328 [formerly d2fa3dfb4a61e8d0fd68654afb1c18e49f063fcb]]]
Former-commit-id: ba4e308328
Former-commit-id: 1b76488111 [formerly 3be3380944]
Former-commit-id: 9aa1cb299e
2014-02-18 11:10:44 -06:00
Ron Anderson
8a7af092f2 Merge branch 'master_14.1.1' into master_14.2.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StoreTransmitDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java
	rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
	rpms/awips2.core/Installer.tools/component.spec

Change-Id: I457923a64d369b97af3d99fa6b25bf353a1f33f4

Former-commit-id: e7f2b6883d [formerly 32bcf9d0d0] [formerly e7f2b6883d [formerly 32bcf9d0d0] [formerly 14a082a4e9 [formerly 4155b9785e0a82078db6805659146980cafc2aa7]]]
Former-commit-id: 14a082a4e9
Former-commit-id: 0135771eec [formerly d4ba9eba94]
Former-commit-id: 68e03bf02f
2014-02-18 10:45:20 -06:00
Brian Clements
f866ac4365 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: f0c89ef6c6 [formerly f6b2827434] [formerly f0c89ef6c6 [formerly f6b2827434] [formerly 5b4f1e8288 [formerly ff23569984eee43927c10ca041ca7e0ca4d40a3b]]]
Former-commit-id: 5b4f1e8288
Former-commit-id: 02319f36e4 [formerly a1d9e40bd4]
Former-commit-id: 5889341612
2014-02-18 10:03:12 -06:00
Nate Jensen
72a40614fb Merge "Issue #2751 fixed blocked icon for roster entries" into development
Former-commit-id: 0228d24f1d [formerly e70f0d21ab] [formerly 0228d24f1d [formerly e70f0d21ab] [formerly aa7413fd4c [formerly 4f02e79ed2211fa9e406e3bc2c633256c6e85faf]]]
Former-commit-id: aa7413fd4c
Former-commit-id: c3756326a6 [formerly f1b7bf1c2a]
Former-commit-id: a08dea4b08
2014-02-18 08:48:00 -06:00
Brian Clements
df4c4af7e9 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: e894019715 [formerly a94b366e26] [formerly e894019715 [formerly a94b366e26] [formerly 3307f5ea5e [formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]]
Former-commit-id: 3307f5ea5e
Former-commit-id: 02d3a9ae7e [formerly 476d0c3257]
Former-commit-id: 6574733eba
2014-02-17 17:11:36 -06:00
Nate Jensen
0dd9cd1094 Issue #2704 fix alertviz connectivity checks
Former-commit-id: 0160ab0464 [formerly 0c4de50218] [formerly 0160ab0464 [formerly 0c4de50218] [formerly 4d68994525 [formerly adfb9c293456aeced60e3ab41575d8b3b0f635b8]]]
Former-commit-id: 4d68994525
Former-commit-id: 121bcd184a [formerly 228ab8dd60]
Former-commit-id: 944df080f4
2014-02-17 17:10:07 -06:00
Brian Clements
fab5759a01 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: 6d71686332 [formerly 3b5648c055] [formerly 6d71686332 [formerly 3b5648c055] [formerly 3dfd8fbafb [formerly 9a4b091f7e2655f48fd061021d161c4eb2e63dd8]]]
Former-commit-id: 3dfd8fbafb
Former-commit-id: 0d07e417fc [formerly 9dc2967e3f]
Former-commit-id: cd7abc37fc
2014-02-17 16:39:43 -06:00
Nate Jensen
083a66dc4e Merge "Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors." into development
Former-commit-id: 2367c79c1c [formerly 5675869906] [formerly 2367c79c1c [formerly 5675869906] [formerly f4260a617e [formerly ef860082c4cd6159233323b89e0b73e272224f38]]]
Former-commit-id: f4260a617e
Former-commit-id: 1639f43f50 [formerly 96014c806d]
Former-commit-id: e4fb5e0067
2014-02-17 14:09:58 -06:00
Ben Steffensmeier
e0c97ad986 Issue #2661 Fix Helicity, Derivative, and all XY displays of vectors.
Former-commit-id: 2cf496ca84 [formerly 937b3071d4] [formerly 2cf496ca84 [formerly 937b3071d4] [formerly ca90137801 [formerly 3f7342fc4f280180af46290b9afc7a047e16ce4a]]]
Former-commit-id: ca90137801
Former-commit-id: fb5b367ecc [formerly 0f6f60a132]
Former-commit-id: 47c3c6845b
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: c8e70cd6b1 [formerly 15ff4ab5d7] [formerly c8e70cd6b1 [formerly 15ff4ab5d7] [formerly 2486e39192 [formerly 6e020ed9403fcd2e1c27ed9ab8443497ba645933]]]
Former-commit-id: 2486e39192
Former-commit-id: b801b36ca7 [formerly 0314d61773]
Former-commit-id: e6dae7a23c
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: 0fe9842582 [formerly 30632fbd84] [formerly 0fe9842582 [formerly 30632fbd84] [formerly 063d85ee22 [formerly 4778976c7175121841fc9ca69a814daf9d466c6c]]]
Former-commit-id: 063d85ee22
Former-commit-id: 1169f85a3b [formerly 996663ccee]
Former-commit-id: a5bf31934f
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: 1de140a526 [formerly acad670229] [formerly 1de140a526 [formerly acad670229] [formerly 6a2a33abe1 [formerly e0a5ec0a713f06eab93d86671a43334110b60b0c]]]
Former-commit-id: 6a2a33abe1
Former-commit-id: ff9fdc63b0 [formerly 91f707537b]
Former-commit-id: d06e5fc107
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: d0352c69d4 [formerly 267cc881a4] [formerly d0352c69d4 [formerly 267cc881a4] [formerly 9fcc5ad930 [formerly a494febee5f45d211797843d56077ac0ef358dbf]]]
Former-commit-id: 9fcc5ad930
Former-commit-id: 146412a8bd [formerly e115197bb7]
Former-commit-id: 28aa3dd195
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: 56aa06888f [formerly 723ff23ee9] [formerly 56aa06888f [formerly 723ff23ee9] [formerly f3d107580f [formerly 4b48313cb3509bebcfdd79e1df3d746a2d12c6af]]]
Former-commit-id: f3d107580f
Former-commit-id: b1c976ac17 [formerly dbc420e917]
Former-commit-id: 4963b3cc23
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: 4d656b5d06 [formerly 6309f9b34b] [formerly 4d656b5d06 [formerly 6309f9b34b] [formerly c8e93190f2 [formerly 8b3deac27c76c6827ad2ad7863f91a3b8fbe7fa4]]]
Former-commit-id: c8e93190f2
Former-commit-id: b311aba5d5 [formerly 3571135645]
Former-commit-id: d374fc9f5d
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: 43ea3b0918 [formerly ac62d322ed] [formerly 43ea3b0918 [formerly ac62d322ed] [formerly 346dc4afff [formerly a2dcb434e8d72e0046c6af9900e0abd093f9bcbc]]]
Former-commit-id: 346dc4afff
Former-commit-id: 6601dff483 [formerly 5b3a55d11f]
Former-commit-id: c5f33b0ed0
2014-02-14 08:53:40 -06:00
Nate Jensen
65068869e1 Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: 63d5f94cbb [formerly e05f1eae96] [formerly 63d5f94cbb [formerly e05f1eae96] [formerly a85575a763 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]
Former-commit-id: a85575a763
Former-commit-id: 139479b4e1 [formerly 11fb06810f]
Former-commit-id: 70285796ac
2014-02-13 15:35:53 -06:00
Nate Jensen
1aeeeffb0d Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: f2b32fa1ae [formerly 2643d01b74] [formerly f2b32fa1ae [formerly 2643d01b74] [formerly d8e2d2837e [formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]]
Former-commit-id: d8e2d2837e
Former-commit-id: 1f3c4090a0 [formerly b31470f7e3]
Former-commit-id: 3fb847a74c
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: 16ed18e0c6 [formerly ef52908906] [formerly 16ed18e0c6 [formerly ef52908906] [formerly 0ac7ff81cf [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]]
Former-commit-id: 0ac7ff81cf
Former-commit-id: e6de3a118d [formerly 3ec3ad0543]
Former-commit-id: 1cc21dc160
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: 21e95cc2f0 [formerly 51c9d27a39] [formerly 21e95cc2f0 [formerly 51c9d27a39] [formerly 42fd9c8f9a [formerly 10bbf4bf6e5be7ff8bb138113991f7292a3390b1]]]
Former-commit-id: 42fd9c8f9a
Former-commit-id: ca11555427 [formerly b84a83eb6f]
Former-commit-id: 828738b81f
2014-02-13 10:46:27 -06:00
Ron Anderson
7447a71c10 Issue #2788 Fix topo for large areas.
Change-Id: Idb4a19ffea527ad40efb5e586913aab9d37602df

Former-commit-id: 3e78908bb5 [formerly fcf45916f4] [formerly 3e78908bb5 [formerly fcf45916f4] [formerly 2f067699f2 [formerly 882576fcf6f41b9a41ea8f4a31a40c8c31d51aad]]]
Former-commit-id: 2f067699f2
Former-commit-id: d9b82b4ebe [formerly 2d7c87ac84]
Former-commit-id: d298aabe40
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: 2d72c0f475 [formerly 579f7c826d] [formerly 2d72c0f475 [formerly 579f7c826d] [formerly caa8360ac7 [formerly 0c4a7915870f374cb4e728303939335cb0691c84]]]
Former-commit-id: caa8360ac7
Former-commit-id: 46ea69990d [formerly bafe2972a4]
Former-commit-id: 8b618ea95b
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: ed87998c31 [formerly 6093312861] [formerly ed87998c31 [formerly 6093312861] [formerly 94b8b7eb04 [formerly 381c3f6c6585f414c27b771168746f6dd838df0c]]]
Former-commit-id: 94b8b7eb04
Former-commit-id: f53e9523f3 [formerly b9e027059f]
Former-commit-id: 78f8a9fbe3
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: 1e19c8d62c [formerly 1bf3a09056] [formerly 1e19c8d62c [formerly 1bf3a09056] [formerly 9d7490a158 [formerly 06cfbcccff89fd79efd3188c45653dce160fc90a]]]
Former-commit-id: 9d7490a158
Former-commit-id: 667a1450cf [formerly f22268295e]
Former-commit-id: 5b95f2a058
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: 22031aa87d [formerly 81ddf87b04] [formerly 22031aa87d [formerly 81ddf87b04] [formerly 23e2039028 [formerly d0dab4bce76b45b71f4238d5a04c440cee936eaf]]]
Former-commit-id: 23e2039028
Former-commit-id: a1ba9c6b9d [formerly 09859bdee9]
Former-commit-id: 57dd054176
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: fa42c40bc7 [formerly eec72c5956] [formerly fa42c40bc7 [formerly eec72c5956] [formerly 5e6656581b [formerly 3ccf0beb3b0cf77c168b529d69f291b8c295cbb1]]]
Former-commit-id: 5e6656581b
Former-commit-id: bac84c698f [formerly 7247d69202]
Former-commit-id: 6e33812072
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: 3034ac5994 [formerly e381edcd60] [formerly 3034ac5994 [formerly e381edcd60] [formerly b0714ba659 [formerly 808727ce287116be8c8e2a93ce0fc4b3a996c0ef]]]
Former-commit-id: b0714ba659
Former-commit-id: b94bc84429 [formerly 4406477877]
Former-commit-id: 73241ebeb7
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: 8073fd22b1 [formerly 7099472204] [formerly 8073fd22b1 [formerly 7099472204] [formerly ce08022db7 [formerly 7b3700b5ad07c677755844f969b5c31f31be138b]]]
Former-commit-id: ce08022db7
Former-commit-id: a7302a3232 [formerly c74ae6b83d]
Former-commit-id: 5ae2a544ca
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: 8f07ae2a42 [formerly 0765451a9d] [formerly 8f07ae2a42 [formerly 0765451a9d] [formerly ddf5b2a3ef [formerly ae5f2d2b547241e7ba9c22aabaf64fceceb1b563]]]
Former-commit-id: ddf5b2a3ef
Former-commit-id: 9c67bcbbcf [formerly fab4fea177]
Former-commit-id: 8e9f1136ae
2014-02-12 09:13:48 -06:00
Brian.Dyke
f47dd3ef59 14.1.1-18 baseline
Former-commit-id: f05a2220cd [formerly 575e328123] [formerly f05a2220cd [formerly 575e328123] [formerly 1d6a9456b7 [formerly a8009c4ee3effc8586b830244db8db716ec0f37c]]]
Former-commit-id: 1d6a9456b7
Former-commit-id: d61ae6c5f4 [formerly c5857c30f2]
Former-commit-id: d1db845406
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: c7cfd49622 [formerly 5c256dc19c] [formerly c7cfd49622 [formerly 5c256dc19c] [formerly f078971b5d [formerly c75877624ab414c1a45bc7326c49aa99c8ec3021]]]
Former-commit-id: f078971b5d
Former-commit-id: ab6fab4199 [formerly 42fdfa4964]
Former-commit-id: 22aab74e8d
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: c28085118f [formerly 75ca70fba6] [formerly c28085118f [formerly 75ca70fba6] [formerly fd43d9e095 [formerly 36d571557def95e0eb1350c4e68cbe3e225f282a]]]
Former-commit-id: fd43d9e095
Former-commit-id: c0256ac19e [formerly 2111989497]
Former-commit-id: 9e09da8bb6
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: 3c1fafe328 [formerly 7822511754] [formerly 3c1fafe328 [formerly 7822511754] [formerly a8a67634f9 [formerly 4f3635fc682c2a1746e188dac0f371676c9e0be9]]]
Former-commit-id: a8a67634f9
Former-commit-id: dd872433c7 [formerly e2e9eaaf35]
Former-commit-id: 9d6d418d48
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: d6fa79f1a7 [formerly 27be4297e6] [formerly d6fa79f1a7 [formerly 27be4297e6] [formerly 88a9d20316 [formerly 213ecfda92272947cda51d9c3d00b117a3d52a76]]]
Former-commit-id: 88a9d20316
Former-commit-id: 65e6fa1963 [formerly d975dcf01e]
Former-commit-id: 78df434dba
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: d16d679809 [formerly 5c7c14a6c4] [formerly d16d679809 [formerly 5c7c14a6c4] [formerly a48c1c6783 [formerly 1ae3057ce4fbbb5e60b27cf21d75de72b7e00c3e]]]
Former-commit-id: a48c1c6783
Former-commit-id: 3047063c6e [formerly 57aa678883]
Former-commit-id: 9459523de9
2014-02-10 09:53:41 -06:00
Mike Duff
a87ce0b532 Issue #2453 - Notification Center refactor
Former-commit-id: 61c57d2254 [formerly eeb78f7f20] [formerly 61c57d2254 [formerly eeb78f7f20] [formerly 2c9d603e50 [formerly f570a3945ad8e9e8bc4f88989a0ec10da191856a]]]
Former-commit-id: 2c9d603e50
Former-commit-id: 7535b51fe7 [formerly 4a87525df0]
Former-commit-id: f005aa3d8d
2014-02-07 16:50:50 -06:00
Ben Steffensmeier
eb65002cf6 Issue #2211 Fix data mapped sampling.
Former-commit-id: d219a687c9 [formerly 724bb85676] [formerly d219a687c9 [formerly 724bb85676] [formerly 3d76d6655b [formerly aec317f506eb940e843a0c3cf4ffa55a83eb186b]]]
Former-commit-id: 3d76d6655b
Former-commit-id: a37a910f67 [formerly 6a95dd6242]
Former-commit-id: a8c075d7e3
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: 639f774567 [formerly 7d6e116b9f] [formerly 639f774567 [formerly 7d6e116b9f] [formerly 6518b88fe5 [formerly 24343a796d0089824dde2f7039cdf93ed0ebf88c]]]
Former-commit-id: 6518b88fe5
Former-commit-id: 6efb4f51d2 [formerly 8742be3a13]
Former-commit-id: 014b59e1a1
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: b12e29dd7c [formerly 03d36b8309] [formerly b12e29dd7c [formerly 03d36b8309] [formerly e8ffc73893 [formerly 19e9a7f37409e37b378bf2f3eae0b9b16d797f65]]]
Former-commit-id: e8ffc73893
Former-commit-id: ad8c40032f [formerly 94ec272ab2]
Former-commit-id: 06d68cc0be
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: 82fc0a2ed3 [formerly 64f0cabaef] [formerly 82fc0a2ed3 [formerly 64f0cabaef] [formerly 36d3d21b57 [formerly daacb19de029a15f94338c84a85116d0435f79be]]]
Former-commit-id: 36d3d21b57
Former-commit-id: c3c1205848 [formerly c965993d17]
Former-commit-id: 15c2f761be
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: d3d0dc5f77 [formerly d863bf208c] [formerly d3d0dc5f77 [formerly d863bf208c] [formerly f00d4c54d8 [formerly 94cf3a44a8c2942c09e8fa596f734f3a0047d37a]]]
Former-commit-id: f00d4c54d8
Former-commit-id: 39c9dda92b [formerly 8feed9aadf]
Former-commit-id: e342242032
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: bafe19bbd5 [formerly 101c08818d] [formerly bafe19bbd5 [formerly 101c08818d] [formerly 6b01c2957f [formerly 2e406f02b0abbdeee0f553df430f5a58977d9af2]]]
Former-commit-id: 6b01c2957f
Former-commit-id: 9edf591218 [formerly 6a2f75e8d5]
Former-commit-id: bb43ec00b1
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: b84bf8c891 [formerly 9c439866d5] [formerly b84bf8c891 [formerly 9c439866d5] [formerly dc5b5526a3 [formerly f634fe40e6fa7a8a3af575e79cb3d996761db983]]]
Former-commit-id: dc5b5526a3
Former-commit-id: 5b7cf3caec [formerly 02a0874646]
Former-commit-id: 70cbd6c61d
2014-02-05 15:57:08 -06:00
Brian.Dyke
4b9bccad66 Issue #124
Former-commit-id: 3ba93b175e [formerly 439f053309] [formerly 3ba93b175e [formerly 439f053309] [formerly 0cc11ddfd3 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]]
Former-commit-id: 0cc11ddfd3
Former-commit-id: e1d788683d [formerly 90b4e7ebf0]
Former-commit-id: ff2ccb40e4
2014-02-04 16:56:47 -05:00
Brian.Dyke
42e17bf5f3 Issue #83
Former-commit-id: f2e56b268c [formerly 484119f6b0] [formerly f2e56b268c [formerly 484119f6b0] [formerly fb15dd5dfb [formerly 93c3c9057bc68d7a4c436d433a629200663d9eeb]]]
Former-commit-id: fb15dd5dfb
Former-commit-id: 3c160bb05e [formerly f088dab5ef]
Former-commit-id: 870b355263
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: cbd17ea025 [formerly c7c40a3467] [formerly cbd17ea025 [formerly c7c40a3467] [formerly fa59172d87 [formerly b613a9d5b7e9b1c17fa354c9c6b617da040d1d71]]]
Former-commit-id: fa59172d87
Former-commit-id: aea166d7b9 [formerly 4ec22d9530]
Former-commit-id: 65ea06a366
2014-02-04 15:21:22 -05:00