Roger Ferrel
|
2723c92167
|
Omaha #3318 Changes to add GEFS to volumen browser.
Change-Id: Ic3ebc329e66af87b14600fdfdc9e8cc505b8682e
Former-commit-id: 1869745cce [formerly a8346a3ffd677f916c14e0ed3589e4e582cb57b5]
Former-commit-id: 02d9609862
|
2014-07-02 14:27:28 -05:00 |
|
Brian Clements
|
fdec99abc5
|
Omaha #3245 caveUtil.sh handle memory overide in vm args
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: 2773cf8935 [formerly 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c]
Former-commit-id: 013292ce9d
|
2014-07-02 14:20:10 -05:00 |
|
Richard Peter
|
9c41b7c23e
|
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
Former-commit-id: 27ba905947 [formerly 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6]
Former-commit-id: 59325cf1f1
|
2014-07-02 11:51:26 -05:00 |
|
Nate Jensen
|
e193fe4719
|
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
Former-commit-id: 14b514df2c [formerly 1a934dbd4fc637cec948f25e3a34a2f874ed0b83]
Former-commit-id: 324194117a
|
2014-07-02 11:20:26 -05:00 |
|
Nate Jensen
|
15d6ff7f79
|
Omaha #3165 build viz.useradmin before viz.datadelivery
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: 74e2bd1670 [formerly 5c498bb7c3bf986cba9f150058406238e64d9b65]
Former-commit-id: f6cbccdc5c
|
2014-07-02 11:18:59 -05:00 |
|
Brian Clements
|
08724fefd7
|
Omaha #1255 added collaboration specific color presets
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: eac871eed7 [formerly 87ed36851c390058ab4c92977ecc552cab869d26]
Former-commit-id: 8b5ad1ec33
|
2014-07-02 10:02:52 -05:00 |
|
Nate Jensen
|
1373af3e55
|
Omaha #3165 attempt to fix build
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 765ac1258b [formerly 4f092220cb779c96660ec92509b9720b66c3d4a3]
Former-commit-id: a93af621d8
|
2014-07-02 10:01:05 -05:00 |
|
Nate Jensen
|
a16d8689e9
|
Omaha #3165 separate registry plugins for viz to support hazard services
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: f32bf19eb7 [formerly 4fedf54b9e2102268c873550da9c567edc2dd255]
Former-commit-id: f10efa300c
|
2014-07-01 17:37:08 -05:00 |
|
Richard Peter
|
6636b301e5
|
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: 8ecc27f714 [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]
Former-commit-id: 93bbd98cbc
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
f68e051938
|
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
Former-commit-id: 30cdbff7f8 [formerly 382c772c196711d230395f34a04559c188880622]
Former-commit-id: 1c8dc56d49
|
2014-07-01 13:38:18 -05:00 |
|
Nate Jensen
|
81ca7a9e9f
|
Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
Former-commit-id: 1183c0538e [formerly 3d0df846090261417f9c9b2e75cf6c439f9b979f]
Former-commit-id: c0d36e9a69
|
2014-07-01 10:30:54 -05:00 |
|
Nate Jensen
|
ac0f0e2298
|
Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
Former-commit-id: fbda7c4489 [formerly 221f81f4368a6bbd69255a1a148e055d65a2c957]
Former-commit-id: 0a9fc691b9
|
2014-07-01 10:22:25 -05:00 |
|
Steve Harris
|
2f2958df37
|
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: 7acd9ab2dd [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]
Former-commit-id: d4dc1723c1
|
2014-07-01 11:08:46 -04:00 |
|
Richard Peter
|
20eeb493bb
|
Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
Former-commit-id: e6ac1b2ec8 [formerly 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9]
Former-commit-id: 6d9db0784a
|
2014-07-01 09:48:20 -05:00 |
|
Nate Jensen
|
03efa73bd7
|
Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
Former-commit-id: fb84c94552 [formerly 933384a7ace268be2c267c7dd630dee6d1d42fd0]
Former-commit-id: 63bc6ed372
|
2014-06-30 16:21:09 -05:00 |
|
Brian Clements
|
0125117d9c
|
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: fc70dbc86e [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]
Former-commit-id: 88ba6b47ad
|
2014-06-30 15:57:58 -05:00 |
|
Nate Jensen
|
d72b56b988
|
Omaha #3245 fix detection of correct ini file
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7
Former-commit-id: 48249301fc [formerly 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453]
Former-commit-id: bca39f8b39
|
2014-06-30 15:53:41 -05:00 |
|
Nate Jensen
|
a393ad429a
|
Omaha #3165 remove deprecated buildColorMap()
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed
Former-commit-id: 128950ec19 [formerly 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c]
Former-commit-id: 766d3323d3
|
2014-06-30 13:22:57 -05:00 |
|
Lee Venable
|
02037fc2df
|
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: 07a7a00256 [formerly 3d267d269db54c12852b6b6e8c529d826fad1d90]
Former-commit-id: 588d3084da
|
2014-06-30 13:15:31 -05:00 |
|
Nate Jensen
|
1137ef84fd
|
Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
Former-commit-id: fdddf1e096 [formerly fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd]
Former-commit-id: 9fddc57142
|
2014-06-30 12:03:21 -05:00 |
|
Slav Korolev
|
cd740de298
|
Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
Former-commit-id: 1956077e1a [formerly 5c5513637b7eb223572cc3425a3c1623cde84d90]
Former-commit-id: 1b870e21fc
|
2014-06-30 09:40:32 -04:00 |
|
Richard Peter
|
bcffac8875
|
Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: f4cdd661fe [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]
Former-commit-id: 706409b459
|
2014-06-27 16:52:39 -05:00 |
|
Richard Peter
|
cfdb8eebfc
|
Merge "Omaha #3281 made venue session views non-sticky (except for feed view)" into omaha_14.4.1
Former-commit-id: cfb9e6d0ad [formerly d7a09b5baa955732e94a0d043fc24e6a9770b7f1]
Former-commit-id: 48aceec348
|
2014-06-27 16:51:36 -05:00 |
|
Brian Clements
|
023d1bde0b
|
Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2
Former-commit-id: fe149faffa [formerly e216af49d135ceeff5e6cd251c6742602230553c]
Former-commit-id: dc7a76197d
|
2014-06-27 16:33:27 -05:00 |
|
Brian Clements
|
eb806a6bb3
|
Omaha #3281 made venue session views non-sticky (except for feed view)
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0
Former-commit-id: 31a08efb61 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]
Former-commit-id: 741afe7d39
|
2014-06-27 15:33:11 -05:00 |
|
Slav Korolev
|
6e60afd8cf
|
Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
Former-commit-id: f6e8dedfa3 [formerly 834358236059cbabd11e89b2d43f7f1c621ce2e5]
Former-commit-id: b72f146d95
|
2014-06-27 12:29:25 -04:00 |
|
Richard Peter
|
6bc89f2420
|
Omaha #3274 Tweak G1 Flags for Cave
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6
Former-commit-id: 56389ef395 [formerly e16fd779239a09735d6ea092058a39bc7263b2f1]
Former-commit-id: 46f42687e2
|
2014-06-26 17:46:57 -05:00 |
|
Matt Nash
|
8f71be817f
|
Omaha #3303 make FFMPResource interrogatable
Change-Id: I59d0603f581034adc1607d69828c3c05c4051540
Former-commit-id: 58a9434254 [formerly 848a7c7428a42fe164312363c4eb3e4080d90d66]
Former-commit-id: 2be9c89722
|
2014-06-26 17:30:22 -05:00 |
|
Nate Jensen
|
59ab35e889
|
Merge "Omaha #3236 thin client pref page supports proxy server as text or combo field" into omaha_14.4.1
Former-commit-id: 1f6df7f52f [formerly 40a9f54b7354de60eaf2b94d10615b2d6ad0720f]
Former-commit-id: 024bc29e10
|
2014-06-26 15:26:21 -05:00 |
|
Nate Jensen
|
e5c3c32bcb
|
Omaha #3236 thin client pref page supports proxy server as text or combo
field
Change-Id: I7514d27a9b404e1c33cb6f7292475ff99bed4de0
Former-commit-id: 061482b015 [formerly 1a9433a524e5b8267fc3303db0763ac4685ec46d]
Former-commit-id: f4c1691c8d
|
2014-06-26 15:06:38 -05:00 |
|
Slav Korolev
|
41e8e36b8d
|
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 79f2c0efc6 [formerly 4dc7f664a3e96a43392eee011bd453310d8e12ab]
Former-commit-id: 900d5e8fbe
|
2014-06-26 14:04:34 -04:00 |
|
Roger Ferrel
|
32ae3ba73f
|
Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: ad6eac6e20 [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]
Former-commit-id: bd2d40faee
|
2014-06-26 11:16:09 -05:00 |
|
Nate Jensen
|
7b44d8ad2d
|
Merge "Omaha #3236 thin client connectivity dialog remembers past proxy servers" into omaha_14.4.1
Former-commit-id: 49a592b19f [formerly 3d352136996875ff1e66b9e41244d53e16a1b2c3]
Former-commit-id: 589f74f6d8
|
2014-06-25 12:07:28 -05:00 |
|
Ben Steffensmeier
|
7df0be0722
|
Omaha #3164 Disable compression on server error 500.
Former-commit-id: 120e9099e4 [formerly 7b3f6fe3b0d1bf8011d1cfea2937c39e33d4f81e]
Former-commit-id: d7cdfa655d
|
2014-06-25 11:13:39 -05:00 |
|
Nate Jensen
|
c9696dbd3b
|
Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
Former-commit-id: 4bd68c8bd0 [formerly 3a87ec22c684ea4abab3a6328cc50682c5315cb9]
Former-commit-id: 791ab4913c
|
2014-06-25 09:54:38 -05:00 |
|
Nate Jensen
|
054e8ba9b9
|
Omaha #3236 thin client connectivity dialog remembers past proxy servers
Change-Id: I54c6032e451366fd3dee67da874f79dc690caa2a
Former-commit-id: 760b0cb584 [formerly 353872377cc3f96db4d3a22c6646fccb3edcb865]
Former-commit-id: 3b1c37dc38
|
2014-06-25 08:54:24 -05:00 |
|
Nate Jensen
|
9c058c1e56
|
Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
Former-commit-id: 425651652d [formerly 45ac7ca480ea49dabff490ccc5b29878f0481b90]
Former-commit-id: eacd31aa9b
|
2014-06-25 08:32:25 -05:00 |
|
Steve Harris
|
c6aa4b6cbd
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.localization/src/com/raytheon/uf/common/localization/LockingFileOutputStream.java (moved to ufcore)
Former-commit-id: 23d0cf81f8 [formerly 11c37fed7aed29ee42661948db90fab14b49c93c]
Former-commit-id: d9a3129339
|
2014-06-25 07:11:58 -05:00 |
|
Ben Steffensmeier
|
08fe257daa
|
Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
Former-commit-id: 5c4f89644c [formerly 664ae8372cd7df344ae66dfec599646b31dbd27b]
Former-commit-id: e244664b7d
|
2014-06-24 18:16:09 -05:00 |
|
Brian Clements
|
27a0d3fb28
|
Omaha #3245 altered utility scripts to account for cave subprocess
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: 3b71bedd14 [formerly aceeff1e02c896ff27794755eb10fc275718a68c]
Former-commit-id: 0f25ac3b5b
|
2014-06-24 11:15:45 -05:00 |
|
Steve Harris
|
3f2058a1ab
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: ddc6f2092a [formerly 174fe6d66525229f328846a1f4564300d7603c10]
Former-commit-id: 89606076ec
|
2014-06-24 10:57:56 -05:00 |
|
Ben Steffensmeier
|
2c1988017e
|
Issue #2661 Fix grid time series errors when there is no data.
Former-commit-id: 46b8688597 [formerly 2fdb5867131b54f5d74ef3edd8c621c8807d4d99]
Former-commit-id: aaa146b2d0
|
2014-06-24 10:57:02 -05:00 |
|
Nate Jensen
|
26ba9ff221
|
Merge "Omaha #3238 Implement Interrogatable in SatResource." into omaha_14.4.1
Former-commit-id: 476eda3585 [formerly 83cd4ad4af6ac2f90a280fa1367ef88949870dc0]
Former-commit-id: 2d98fb83fc
|
2014-06-23 17:45:11 -05:00 |
|
Ben Steffensmeier
|
b1f14f631a
|
Omaha #3238 Implement Interrogatable in SatResource.
Former-commit-id: 7fe130b6e2 [formerly 698a2b174606c8425778f5672b613f2d74fb8997]
Former-commit-id: ca853f7e93
|
2014-06-23 17:21:43 -05:00 |
|
Lee Venable
|
c4d064369d
|
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: 4b9c65f6c4 [formerly 1c1f7dc0d3fb7627ff61032b3baa6c6781a35718]
Former-commit-id: 1e561fbc8d
|
2014-06-23 16:29:24 -05:00 |
|
Lee Venable
|
6418906d23
|
Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client.
Former-commit-id: a176a26618 [formerly 363ddb4af1075686fc5a1d80df884f59d93d7b99]
Former-commit-id: 2401caa24f
|
2014-06-23 15:37:10 -05:00 |
|
Nate Jensen
|
b92a2671f3
|
Omaha #3133 remove unnecessary plugins
Change-Id: Id9930080f742143e707c14ba96e770389f7aaf09
Former-commit-id: 2f85537a55 [formerly 04d26bedbe8d6ccf7a353159f27b133aff42970e]
Former-commit-id: 5e30984a41
|
2014-06-23 13:00:44 -05:00 |
|
Nate Jensen
|
718d941c23
|
Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
Former-commit-id: 172f18a5b1 [formerly 449a40d7981b0814f9cc7feb62f52b2259e83e5f]
Former-commit-id: 61640d5c22
|
2014-06-23 12:12:03 -05:00 |
|
Nate Jensen
|
c7c0d9cb4b
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: 97ef9fc343 [formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]
Former-commit-id: 51da67dd3f
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
16f5ff0979
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]
Former-commit-id: b84dda5930
|
2014-06-20 14:01:55 -04:00 |
|