xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4903 commits 31 branches 40 tags 3.8 GiB
Commit graph

4903 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lee Venable
7299c53ba5 Issue #2795 - removed test code. 
Former-commit-id: e34e636dc7 [formerly 28fe1e99e2] [formerly e34e636dc7 [formerly 28fe1e99e2] [formerly f94bcc4d3f [formerly 0e1db42a04b15b8815d59db272b4b2f7b3e79fb9]]]
Former-commit-id: f94bcc4d3f
Former-commit-id: 267fa56e32 [formerly 708de93fc4]
Former-commit-id: d026da3632
 2014-02-27 15:46:30 -06:00
Richard Peter
68eade49a2 Issue #2509: Fix Merge of 13.5.2-4 ncep resources 
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: c267c5a08f [formerly 86d42ed603] [formerly c267c5a08f [formerly 86d42ed603] [formerly 862069dfd3 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]
Former-commit-id: 862069dfd3
Former-commit-id: 237ada7b8b [formerly c0d495d9c3]
Former-commit-id: 9489565efb
 2014-02-27 13:46:47 -06:00
Richard Peter
8d35f1ce5f Issue #2509: Fix merge of SS #124 
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: a23c8f2c27 [formerly 729d608a15] [formerly a23c8f2c27 [formerly 729d608a15] [formerly d54fee5dae [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]
Former-commit-id: d54fee5dae
Former-commit-id: 67093287a0 [formerly 229437773b]
Former-commit-id: 9ca22fce7f
 2014-02-27 13:20:49 -06:00
Mike Duff
5a8d3e6d51 Issue #2842 - Fix MPE tearoff menu issues, add next/prev hr toolbar buttons 
Change-Id: Ic16bc87680918a1a462bcd5373e8f92faf6d905d

Former-commit-id: 7d14383bed [formerly 801abc37a2] [formerly 7d14383bed [formerly 801abc37a2] [formerly 42982306ab [formerly 048b3ab40864d13baa7bcd9c8aef04564ec8a5f9]]]
Former-commit-id: 42982306ab
Former-commit-id: 05cf39b8a6 [formerly aa8ca42413]
Former-commit-id: aefb2bbf0e
 2014-02-27 12:01:30 -06:00
Melissa Porricel
adc09f6896 ASM #78 - Fix MDCRS display 
Change-Id: I28b6788f822100469f0fe292197b6020381e6e38

Former-commit-id: 20624da288 [formerly 769fc1ed2f] [formerly 20624da288 [formerly 769fc1ed2f] [formerly e5213e9415 [formerly 2c655d5313882f811219c7a16f713d977008f949]]]
Former-commit-id: e5213e9415
Former-commit-id: 8daf0520bc [formerly 774e236d63]
Former-commit-id: eafea2f5ee
 2014-02-27 12:48:09 -05:00
Steve Harris
40e335fdf7 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 182c16067c [formerly 5218a4d1e6] [formerly 182c16067c [formerly 5218a4d1e6] [formerly 99f53876d7 [formerly 2f2339f4c12e1862d27a8dda65264f353aed6ac6]]]
Former-commit-id: 99f53876d7
Former-commit-id: b8afc0e5f7 [formerly 0d9abc724c]
Former-commit-id: 1c547c6a96
 2014-02-27 10:02:43 -06:00
Juliya Dynina
8a468b1bb2 Merge "ASM #236" into asm_14.2.2 
Former-commit-id: a0af710ac3 [formerly 7d2a404f66] [formerly a0af710ac3 [formerly 7d2a404f66] [formerly 09708ce0ba [formerly 8ddc79c66a4131f9671b605057abf916200a276a]]]
Former-commit-id: 09708ce0ba
Former-commit-id: 33bfcfd251 [formerly c8ab0aa33a]
Former-commit-id: 804ed170c7
 2014-02-27 09:48:01 -05:00
Brian.Dyke
f9587d39d1 OB_14.1.1-20 baseline 
Former-commit-id: b2401d2f0d [formerly 324696c436] [formerly b2401d2f0d [formerly 324696c436] [formerly 2bad40cfee [formerly bdb1c79ea2557e4e830a4d1c8782a3a1dc3776de]]]
Former-commit-id: 2bad40cfee
Former-commit-id: c873f20d04 [formerly 16117255f3]
Former-commit-id: 5feadbe4d9
 2014-02-26 17:39:15 -05:00
Lee Venable
54fa6c12b3 Issue #2795 - added code to check for null images. 
Former-commit-id: 5546b537cf [formerly 0c7395d423] [formerly 5546b537cf [formerly 0c7395d423] [formerly 49530206f4 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]]
Former-commit-id: 49530206f4
Former-commit-id: 35f6f35186 [formerly facc67e6b5]
Former-commit-id: 3932c3f02f
 2014-02-26 15:50:46 -06:00
Lee Venable
8d49130542 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked. 
Former-commit-id: bb4b034375 [formerly 94cede8153] [formerly bb4b034375 [formerly 94cede8153] [formerly e0ee93bab3 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]
Former-commit-id: e0ee93bab3
Former-commit-id: 91d419662c [formerly e0fbc02307]
Former-commit-id: 316ba53e74
 2014-02-26 13:21:58 -06:00
steve.naples
2e088612ec ASM #236 
Change-Id: I849aa9c15622973e49f385ada9df84ba3b1417dd

Former-commit-id: 06f619b3ff [formerly 6be82c41fc] [formerly 06f619b3ff [formerly 6be82c41fc] [formerly cc9e62c806 [formerly 8d0e82a46186f3457c5d4e3001548d067ebbaae2]]]
Former-commit-id: cc9e62c806
Former-commit-id: 1c6f6be15e [formerly 9b850d81df]
Former-commit-id: 73e5bc8949
 2014-02-26 18:54:36 +00:00
Richard Peter
e28b3bb5b9 Merge "Issue #2469 Fixed default rules implementation" into omaha_14.2.1 
Former-commit-id: 90b48e0393 [formerly 3735cd3ffe] [formerly 90b48e0393 [formerly 3735cd3ffe] [formerly b4e48698ed [formerly 937157a12ca783ead50ad4ddaec4e1679ea47e62]]]
Former-commit-id: b4e48698ed
Former-commit-id: f803d557c2 [formerly 66b271a550]
Former-commit-id: e78e5a15b9
 2014-02-25 12:34:38 -06:00
Brad Gonzales
aa2d8b76a1 Issue #2386 fixed spatial overlap rule application. 
Amend: updates from peer review.

Change-Id: Icd33c9175f210d864bd5117fc54c76362b76ac22

Former-commit-id: b6e2ce4b74 [formerly 783afb1585] [formerly b6e2ce4b74 [formerly 783afb1585] [formerly 8b2b50baaf [formerly 807f278d542bc36331aa83b46a86a3af9dbb6675]]]
Former-commit-id: 8b2b50baaf
Former-commit-id: f57f472f6a [formerly 5ce1939d01]
Former-commit-id: f4513d0e64
 2014-02-25 09:22:08 -06:00
Daniel.Huffman
67087f1207 ASM #76 
Added lpi resources.  File latLonOcean.xml is an example.

Change-Id: I533aa7616d837a70d2b14a4bbe00397ef2a7ddff

Former-commit-id: f675fab121 [formerly 9c29bddee0] [formerly f675fab121 [formerly 9c29bddee0] [formerly a34124c355 [formerly 733a80d0019ccf7f5529abbd6054cb485412e962]]]
Former-commit-id: a34124c355
Former-commit-id: cd2ecab86d [formerly 68eab08f8e]
Former-commit-id: 45b78af3dd
 2014-02-24 22:59:41 +00:00
Nate Jensen
caaffabda3 Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1 
Former-commit-id: 8ef957d2f0 [formerly 279f05a1d5] [formerly 8ef957d2f0 [formerly 279f05a1d5] [formerly 060eafc272 [formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]]
Former-commit-id: 060eafc272
Former-commit-id: 2f58408036 [formerly a5477ea272]
Former-commit-id: d9411eb382
 2014-02-24 16:17:20 -06:00
Nate Jensen
78c8f1a62c Issue #2830 sort TAF dataTimes so latest are retrieved 
Former-commit-id: 230b8bf117 [formerly 8a00a419a1] [formerly 230b8bf117 [formerly 8a00a419a1] [formerly f353c44cc0 [formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]
Former-commit-id: f353c44cc0
Former-commit-id: a97f5b5ff7 [formerly 74329bcb89]
Former-commit-id: 02d2f0c713
 2014-02-24 15:35:13 -06:00
Brian.Dyke
0bcf7c89b8 Rebased omaha_14.2.1_set_4 delivery on master_14.2.1-7 
Former-commit-id: 363403fb34 [formerly 2faab606e5] [formerly 363403fb34 [formerly 2faab606e5] [formerly 1a8a0b703e [formerly f7a43d07109a7c04ffb9754c285043ce446d46b5]]]
Former-commit-id: 1a8a0b703e
Former-commit-id: 73a1c238f4 [formerly 227131e5f1]
Former-commit-id: 38829b9014
 2014-02-24 14:51:00 -05:00
Ron Anderson
3c673caec2 Merge branch 'master_14.2.1' into omaha_14.2.1 
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 45ccac0859 [formerly 4364e7497c] [formerly 45ccac0859 [formerly 4364e7497c] [formerly 2db5f26840 [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: 7d3af157f8 [formerly 3b2ea2d6ac]
Former-commit-id: f2b0cc20e8
 2014-02-24 13:46:48 -06:00
Nate Jensen
da2a363550 Merge "Issue #2762 Use UCUM to format units so IRPixel formats correctly." into omaha_14.2.1 
Former-commit-id: 98a6101cd3 [formerly 2111109ce2] [formerly 98a6101cd3 [formerly 2111109ce2] [formerly b1586f8603 [formerly cd4472f65c07f28d6aee26df748d44568405a9b1]]]
Former-commit-id: b1586f8603
Former-commit-id: d6e9cb73f5 [formerly bf8bb95f51]
Former-commit-id: 6979321635
 2014-02-24 13:25:35 -06:00
Dave Hladky
e030ac65b2 Issue #2469 Fixed default rules implementation 
Former-commit-id: f9c6a396f0 [formerly 1d256bfcee] [formerly f9c6a396f0 [formerly 1d256bfcee] [formerly 45413d0db4 [formerly 9f5d3a8fefb7c9977533c8c3770e14e5a5e09f72]]]
Former-commit-id: 45413d0db4
Former-commit-id: dc97eb7890 [formerly ff5a5961db]
Former-commit-id: 8a924bcc2c
 2014-02-24 13:06:52 -06:00
Ben Steffensmeier
831bb0b021 Issue #2762 Use UCUM to format units so IRPixel formats correctly. 
Former-commit-id: f7c48b24bb [formerly 9e5f7d90a0] [formerly f7c48b24bb [formerly 9e5f7d90a0] [formerly f8cc0e3d95 [formerly b5949935eaa071ec2a56c48f32fbc3a4714d2056]]]
Former-commit-id: f8cc0e3d95
Former-commit-id: 3c7e578000 [formerly a510abdb22]
Former-commit-id: 358e7d3b1d
 2014-02-24 10:27:30 -06:00
John.McPherson
995015a0ca ASM #209 DR 16362 
Change-Id: Ide103349188f12f3b1350bea75f80b225def13e7

Former-commit-id: ea0dc8b3dc [formerly 1d987c36d9] [formerly ea0dc8b3dc [formerly 1d987c36d9] [formerly bbd70c06f1 [formerly b01f04471631f5e2c24dba77f7e96b72444becff]]]
Former-commit-id: bbd70c06f1
Former-commit-id: acf30e83bf [formerly ae671c3601]
Former-commit-id: dbad6b2701
 2014-02-24 03:07:21 +00:00
Dave Hladky
c4e70210fd Issue #2636 Try Catch around the MaintTask 
Change-Id: Iaca03724231970f2bd96f209f88e936b06991285

Former-commit-id: 542ba7e504 [formerly c4bed432da] [formerly 542ba7e504 [formerly c4bed432da] [formerly 49f6c31256 [formerly 60c9027b219f3de7193320e5a55911c740e58f30]]]
Former-commit-id: 49f6c31256
Former-commit-id: 3b9f80d03e [formerly 445b55f796]
Former-commit-id: c545368839
 2014-02-21 16:01:20 -06:00
Brian.Dyke
f86f9f8918 OB_14.1.1-19 baseline 
Former-commit-id: 779553142c [formerly cfa4997978] [formerly 779553142c [formerly cfa4997978] [formerly 10b723647b [formerly db2a591456383d8f980d33757e8c161bdcc01d3a]]]
Former-commit-id: 10b723647b
Former-commit-id: c41dd22ff2 [formerly 64044e7ce5]
Former-commit-id: 1b359c2564
 2014-02-21 06:50:59 -05:00
Brian.Dyke
176c56b8ea ASM #279 LDM Missing Visible Satellite Solution - Part 3 (move ldm.pq to local block dev) 
Former-commit-id: 5f3ca0a3f4 [formerly 2f79cc486e] [formerly 5f3ca0a3f4 [formerly 2f79cc486e] [formerly 916f657e04 [formerly 370617bc1cbcf768b07b676870cfaa5e2cad49bc]]]
Former-commit-id: 916f657e04
Former-commit-id: 9ce06f52c4 [formerly e36ae1dd7f]
Former-commit-id: f89f664f50
 2014-02-20 15:50:50 -05:00
Nate Jensen
3955f66213 Issue #2704 fix startup issues where settings are valid but dialog 
doens't realize it


Former-commit-id: 6ef26a636c [formerly 32bd9fd635] [formerly 6ef26a636c [formerly 32bd9fd635] [formerly 0f81b80467 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]
Former-commit-id: 0f81b80467
Former-commit-id: 6e2150ccd7 [formerly 9f33e97c1b]
Former-commit-id: 1f5f895dcf
 2014-02-20 10:53:21 -06:00
Juliya Dynina
04413ee642 Merge "ASM #118" into asm_14.2.2 
Former-commit-id: d9fecf06d2 [formerly 0f5ce6fbde] [formerly d9fecf06d2 [formerly 0f5ce6fbde] [formerly f1a10568d6 [formerly f2354898d0a40ae7a19b4349d25b4204d2da3e4d]]]
Former-commit-id: f1a10568d6
Former-commit-id: 8b164ca292 [formerly a668f336bf]
Former-commit-id: 70d512cb7d
 2014-02-20 11:23:32 -05:00
David Gillingham
5911f4b2d4 Issue #2783: Rewrite run_report_alarm script into EDEX service. 
Change-Id: I26a5e1c98f1454d57522ede49d3e85f2ebc7d8be

Former-commit-id: 607ce13c19 [formerly 32719432ff] [formerly 607ce13c19 [formerly 32719432ff] [formerly de12904c7a [formerly d0ae60f4abaa0bd2c8f966de2e4ed4c5989737fd]]]
Former-commit-id: de12904c7a
Former-commit-id: a83191356d [formerly 1520317c24]
Former-commit-id: 474dda75de
 2014-02-18 13:24:37 -06:00
Richard Peter
bbce2567a7 Merge "Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues." into omaha_14.2.1 
Former-commit-id: c666adb530 [formerly 3ed6ad64ce] [formerly c666adb530 [formerly 3ed6ad64ce] [formerly d19e464a1a [formerly 5bf461753675af961c484d022cec4006fabfeba8]]]
Former-commit-id: d19e464a1a
Former-commit-id: f7e43bdabd [formerly 3c4e188037]
Former-commit-id: ccd90f2d86
 2014-02-18 12:44:57 -06:00
Lee Venable
0bd01db3cc Merge "Issue #2786 Pending subscriptions don't work." into omaha_14.2.1 
Former-commit-id: e9226e7140 [formerly 0cf2dba731] [formerly e9226e7140 [formerly 0cf2dba731] [formerly 4e7c3c0cbe [formerly 66d345a2ce35a8ef0f9665194a5c5d1ddb314b21]]]
Former-commit-id: 4e7c3c0cbe
Former-commit-id: 46dbd967a5 [formerly 6fc9dcb3b1]
Former-commit-id: 28b0809a1c
 2014-02-18 12:19:41 -06:00
Brad Gonzales
d50a8cd7a5 Issue #2386 Added unit tests to cover full test procedures in ticket 2386 and fixed issues. 
Amend: updated test envlope sizes.
       fixed ticket numbers in software history.

Change-Id: Id2fa1638d31e3b03092587769063123c838c49c5

Former-commit-id: 49ddffc99b [formerly 36a24c1cb5] [formerly 49ddffc99b [formerly 36a24c1cb5] [formerly 794bbc3c9b [formerly 4c3148df4e85ccfa1d5b123fcb605d97249833d7]]]
Former-commit-id: 794bbc3c9b
Former-commit-id: 3bb9975728 [formerly 90d34f7386]
Former-commit-id: b99b5d9373
 2014-02-18 12:11:02 -06:00
Mike Duff
2467a11a7e Issue #2636 - Change how retrieval plan is updated over time. 
Peer review comments

Change-Id: If7308ad0300460ed14bc4b53707b81a6eba51950

Former-commit-id: 33f81d8822 [formerly 89bd047283] [formerly 33f81d8822 [formerly 89bd047283] [formerly 911789b910 [formerly 0144c23a35b6e7134d5c4caecbaa78f6b0c613f5]]]
Former-commit-id: 911789b910
Former-commit-id: 42e6591bc8 [formerly 5f9d913c6d]
Former-commit-id: d277c1caf1
 2014-02-18 12:05:26 -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
Loubna.Bousaidi
3b94b3b125 ASM #118 
Change-Id: I7eee4de29a6aec74b3755951ba60b3c5ec69b769

Former-commit-id: 78f5231cd2 [formerly 5443998332] [formerly 78f5231cd2 [formerly 5443998332] [formerly c7615b9027 [formerly a41751263aeda5020f320ff2e2b4bd96d462300d]]]
Former-commit-id: c7615b9027
Former-commit-id: 7f1b301677 [formerly 0493ce9bc1]
Former-commit-id: 85f0e405f5
 2014-02-18 15:41:01 +00:00
Dave Hladky
51b644bf0c Issue #2786 Pending subscriptions don't work. 
Former-commit-id: 24a4fab603 [formerly 5c11dd09bb] [formerly 24a4fab603 [formerly 5c11dd09bb] [formerly 7ee101d7c7 [formerly e525b55b8bbe3ce0171b2a0484c7f7e5ed643d79]]]
Former-commit-id: 7ee101d7c7
Former-commit-id: 012619f05f [formerly 78d41d01bb]
Former-commit-id: 9ccf06c4f4
 2014-02-18 09:14:38 -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
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
c6b270f084 Issue #2813 fix xml serialization of subscriptions 
Former-commit-id: 4583814741 [formerly be75cc3731] [formerly 4583814741 [formerly be75cc3731] [formerly 83e9226419 [formerly 2f4d702c247d8c0f433f44cf65b25e884ff0d5ba]]]
Former-commit-id: 83e9226419
Former-commit-id: e9bbdfdf89 [formerly 30bbc788ce]
Former-commit-id: 39b3824ae3
 2014-02-17 11:37:48 -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
Ron Anderson
7972a652b0 Merge "Issue #2528 Fix display of data on somewhat identical projections. Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26" into omaha_14.2.1 
Former-commit-id: ce8d59e075 [formerly fae824482b] [formerly ce8d59e075 [formerly fae824482b] [formerly 769c56bf08 [formerly ddb195c3032b80221e63f21eb113eaab5d50b124]]]
Former-commit-id: 769c56bf08
Former-commit-id: 8434f5cc65 [formerly 29e24081a6]
Former-commit-id: f4d0632cb2
 2014-02-17 08:56:48 -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
Ben Steffensmeier
1e96945cb8 Issue #2528 Fix display of data on somewhat identical projections. 
Change-Id: Iae186d08e5f9db26f125e784fbba4f9d3d209c26

Former-commit-id: 2b30269ac9 [formerly 54a17c012d] [formerly 2b30269ac9 [formerly 54a17c012d] [formerly 23694f5e0c [formerly dfd408bdf6b4648ca9cd54fb12ed26f5ce8272aa]]]
Former-commit-id: 23694f5e0c
Former-commit-id: be00537d6d [formerly bedf3cf45d]
Former-commit-id: c8feeebbbd
 2014-02-13 13:27:32 -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
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
Juliya Dynina
850f8e1d0d Merge "ASM #85" into asm_14.2.2 
Former-commit-id: 8e4c8bf92d [formerly 5095ac0758] [formerly 8e4c8bf92d [formerly 5095ac0758] [formerly deff8db6eb [formerly b03ca5694c4fbeab1d84dc59ea2e133b5c01f5a7]]]
Former-commit-id: deff8db6eb
Former-commit-id: 99a2addf18 [formerly eeffda2e2f]
Former-commit-id: 34c737464a
 2014-02-12 13:15:58 -05:00
Ron Anderson
79a635bc9e Merge "Issue #2719 Update NHA GFE domain" into omaha_14.2.1 
Former-commit-id: 8ba331e7fb [formerly af4f8de839] [formerly 8ba331e7fb [formerly af4f8de839] [formerly d906b780e8 [formerly caf31f2a88227c7ed9141676feb937822f4d03ce]]]
Former-commit-id: d906b780e8
Former-commit-id: 2fdcef7338 [formerly 361881dfda]
Former-commit-id: 2e1f7c8199
 2014-02-11 17:16:07 -06:00
Ron Anderson
454ce0268d Issue #2719 Update NHA GFE domain 
Change-Id: I081aef85ca4133addfc203473af5c53679c12d1c

Former-commit-id: 0f9b44ff94 [formerly a665530831] [formerly 0f9b44ff94 [formerly a665530831] [formerly ee89463d27 [formerly 28008b46b5d68e544dace5f721b283c222701699]]]
Former-commit-id: ee89463d27
Former-commit-id: 1ca9c95567 [formerly bfa65ed39e]
Former-commit-id: dd597e8349
 2014-02-11 17:07:01 -06:00
Loubna.Bousaidi
e2f1169a88 ASM #85 
Change-Id: I782bbebc746425446c523b6b4db026d81f85b2da

Former-commit-id: fe1c94a422 [formerly e3168d08cf] [formerly fe1c94a422 [formerly e3168d08cf] [formerly 55d8f64139 [formerly 4d7d62ed986a781fb225775d2446740453bd8c89]]]
Former-commit-id: 55d8f64139
Former-commit-id: d0109c690c [formerly de69883b43]
Former-commit-id: cc105bae69
 2014-02-11 22:12:48 +00:00