Brian Clements
2773cf8935
Omaha #3245 caveUtil.sh handle memory overide in vm args
...
Change-Id: I7525cd9d62acbc3a6ac44913c7c856ae5b6760fc
Former-commit-id: 26ee019a0cf71f31732ce0983fd6c0fe28e63d6c
2014-07-02 14:20:10 -05:00
Richard Peter
27ba905947
Merge "Omaha #3165 build viz.useradmin before viz.datadelivery" into omaha_14.4.1
...
Former-commit-id: 693b0f2deb787ee3bb039a1c8807c1b2ae37c3a6
2014-07-02 11:51:26 -05:00
Nate Jensen
14b514df2c
Merge "Omaha #1255 added collaboration specific color presets" into omaha_14.4.1
...
Former-commit-id: 1a934dbd4fc637cec948f25e3a34a2f874ed0b83
2014-07-02 11:20:26 -05:00
Nate Jensen
74e2bd1670
Omaha #3165 build viz.useradmin before viz.datadelivery
...
Change-Id: I5ed6d5554cd15fd9ebfcdf9ed6a7e8423dd58e49
Former-commit-id: 5c498bb7c3bf986cba9f150058406238e64d9b65
2014-07-02 11:18:59 -05:00
Brian Clements
eac871eed7
Omaha #1255 added collaboration specific color presets
...
Change-Id: I57bb20d0de10fdc256f6177489760e12c297662f
Former-commit-id: 87ed36851c390058ab4c92977ecc552cab869d26
2014-07-02 10:02:52 -05:00
Nate Jensen
765ac1258b
Omaha #3165 attempt to fix build
...
Change-Id: I83354442493b532b711fc3febb4163428b89a372
Former-commit-id: 4f092220cb779c96660ec92509b9720b66c3d4a3
2014-07-02 10:01:05 -05:00
Nate Jensen
f32bf19eb7
Omaha #3165 separate registry plugins for viz to support hazard services
...
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4
Former-commit-id: 4fedf54b9e2102268c873550da9c567edc2dd255
2014-07-01 17:37:08 -05:00
Richard Peter
8ecc27f714
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: fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9
2014-07-01 15:34:39 -05:00
Steve Harris
30cdbff7f8
Merge branch 'master_14.3.1' (14.3.1-12) into omaha_14.3.1
...
Former-commit-id: 382c772c196711d230395f34a04559c188880622
2014-07-01 13:38:18 -05:00
Nate Jensen
1183c0538e
Merge "Omaha #1798 fixed collaboration drawing issues when leader shares new map" into omaha_14.4.1
...
Former-commit-id: 3d0df846090261417f9c9b2e75cf6c439f9b979f
2014-07-01 10:30:54 -05:00
Nate Jensen
fbda7c4489
Merge "Omaha #3165 remove deprecated buildColorMap()" into omaha_14.4.1
...
Former-commit-id: 221f81f4368a6bbd69255a1a148e055d65a2c957
2014-07-01 10:22:25 -05:00
Steve Harris
7acd9ab2dd
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: d25ab509cb53d559edbd520dd1e3c036166f2e29
2014-07-01 11:08:46 -04:00
Richard Peter
e6ac1b2ec8
Merge "Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order." into omaha_14.4.1
...
Former-commit-id: 1e9ec8669f14dcae4e59ba5e471906de3bdc01a9
2014-07-01 09:48:20 -05:00
Nate Jensen
fb84c94552
Merge "Omaha #3245 fix detection of correct ini file" into omaha_14.4.1
...
Former-commit-id: 933384a7ace268be2c267c7dd630dee6d1d42fd0
2014-06-30 16:21:09 -05:00
Brian Clements
fc70dbc86e
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: 4df0a485d285a920a53e812bec204683f5ff29f6
2014-06-30 15:57:58 -05:00
Nate Jensen
48249301fc
Omaha #3245 fix detection of correct ini file
...
Change-Id: I623f436da452258a3d70c9379779d4975bfe4ed7
Former-commit-id: 597b6bfe5ddf6978702a2b87a15f0bbeddc8f453
2014-06-30 15:53:41 -05:00
Nate Jensen
128950ec19
Omaha #3165 remove deprecated buildColorMap()
...
Change-Id: I1bcf368173ff785c0e05acb9c14cfbaa33080bed
Former-commit-id: 6b3aa0f461293e6b8d94f8cfc5f956ab172b2e3c
2014-06-30 13:22:57 -05:00
Lee Venable
07a7a00256
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
...
Former-commit-id: 3d267d269db54c12852b6b6e8c529d826fad1d90
2014-06-30 13:15:31 -05:00
Nate Jensen
fdddf1e096
Merge "Omaha #3303 make FFMPResource interrogatable" into omaha_14.4.1
...
Former-commit-id: fe2b362a609f2d9aa60bc21e8c23ebbcc118a5dd
2014-06-30 12:03:21 -05:00
Slav Korolev
1956077e1a
Omaha #3233 - List of grids in the Volume Browser should be arranged in alphabet order.
...
Former-commit-id: 5c5513637b7eb223572cc3425a3c1623cde84d90
2014-06-30 09:40:32 -04:00
Richard Peter
f4cdd661fe
Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
...
Former-commit-id: f81ae068eca41eeae5d785668f4c1d7cf59ae9df
2014-06-27 16:52:39 -05:00
Richard Peter
cfb9e6d0ad
Merge "Omaha #3281 made venue session views non-sticky (except for feed view)" into omaha_14.4.1
...
Former-commit-id: d7a09b5baa955732e94a0d043fc24e6a9770b7f1
2014-06-27 16:51:36 -05:00
Brian Clements
fe149faffa
Omaha #3323 fixed collaboration disposed font issue
...
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2
Former-commit-id: e216af49d135ceeff5e6cd251c6742602230553c
2014-06-27 16:33:27 -05:00
Brian Clements
31a08efb61
Omaha #3281 made venue session views non-sticky (except for feed view)
...
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0
Former-commit-id: e7f48359f00b2e91b39b7646da0f9f409f5d3805
2014-06-27 15:33:11 -05:00
Slav Korolev
f6e8dedfa3
Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
...
Former-commit-id: 834358236059cbabd11e89b2d43f7f1c621ce2e5
2014-06-27 12:29:25 -04:00
Richard Peter
56389ef395
Omaha #3274 Tweak G1 Flags for Cave
...
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6
Former-commit-id: e16fd779239a09735d6ea092058a39bc7263b2f1
2014-06-26 17:46:57 -05:00
Matt Nash
58a9434254
Omaha #3303 make FFMPResource interrogatable
...
Change-Id: I59d0603f581034adc1607d69828c3c05c4051540
Former-commit-id: 848a7c7428a42fe164312363c4eb3e4080d90d66
2014-06-26 17:30:22 -05:00
Nate Jensen
1f6df7f52f
Merge "Omaha #3236 thin client pref page supports proxy server as text or combo field" into omaha_14.4.1
...
Former-commit-id: 40a9f54b7354de60eaf2b94d10615b2d6ad0720f
2014-06-26 15:26:21 -05:00
Nate Jensen
061482b015
Omaha #3236 thin client pref page supports proxy server as text or combo
...
field
Change-Id: I7514d27a9b404e1c33cb6f7292475ff99bed4de0
Former-commit-id: 1a9433a524e5b8267fc3303db0763ac4685ec46d
2014-06-26 15:06:38 -05:00
Slav Korolev
79f2c0efc6
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
...
Former-commit-id: 4dc7f664a3e96a43392eee011bd453310d8e12ab
2014-06-26 14:04:34 -04:00
Roger Ferrel
ad6eac6e20
Omaha #3230 Add URMA.
...
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: c6abaff91bc493c9a40e39a66afd2b2262697343
2014-06-26 11:16:09 -05:00
Nate Jensen
49a592b19f
Merge "Omaha #3236 thin client connectivity dialog remembers past proxy servers" into omaha_14.4.1
...
Former-commit-id: 3d352136996875ff1e66b9e41244d53e16a1b2c3
2014-06-25 12:07:28 -05:00
Ben Steffensmeier
120e9099e4
Omaha #3164 Disable compression on server error 500.
...
Former-commit-id: 7b3f6fe3b0d1bf8011d1cfea2937c39e33d4f81e
2014-06-25 11:13:39 -05:00
Nate Jensen
4bd68c8bd0
Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
...
Former-commit-id: 3a87ec22c684ea4abab3a6328cc50682c5315cb9
2014-06-25 09:54:38 -05:00
Nate Jensen
760b0cb584
Omaha #3236 thin client connectivity dialog remembers past proxy servers
...
Change-Id: I54c6032e451366fd3dee67da874f79dc690caa2a
Former-commit-id: 353872377cc3f96db4d3a22c6646fccb3edcb865
2014-06-25 08:54:24 -05:00
Nate Jensen
425651652d
Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
...
Former-commit-id: 45ac7ca480ea49dabff490ccc5b29878f0481b90
2014-06-25 08:32:25 -05:00
Steve Harris
23d0cf81f8
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: 11c37fed7aed29ee42661948db90fab14b49c93c
2014-06-25 07:11:58 -05:00
Ben Steffensmeier
5c4f89644c
Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
...
Former-commit-id: 664ae8372cd7df344ae66dfec599646b31dbd27b
2014-06-24 18:16:09 -05:00
Brian Clements
3b71bedd14
Omaha #3245 altered utility scripts to account for cave subprocess
...
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: aceeff1e02c896ff27794755eb10fc275718a68c
2014-06-24 11:15:45 -05:00
Steve Harris
ddc6f2092a
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
...
Former-commit-id: 174fe6d66525229f328846a1f4564300d7603c10
2014-06-24 10:57:56 -05:00
Ben Steffensmeier
46b8688597
Issue #2661 Fix grid time series errors when there is no data.
...
Former-commit-id: 2fdb5867131b54f5d74ef3edd8c621c8807d4d99
2014-06-24 10:57:02 -05:00
Nate Jensen
476eda3585
Merge "Omaha #3238 Implement Interrogatable in SatResource." into omaha_14.4.1
...
Former-commit-id: 83cd4ad4af6ac2f90a280fa1367ef88949870dc0
2014-06-23 17:45:11 -05:00
Ben Steffensmeier
7fe130b6e2
Omaha #3238 Implement Interrogatable in SatResource.
...
Former-commit-id: 698a2b174606c8425778f5672b613f2d74fb8997
2014-06-23 17:21:43 -05:00
Lee Venable
4b9c65f6c4
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
...
Former-commit-id: 1c1f7dc0d3fb7627ff61032b3baa6c6781a35718
2014-06-23 16:29:24 -05:00
Lee Venable
a176a26618
Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client.
...
Former-commit-id: 363ddb4af1075686fc5a1d80df884f59d93d7b99
2014-06-23 15:37:10 -05:00
Nate Jensen
2f85537a55
Omaha #3133 remove unnecessary plugins
...
Change-Id: Id9930080f742143e707c14ba96e770389f7aaf09
Former-commit-id: 04d26bedbe8d6ccf7a353159f27b133aff42970e
2014-06-23 13:00:44 -05:00
Nate Jensen
172f18a5b1
Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
...
Former-commit-id: 449a40d7981b0814f9cc7feb62f52b2259e83e5f
2014-06-23 12:12:03 -05:00
Nate Jensen
97ef9fc343
Issue #3307 fix xml serialization of looping field
...
Former-commit-id: c6ce72840a4ee0f44eacff46015b5382d86dd47f
2014-06-23 09:54:11 -05:00
Steve Harris
419c5f4aba
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: ce5767f2bbf5c9627bd43e766c6193c261c48af3
2014-06-20 14:01:55 -04:00
Brian Clements
93a1ee71c4
Omaha #3281 peer2peer chat view improvements
...
bounced chat messages now result in error messages in window
fixed view secondary id bug with userids (removed resource from key)
Change-Id: I76a68bf290b0c5205361bc6c78fda99336d7c62d
Former-commit-id: a31b7f213081f384bd23d53a431ce53593254c25
2014-06-20 09:04:15 -05:00
