Mark Peters
|
e08b81c8d9
|
Omaha #3422 Update plug-in version number and java version for viz.hydrocommon and viz.mpe.ui
Change-Id: I2f8799c32a11ed636f714c0bfe304c5248f48a98
Former-commit-id: 5eacdbc13b [formerly 53042a9bf7] [formerly 5eacdbc13b [formerly 53042a9bf7] [formerly 627ecd28e1 [formerly 02b964ae1e7490cc9124dcd70d6806881396a692]]]
Former-commit-id: 627ecd28e1
Former-commit-id: 7087f36098 [formerly 3293e61ae0]
Former-commit-id: d804243d0f
|
2014-07-24 14:38:59 -05:00 |
|
Nate Jensen
|
42ada8c3ac
|
Merge "Omaha #3422 Replace drawFilledCircle and drawArc calls" into omaha_14.4.1
Former-commit-id: d419c9b8ca [formerly 87ec4fed2c] [formerly d419c9b8ca [formerly 87ec4fed2c] [formerly 415c9e73fd [formerly eac41695224c18aa566e4b1fdcbaf48647d93fdf]]]
Former-commit-id: 415c9e73fd
Former-commit-id: d4a11f062e [formerly aeb224e2c7]
Former-commit-id: 41b01e96ac
|
2014-07-22 14:21:27 -05:00 |
|
Nate Jensen
|
6ec4a3c6df
|
Merge "Omaha #3214 fixed typos in LightningFrameRetriever" into omaha_14.4.1
Former-commit-id: fd997ad030 [formerly 464e252e96] [formerly fd997ad030 [formerly 464e252e96] [formerly 3128374080 [formerly 5a2968189edd1abe58560404fc01dcea82957b5f]]]
Former-commit-id: 3128374080
Former-commit-id: 716f83ef2a [formerly cef2844dbc]
Former-commit-id: 78bf4db27e
|
2014-07-22 14:01:08 -05:00 |
|
Mark Peters
|
3a160929d5
|
Omaha #3422 Replace drawFilledCircle and drawArc calls
Change-Id: I2ecd1e2fd9614317addc248130bfc8ececc3d80e
Former-commit-id: f1b1aa1b5d [formerly 9532289be3] [formerly f1b1aa1b5d [formerly 9532289be3] [formerly b0e9c73eaf [formerly f0575e788549a1728c6d6fff7b99e3764c3739d8]]]
Former-commit-id: b0e9c73eaf
Former-commit-id: 9937dc0028 [formerly 4d7d9ec799]
Former-commit-id: 75e25d7710
|
2014-07-22 13:50:39 -05:00 |
|
Brian Clements
|
a2117edf9f
|
Omaha #3333 grid lightning ignores strikes outside of map
Change-Id: I188aac28b50b7ac8a107d785b52471c1d7fe6d14
Former-commit-id: 0bd9bb7c21 [formerly a9284b35ff] [formerly 0bd9bb7c21 [formerly a9284b35ff] [formerly 62dcdda0bc [formerly bb55bde76765d330f782524965fe79d5373b6e9f]]]
Former-commit-id: 62dcdda0bc
Former-commit-id: b069785d53 [formerly 0deb06ba40]
Former-commit-id: 976404c8b7
|
2014-07-22 13:42:18 -05:00 |
|
Brian Clements
|
3c19ca5c17
|
Omaha #3214 fixed typos in LightningFrameRetriever
Change-Id: I1616b5f64c3d6c99f034c7f7c526a453e0f5578c
Former-commit-id: 319cbe37b3 [formerly 45d52c2298] [formerly 319cbe37b3 [formerly 45d52c2298] [formerly 3f82ead0b5 [formerly 7f5868947a0c7bee586908f832f3bb9030c3e84e]]]
Former-commit-id: 3f82ead0b5
Former-commit-id: acf2c60fd3 [formerly 02cf0078d4]
Former-commit-id: 43f5ee1032
|
2014-07-22 13:33:26 -05:00 |
|
Mark Peters
|
969c6a4685
|
Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca
Former-commit-id: b5a25e7372 [formerly e638d2f41b] [formerly b5a25e7372 [formerly e638d2f41b] [formerly e4c455f5c0 [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]]
Former-commit-id: e4c455f5c0
Former-commit-id: 30a6e96d7c [formerly e48c2b7116]
Former-commit-id: 3aee17fbb5
|
2014-07-21 17:07:02 -05:00 |
|
Steve Harris
|
f5d6fb1dee
|
Merge branch 'omaha_15.1.1' into omaha_14.4.1
Former-commit-id: 76d548cdc4 [formerly 308246ac7b] [formerly 76d548cdc4 [formerly 308246ac7b] [formerly 5e04680687 [formerly 7605f77e2027026c83c0cc4c1e27ba617efbe70f]]]
Former-commit-id: 5e04680687
Former-commit-id: 08b4236055 [formerly 588bd8dda3]
Former-commit-id: ec1a1bbbf1
|
2014-07-16 13:21:53 -05:00 |
|
Benjamin Phillippe
|
ec91eaed8f
|
Omaha #3350 Added user/role authentication. Added XACML authorization
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df
Former-commit-id: d4997f5a90 [formerly cebfbebea6] [formerly d4997f5a90 [formerly cebfbebea6] [formerly 6cb73e63a1 [formerly 81d0249971d4004067b6aef672e00417ddb83b36]]]
Former-commit-id: 6cb73e63a1
Former-commit-id: 6959bdcdb2 [formerly 576e2eb0f8]
Former-commit-id: b0ddc103a7
|
2014-07-16 10:49:24 -05:00 |
|
Brian Clements
|
5adc1da0ac
|
Omaha #3373 jaxb manager refactor
api changes
reworked ogc jaxb manager to use parent class
Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48
Former-commit-id: 33684f3c97 [formerly e4c85f7cd5] [formerly 33684f3c97 [formerly e4c85f7cd5] [formerly e428f257cb [formerly 125c31f035057676d8c97a9b6c7a1d7b1b7f5bcb]]]
Former-commit-id: e428f257cb
Former-commit-id: cf3bc3e4f4 [formerly 58a4410763]
Former-commit-id: 80ae53ed0f
|
2014-07-16 09:00:59 -05:00 |
|
Steve Harris
|
bd9067626f
|
Merge branch 'omaha_14.4.1' into omaha_15.1.1
Conflicts:
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
Former-commit-id: a893b9b08a [formerly 05de3fbe54] [formerly a893b9b08a [formerly 05de3fbe54] [formerly a43ffbe052 [formerly 6d1d1a86cfb70e9ca096f59d9aadf8219efdaeb3]]]
Former-commit-id: a43ffbe052
Former-commit-id: 6920a273e5 [formerly 202c1a0316]
Former-commit-id: 7bf6b4de06
|
2014-07-14 12:08:09 -05:00 |
|
Nate Jensen
|
fd9475853b
|
Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1
Former-commit-id: a55162c74b [formerly 2531649c55] [formerly a55162c74b [formerly 2531649c55] [formerly 9f58d2e08b [formerly 97a0d0d8be7dd87e472dc0422a68df94d43095e1]]]
Former-commit-id: 9f58d2e08b
Former-commit-id: 289a4bf786 [formerly 363766fcca]
Former-commit-id: ad23d7e95d
|
2014-07-14 11:15:01 -05:00 |
|
Brian Clements
|
d8ce5db467
|
Omaha #3371 all subprocesses now killed when cave.sh is killed
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2
Former-commit-id: 0973e5ac41 [formerly 7e70fbda27] [formerly 0973e5ac41 [formerly 7e70fbda27] [formerly ae5fa893a9 [formerly e4becce5325aad266fd93548d27e5e122b145011]]]
Former-commit-id: ae5fa893a9
Former-commit-id: a1bce34fda [formerly e72c34d361]
Former-commit-id: 272c0a2e2d
|
2014-07-14 08:05:18 -05:00 |
|
Richard Peter
|
878c3fe29e
|
Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
Former-commit-id: 88419fb8f3 [formerly 0222a89cd4] [formerly 88419fb8f3 [formerly 0222a89cd4] [formerly 1c40dc11ef [formerly 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e]]]
Former-commit-id: 1c40dc11ef
Former-commit-id: d16ddba2f5 [formerly 2b75d79e0f]
Former-commit-id: d1af1f615d
|
2014-07-11 17:46:14 -05:00 |
|
Brian Clements
|
b384c87dff
|
Omaha #3333 added grid lightning to cave
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221
Former-commit-id: 555251982b [formerly a50f1e8e70] [formerly 555251982b [formerly a50f1e8e70] [formerly 29fc7e7ec4 [formerly 33736a713a2c360e70f5a06972a7a21937f2b34c]]]
Former-commit-id: 29fc7e7ec4
Former-commit-id: 140a4a4b15 [formerly e25961a39a]
Former-commit-id: db47c98989
|
2014-07-11 12:18:05 -05:00 |
|
Benjamin Phillippe
|
0c80abcc15
|
Omaha #3379 Removing DWR
Former-commit-id: cc9e9b427a [formerly d110e8428b] [formerly cc9e9b427a [formerly d110e8428b] [formerly 4e1d93abf8 [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]]
Former-commit-id: 4e1d93abf8
Former-commit-id: 5eea012728 [formerly 06e73cd55f]
Former-commit-id: 11a8186cbc
|
2014-07-11 11:56:44 -05:00 |
|
Brian Clements
|
f2d27e2f8b
|
Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298
Former-commit-id: 987d514fa3 [formerly 871a8655c8] [formerly 987d514fa3 [formerly 871a8655c8] [formerly 0113e109d3 [formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]]
Former-commit-id: 0113e109d3
Former-commit-id: ed9ba91d4e [formerly c32592fd1c]
Former-commit-id: 94f5989af7
|
2014-07-10 16:31:11 -05:00 |
|
Brian Clements
|
5e7da3ffac
|
Omaha #3214 fixed cache object usage in lightning resource
pulse and cloud flashes were not updated properly in the cache
Change-Id: Idf17aeb444f93c73901c26da9640f0a8f4a6a486
Former-commit-id: dba1fb3fc1 [formerly 994226e82b] [formerly dba1fb3fc1 [formerly 994226e82b] [formerly ac8f861112 [formerly 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393]]]
Former-commit-id: ac8f861112
Former-commit-id: f9dad29ad8 [formerly e74fcfbce1]
Former-commit-id: 97451515b6
|
2014-07-09 14:13:47 -05:00 |
|
Nate Jensen
|
ed4cfdb1f3
|
Omaha #3361 reduce number of extraneous localization requests at GFE
startup
Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed
Former-commit-id: c3bd61a2c0 [formerly 0c397d2b7e] [formerly c3bd61a2c0 [formerly 0c397d2b7e] [formerly 5547ea1c7d [formerly efa10ca2702ecee4535711be06373e5d079ac117]]]
Former-commit-id: 5547ea1c7d
Former-commit-id: d5f944d203 [formerly af08cc189f]
Former-commit-id: 9931cfdf84
|
2014-07-09 09:24:31 -05:00 |
|
Brian Clements
|
f3735af783
|
Omaha #3333 removed redundant field from viz lightning
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978
Former-commit-id: 91b136c2a0 [formerly 572d95e78a] [formerly 91b136c2a0 [formerly 572d95e78a] [formerly e4795f6a13 [formerly 2e701ade395cb2ec81d86af714fad825e146dc25]]]
Former-commit-id: e4795f6a13
Former-commit-id: 9afb344828 [formerly e1d5d86d29]
Former-commit-id: b2a4b1da71
|
2014-07-07 15:13:28 -05:00 |
|
Brian Clements
|
2bebd393d8
|
Omaha #1255 fixed collaboration colors
config.xml was not in build.properties
provided a fallback default if config is missing
Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6
Former-commit-id: aeb093ad95 [formerly 0d4cd4bab8] [formerly aeb093ad95 [formerly 0d4cd4bab8] [formerly da53d9ccc7 [formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]]
Former-commit-id: da53d9ccc7
Former-commit-id: 2cea766aed [formerly e6e84d2c71]
Former-commit-id: 9a1bc8c521
|
2014-07-07 12:29:12 -05:00 |
|
Richard Peter
|
1399f0cd57
|
Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
Former-commit-id: 4219dbeec8 [formerly ba1bd20407] [formerly 4219dbeec8 [formerly ba1bd20407] [formerly 8c17e9cef2 [formerly 3bbe66d8fe2faacc90c695822b61ffad9de0041f]]]
Former-commit-id: 8c17e9cef2
Former-commit-id: 3e19911306 [formerly 741fc59f34]
Former-commit-id: b4e4629d24
|
2014-07-07 09:39:28 -05:00 |
|
Richard Peter
|
48d293abd6
|
Merge "Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response" into omaha_15.1.1
Former-commit-id: 4312c9c569 [formerly 42ec8874c8] [formerly 4312c9c569 [formerly 42ec8874c8] [formerly 06a1d1555c [formerly 6d960e34632c2f615720c0550296d38feb8c90f6]]]
Former-commit-id: 06a1d1555c
Former-commit-id: d27ebb1175 [formerly 804e9d1035]
Former-commit-id: b97f693554
|
2014-07-07 09:30:09 -05:00 |
|
Ron Anderson
|
6935f82cfa
|
Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc
Former-commit-id: fd16321f82 [formerly 8d50f9d15a] [formerly fd16321f82 [formerly 8d50f9d15a] [formerly 24faa48233 [formerly 1e9e5abc477785c5b8cda9dd214da7de83532b9f]]]
Former-commit-id: 24faa48233
Former-commit-id: ae401db2ab [formerly 87664d86a5]
Former-commit-id: 9a873532ad
|
2014-07-07 09:02:14 -05:00 |
|
Roger Ferrel
|
0554d1834c
|
Omaha #3348 Handle Enter event on Open's tree and text field.
Change-Id: I3409e7cdee6c97d7d7f2c320ba0ac233fbf602d4
Former-commit-id: 1964c7c4f7 [formerly 6305bfdcb6] [formerly 1964c7c4f7 [formerly 6305bfdcb6] [formerly f064f0d102 [formerly 29cc43c5f9b43a51b24b702f04f0a62fab1bd356]]]
Former-commit-id: f064f0d102
Former-commit-id: 74f5c7eb82 [formerly 7649930247]
Former-commit-id: da45f3e5e2
|
2014-07-07 08:52:50 -05:00 |
|
Brian Clements
|
55bcd816ff
|
Omaha #3342 added count to collaboration participant list
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: c3a25024ae [formerly bfd9f59de8] [formerly c3a25024ae [formerly bfd9f59de8] [formerly e4c9a13adb [formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]]
Former-commit-id: e4c9a13adb
Former-commit-id: 50d2c6e24c [formerly bd9520f4fe]
Former-commit-id: 276dd801f2
|
2014-07-03 15:11:48 -05:00 |
|
Roger Ferrel
|
862a065051
|
Omaha #3318 Changes to add GEFS to volumen browser.
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e
Former-commit-id: 2723c92167 [formerly 02d9609862] [formerly 2723c92167 [formerly 02d9609862] [formerly 1869745cce [formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]]]
Former-commit-id: 1869745cce
Former-commit-id: 37c05adfaf [formerly 7f50b8fb93]
Former-commit-id: a7daeebc77
|
2014-07-02 14:27:28 -05:00 |
|
Brian Clements
|
c502009375
|
Omaha #3245 caveUtil.sh handle memory overide in vm args
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: fdec99abc5 [formerly 013292ce9d] [formerly fdec99abc5 [formerly 013292ce9d] [formerly 2773cf8935 [formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]]]
Former-commit-id: 2773cf8935
Former-commit-id: 767d8abd20 [formerly 648ffac146]
Former-commit-id: 6dea5ec026
|
2014-07-02 14:20:10 -05:00 |
|
Richard Peter
|
6710269555
|
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
Former-commit-id: 9c41b7c23e [formerly 59325cf1f1] [formerly 9c41b7c23e [formerly 59325cf1f1] [formerly 27ba905947 [formerly 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6]]]
Former-commit-id: 27ba905947
Former-commit-id: a22847695d [formerly 127ce13eb8]
Former-commit-id: a357fc835b
|
2014-07-02 11:51:26 -05:00 |
|
Nate Jensen
|
54a1daffc6
|
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
Former-commit-id: e193fe4719 [formerly 324194117a] [formerly e193fe4719 [formerly 324194117a] [formerly 14b514df2c [formerly 1a934dbd4fc637cec948f25e3a34a2f874ed0b83]]]
Former-commit-id: 14b514df2c
Former-commit-id: be426fc965 [formerly f39f6858e2]
Former-commit-id: 760adb2b77
|
2014-07-02 11:20:26 -05:00 |
|
Nate Jensen
|
f4540db824
|
Omaha #3165 build viz.useradmin before viz.datadelivery
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: 15d6ff7f79 [formerly f6cbccdc5c] [formerly 15d6ff7f79 [formerly f6cbccdc5c] [formerly 74e2bd1670 [formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]]]
Former-commit-id: 74e2bd1670
Former-commit-id: db24013aa6 [formerly e9b31a4429]
Former-commit-id: db9550e367
|
2014-07-02 11:18:59 -05:00 |
|
Brian Clements
|
2cd0d94e5d
|
Omaha #1255 added collaboration specific color presets
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: 08724fefd7 [formerly 8b5ad1ec33] [formerly 08724fefd7 [formerly 8b5ad1ec33] [formerly eac871eed7 [formerly 87ed36851c390058ab4c92977ecc552cab869d26]]]
Former-commit-id: eac871eed7
Former-commit-id: ea1ac8ee8f [formerly cd282ef018]
Former-commit-id: d066846c3f
|
2014-07-02 10:02:52 -05:00 |
|
Nate Jensen
|
ef967d42e3
|
Omaha #3165 attempt to fix build
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 1373af3e55 [formerly a93af621d8] [formerly 1373af3e55 [formerly a93af621d8] [formerly 765ac1258b [formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]]]
Former-commit-id: 765ac1258b
Former-commit-id: bbd50040a5 [formerly 264ac4d8a3]
Former-commit-id: d1d3aa94a6
|
2014-07-02 10:01:05 -05:00 |
|
Nate Jensen
|
8c99b38625
|
Omaha #3165 separate registry plugins for viz to support hazard services
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: a16d8689e9 [formerly f10efa300c] [formerly a16d8689e9 [formerly f10efa300c] [formerly f32bf19eb7 [formerly 4fedf54b9e2102268c873550da9c567edc2dd255]]]
Former-commit-id: f32bf19eb7
Former-commit-id: ec64800f28 [formerly 55dcecc7a7]
Former-commit-id: e659a0702d
|
2014-07-01 17:37:08 -05:00 |
|
Richard Peter
|
342192e967
|
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: 6636b301e5 [formerly 93bbd98cbc] [formerly 6636b301e5 [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 552ac6d640 [formerly fc27824dbc]
Former-commit-id: 0fefdc7cd6
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
15267970e4
|
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: f68e051938 [formerly 1c8dc56d49] [formerly f68e051938 [formerly 1c8dc56d49] [formerly 30cdbff7f8 [formerly 382c772c196711d230395f34a04559c188880622]]]
Former-commit-id: 30cdbff7f8
Former-commit-id: a4d91c59d6 [formerly 6f9129ac78]
Former-commit-id: d600ed9acf
|
2014-07-01 13:38:18 -05:00 |
|
Nate Jensen
|
7d03309e18
|
Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
Former-commit-id: 81ca7a9e9f [formerly c0d36e9a69] [formerly 81ca7a9e9f [formerly c0d36e9a69] [formerly 1183c0538e [formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]]]
Former-commit-id: 1183c0538e
Former-commit-id: 52d5edac63 [formerly cb9e715aec]
Former-commit-id: 10dee29029
|
2014-07-01 10:30:54 -05:00 |
|
Nate Jensen
|
73bdd3a339
|
Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
Former-commit-id: ac0f0e2298 [formerly 0a9fc691b9] [formerly ac0f0e2298 [formerly 0a9fc691b9] [formerly fbda7c4489 [formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]]]
Former-commit-id: fbda7c4489
Former-commit-id: fe1f9e8977 [formerly 9e6433f44b]
Former-commit-id: 6f0d007112
|
2014-07-01 10:22:25 -05:00 |
|
Steve Harris
|
8fb747ad27
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: 2f2958df37 [formerly d4dc1723c1] [formerly 2f2958df37 [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: 7fb4663d75 [formerly dcbab5621f]
Former-commit-id: 71357da9d2
|
2014-07-01 11:08:46 -04:00 |
|
Richard Peter
|
8c2a97eb67
|
Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
Former-commit-id: 20eeb493bb [formerly 6d9db0784a] [formerly 20eeb493bb [formerly 6d9db0784a] [formerly e6ac1b2ec8 [formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]]]
Former-commit-id: e6ac1b2ec8
Former-commit-id: 2965150f36 [formerly 3de8492ff3]
Former-commit-id: e659b5a694
|
2014-07-01 09:48:20 -05:00 |
|
Nate Jensen
|
94cd22b009
|
Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
Former-commit-id: 03efa73bd7 [formerly 63bc6ed372] [formerly 03efa73bd7 [formerly 63bc6ed372] [formerly fb84c94552 [formerly 933384a7ace268be2c267c7dd630dee6d1d42fd0]]]
Former-commit-id: fb84c94552
Former-commit-id: 7314f9c2f1 [formerly 01115d0ad0]
Former-commit-id: a2ab4f6c76
|
2014-06-30 16:21:09 -05:00 |
|
Brian Clements
|
be0185379b
|
Omaha #1798 fixed collaboration drawing issues when leader shares new map
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer
Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa
Former-commit-id: 0125117d9c [formerly 88ba6b47ad] [formerly 0125117d9c [formerly 88ba6b47ad] [formerly fc70dbc86e [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]]
Former-commit-id: fc70dbc86e
Former-commit-id: b186894f32 [formerly 44f8b3dce1]
Former-commit-id: 0be4260b4c
|
2014-06-30 15:57:58 -05:00 |
|
Nate Jensen
|
d189ad3b7a
|
Omaha #3245 fix detection of correct ini file
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7
Former-commit-id: d72b56b988 [formerly bca39f8b39] [formerly d72b56b988 [formerly bca39f8b39] [formerly 48249301fc [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]]]
Former-commit-id: 48249301fc
Former-commit-id: 0f0e890fce [formerly 1d6912b4dd]
Former-commit-id: 635e902b80
|
2014-06-30 15:53:41 -05:00 |
|
Nate Jensen
|
25b2c1fa3e
|
Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed
Former-commit-id: a393ad429a [formerly 766d3323d3] [formerly a393ad429a [formerly 766d3323d3] [formerly 128950ec19 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]]]
Former-commit-id: 128950ec19
Former-commit-id: 4ac06c06ee [formerly 2bf3449e00]
Former-commit-id: 345de597a6
|
2014-06-30 13:22:57 -05:00 |
|
Lee Venable
|
44f67ce5ad
|
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: 02037fc2df [formerly 588d3084da] [formerly 02037fc2df [formerly 588d3084da] [formerly 07a7a00256 [formerly 3d267d269db54c12852b6b6e8c529d826fad1d90]]]
Former-commit-id: 07a7a00256
Former-commit-id: e5f1eaf67d [formerly c6e53f6a9b]
Former-commit-id: 6046a2cbe1
|
2014-06-30 13:15:31 -05:00 |
|
Nate Jensen
|
29a41f81c2
|
Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
Former-commit-id: 1137ef84fd [formerly 9fddc57142] [formerly 1137ef84fd [formerly 9fddc57142] [formerly fdddf1e096 [formerly fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd]]]
Former-commit-id: fdddf1e096
Former-commit-id: cc66308aaa [formerly 1ac5c54ee3]
Former-commit-id: c6c921279a
|
2014-06-30 12:03:21 -05:00 |
|
Slav Korolev
|
5395df01c9
|
Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: cd740de298 [formerly 1b870e21fc] [formerly cd740de298 [formerly 1b870e21fc] [formerly 1956077e1a [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]]]
Former-commit-id: 1956077e1a
Former-commit-id: e8811128fc [formerly 0f5a2c0233]
Former-commit-id: a78f0ea765
|
2014-06-30 09:40:32 -04:00 |
|
Richard Peter
|
50fdb66cb4
|
Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: bcffac8875 [formerly 706409b459] [formerly bcffac8875 [formerly 706409b459] [formerly f4cdd661fe [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]]
Former-commit-id: f4cdd661fe
Former-commit-id: b94dc3b045 [formerly e3c3d55883]
Former-commit-id: 25dd598b55
|
2014-06-27 16:52:39 -05:00 |
|
Richard Peter
|
3847155429
|
Merge "Omaha #3281 made venue session views non-sticky (except for feed view)" into omaha_14.4.1
Former-commit-id: cfdb8eebfc [formerly 48aceec348] [formerly cfdb8eebfc [formerly 48aceec348] [formerly cfb9e6d0ad [formerly d7a09b5baa955732e94a0d043fc24e6a9770b7f1]]]
Former-commit-id: cfb9e6d0ad
Former-commit-id: d15be4d4a1 [formerly b1810026c8]
Former-commit-id: 8b8f6ff0fe
|
2014-06-27 16:51:36 -05:00 |
|
Brian Clements
|
ac986ca600
|
Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2
Former-commit-id: 023d1bde0b [formerly dc7a76197d] [formerly 023d1bde0b [formerly dc7a76197d] [formerly fe149faffa [formerly e216af49d135ceeff5e6cd251c6742602230553c]]]
Former-commit-id: fe149faffa
Former-commit-id: b8dc75d192 [formerly cb108f12b8]
Former-commit-id: 0800ea7cb7
|
2014-06-27 16:33:27 -05:00 |
|