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 |
|
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 |
|
Brian Clements
|
55e3b3673c
|
Omaha #3281 made venue session views non-sticky (except for feed view)
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0
Former-commit-id: eb806a6bb3 [formerly 741afe7d39] [formerly eb806a6bb3 [formerly 741afe7d39] [formerly 31a08efb61 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]]
Former-commit-id: 31a08efb61
Former-commit-id: 2350f7f630 [formerly ed2823daef]
Former-commit-id: c1bfab0914
|
2014-06-27 15:33:11 -05:00 |
|
Slav Korolev
|
a8e4449248
|
Omaha #3234 - Removed HiResW-ARW-PR and HiResW-NMM-PR from the list.
Former-commit-id: 6e60afd8cf [formerly b72f146d95] [formerly 6e60afd8cf [formerly b72f146d95] [formerly f6e8dedfa3 [formerly 834358236059cbabd11e89b2d43f7f1c621ce2e5]]]
Former-commit-id: f6e8dedfa3
Former-commit-id: 34d57cd15e [formerly 03890f03e3]
Former-commit-id: 99fc9b951a
|
2014-06-27 12:29:25 -04:00 |
|
Richard Peter
|
7daa1ed24b
|
Omaha #3274 Tweak G1 Flags for Cave
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6
Former-commit-id: 6bc89f2420 [formerly 46f42687e2] [formerly 6bc89f2420 [formerly 46f42687e2] [formerly 56389ef395 [formerly e16fd779239a09735d6ea092058a39bc7263b2f1]]]
Former-commit-id: 56389ef395
Former-commit-id: 2d18721bd6 [formerly 5112bbb8d5]
Former-commit-id: c5003ff6c4
|
2014-06-26 17:46:57 -05:00 |
|
Matt Nash
|
adc1a6df6d
|
Omaha #3303 make FFMPResource interrogatable
Change-Id: I59d0603f581034adc1607d69828c3c05c4051540
Former-commit-id: 8f71be817f [formerly 2be9c89722] [formerly 8f71be817f [formerly 2be9c89722] [formerly 58a9434254 [formerly 848a7c7428a42fe164312363c4eb3e4080d90d66]]]
Former-commit-id: 58a9434254
Former-commit-id: d4b6c9803e [formerly a82e71702a]
Former-commit-id: 0bfa8347a4
|
2014-06-26 17:30:22 -05:00 |
|
Nate Jensen
|
329f14de63
|
Merge "Omaha #3236 thin client pref page supports proxy server as text or combo field" into omaha_14.4.1
Former-commit-id: 59ab35e889 [formerly 024bc29e10] [formerly 59ab35e889 [formerly 024bc29e10] [formerly 1f6df7f52f [formerly 40a9f54b7354de60eaf2b94d10615b2d6ad0720f]]]
Former-commit-id: 1f6df7f52f
Former-commit-id: 0c9596bff8 [formerly 96a065399e]
Former-commit-id: 58791a046a
|
2014-06-26 15:26:21 -05:00 |
|
Nate Jensen
|
f957dd8e18
|
Omaha #3236 thin client pref page supports proxy server as text or combo
field
Change-Id: I7514d27a9b404e1c33cb6f7292475ff99bed4de0
Former-commit-id: e5c3c32bcb [formerly f4c1691c8d] [formerly e5c3c32bcb [formerly f4c1691c8d] [formerly 061482b015 [formerly 1a9433a524e5b8267fc3303db0763ac4685ec46d]]]
Former-commit-id: 061482b015
Former-commit-id: dc99cf6c15 [formerly 40a3c0a372]
Former-commit-id: 392ddd5ce0
|
2014-06-26 15:06:38 -05:00 |
|
Slav Korolev
|
81ae177c42
|
Omaha #3231 - Added 16 km Puerto Rico grid (AWIPS grid 200).
Former-commit-id: 41e8e36b8d [formerly 900d5e8fbe] [formerly 41e8e36b8d [formerly 900d5e8fbe] [formerly 79f2c0efc6 [formerly 4dc7f664a3e96a43392eee011bd453310d8e12ab]]]
Former-commit-id: 79f2c0efc6
Former-commit-id: 90ad46ac58 [formerly 3b9ed35eb0]
Former-commit-id: 0a006483ae
|
2014-06-26 14:04:34 -04:00 |
|
Roger Ferrel
|
f954d93c5a
|
Omaha #3230 Add URMA.
Change-Id: Iba46e07d2ff96029ae560b1232d3610b326d70df
Former-commit-id: 32ae3ba73f [formerly bd2d40faee] [formerly 32ae3ba73f [formerly bd2d40faee] [formerly ad6eac6e20 [formerly c6abaff91bc493c9a40e39a66afd2b2262697343]]]
Former-commit-id: ad6eac6e20
Former-commit-id: 6e37a43757 [formerly 801bdc8fc7]
Former-commit-id: 7fef8ed924
|
2014-06-26 11:16:09 -05:00 |
|
Nate Jensen
|
30d4d8fe27
|
Merge "Omaha #3236 thin client connectivity dialog remembers past proxy servers" into omaha_14.4.1
Former-commit-id: 7b44d8ad2d [formerly 589f74f6d8] [formerly 7b44d8ad2d [formerly 589f74f6d8] [formerly 49a592b19f [formerly 3d352136996875ff1e66b9e41244d53e16a1b2c3]]]
Former-commit-id: 49a592b19f
Former-commit-id: c73138b29e [formerly 2b3f7f02e5]
Former-commit-id: e5c63a67ac
|
2014-06-25 12:07:28 -05:00 |
|
Ben Steffensmeier
|
c0b839ce78
|
Omaha #3164 Disable compression on server error 500.
Former-commit-id: 7df0be0722 [formerly d7cdfa655d] [formerly 7df0be0722 [formerly d7cdfa655d] [formerly 120e9099e4 [formerly 7b3f6fe3b0d1bf8011d1cfea2937c39e33d4f81e]]]
Former-commit-id: 120e9099e4
Former-commit-id: 93ecdeeb08 [formerly 8ea38a01a3]
Former-commit-id: 05ad65e8a0
|
2014-06-25 11:13:39 -05:00 |
|
Nate Jensen
|
124d873714
|
Merge "Omaha #3072 Remove RadarRecord dependency for Radial Mesh." into omaha_14.4.1
Former-commit-id: c9696dbd3b [formerly 791ab4913c] [formerly c9696dbd3b [formerly 791ab4913c] [formerly 4bd68c8bd0 [formerly 3a87ec22c684ea4abab3a6328cc50682c5315cb9]]]
Former-commit-id: 4bd68c8bd0
Former-commit-id: 299c77f875 [formerly ce7812983a]
Former-commit-id: 374fb4373e
|
2014-06-25 09:54:38 -05:00 |
|
Nate Jensen
|
73bc714f93
|
Omaha #3236 thin client connectivity dialog remembers past proxy servers
Change-Id: I54c6032e451366fd3dee67da874f79dc690caa2a
Former-commit-id: 054e8ba9b9 [formerly 3b1c37dc38] [formerly 054e8ba9b9 [formerly 3b1c37dc38] [formerly 760b0cb584 [formerly 353872377cc3f96db4d3a22c6646fccb3edcb865]]]
Former-commit-id: 760b0cb584
Former-commit-id: ad647e2e85 [formerly a727313c41]
Former-commit-id: 5854347d2b
|
2014-06-25 08:54:24 -05:00 |
|
Nate Jensen
|
0938ff0ab7
|
Merge "Omaha #3245 altered utility scripts to account for cave subprocess" into omaha_14.4.1
Former-commit-id: 9c058c1e56 [formerly eacd31aa9b] [formerly 9c058c1e56 [formerly eacd31aa9b] [formerly 425651652d [formerly 45ac7ca480ea49dabff490ccc5b29878f0481b90]]]
Former-commit-id: 425651652d
Former-commit-id: 7d54b214e1 [formerly 3b288534e4]
Former-commit-id: c811adf70b
|
2014-06-25 08:32:25 -05:00 |
|
Steve Harris
|
deb3e3e437
|
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: c6aa4b6cbd [formerly d9a3129339] [formerly c6aa4b6cbd [formerly d9a3129339] [formerly 23d0cf81f8 [formerly 11c37fed7aed29ee42661948db90fab14b49c93c]]]
Former-commit-id: 23d0cf81f8
Former-commit-id: 5a5b95e88e [formerly f6f5c5a395]
Former-commit-id: 766c6ca296
|
2014-06-25 07:11:58 -05:00 |
|
Ben Steffensmeier
|
8dbd523f44
|
Omaha #3072 Remove RadarRecord dependency for Radial Mesh.
Former-commit-id: 08fe257daa [formerly e244664b7d] [formerly 08fe257daa [formerly e244664b7d] [formerly 5c4f89644c [formerly 664ae8372cd7df344ae66dfec599646b31dbd27b]]]
Former-commit-id: 5c4f89644c
Former-commit-id: d52b2254f5 [formerly 4d22a3c58e]
Former-commit-id: 397f83b2da
|
2014-06-24 18:16:09 -05:00 |
|
Brian Clements
|
be85fe241f
|
Omaha #3245 altered utility scripts to account for cave subprocess
Change-Id: I085432b0aab9224bc0a9ffdf2d6c58301dd94dcd
Former-commit-id: 27a0d3fb28 [formerly 0f25ac3b5b] [formerly 27a0d3fb28 [formerly 0f25ac3b5b] [formerly 3b71bedd14 [formerly aceeff1e02c896ff27794755eb10fc275718a68c]]]
Former-commit-id: 3b71bedd14
Former-commit-id: 91d1378c31 [formerly be3d47e5e9]
Former-commit-id: f1a30bf16e
|
2014-06-24 11:15:45 -05:00 |
|
Steve Harris
|
2841134c60
|
Merge branch 'master_14.2.2' (master_14.2.2-15) into omaha_14.2.2
Former-commit-id: 3f2058a1ab [formerly 89606076ec] [formerly 3f2058a1ab [formerly 89606076ec] [formerly ddc6f2092a [formerly 174fe6d66525229f328846a1f4564300d7603c10]]]
Former-commit-id: ddc6f2092a
Former-commit-id: 304d918a7c [formerly 1f033d22e6]
Former-commit-id: 323c240f59
|
2014-06-24 10:57:56 -05:00 |
|
Ben Steffensmeier
|
364953e5b7
|
Issue #2661 Fix grid time series errors when there is no data.
Former-commit-id: 2c1988017e [formerly aaa146b2d0] [formerly 2c1988017e [formerly aaa146b2d0] [formerly 46b8688597 [formerly 2fdb5867131b54f5d74ef3edd8c621c8807d4d99]]]
Former-commit-id: 46b8688597
Former-commit-id: 9edc1153de [formerly c184936340]
Former-commit-id: 17e92d31bd
|
2014-06-24 10:57:02 -05:00 |
|
Nate Jensen
|
eed3ec1650
|
Merge "Omaha #3238 Implement Interrogatable in SatResource." into omaha_14.4.1
Former-commit-id: 26ba9ff221 [formerly 2d98fb83fc] [formerly 26ba9ff221 [formerly 2d98fb83fc] [formerly 476eda3585 [formerly 83cd4ad4af6ac2f90a280fa1367ef88949870dc0]]]
Former-commit-id: 476eda3585
Former-commit-id: 8ee8589609 [formerly fdc0dacf68]
Former-commit-id: 4b343962dd
|
2014-06-23 17:45:11 -05:00 |
|
Ben Steffensmeier
|
fc0be3eb47
|
Omaha #3238 Implement Interrogatable in SatResource.
Former-commit-id: b1f14f631a [formerly ca853f7e93] [formerly b1f14f631a [formerly ca853f7e93] [formerly 7fe130b6e2 [formerly 698a2b174606c8425778f5672b613f2d74fb8997]]]
Former-commit-id: 7fe130b6e2
Former-commit-id: 4bf1990d8a [formerly 40041b4f7d]
Former-commit-id: a2119ef3a0
|
2014-06-23 17:21:43 -05:00 |
|
Lee Venable
|
4ccc00aaa9
|
Omaha #3161 - Added SWT dialog trim to the dialogs for thin client.
Former-commit-id: c4d064369d [formerly 1e561fbc8d] [formerly c4d064369d [formerly 1e561fbc8d] [formerly 4b9c65f6c4 [formerly 1c1f7dc0d3fb7627ff61032b3baa6c6781a35718]]]
Former-commit-id: 4b9c65f6c4
Former-commit-id: 70ebd1ea58 [formerly 9457dd4774]
Former-commit-id: 1ff51ed165
|
2014-06-23 16:29:24 -05:00 |
|
Lee Venable
|
09c582a70a
|
Omaha #3162 - Added code to have the Volume Browser display the min/max buttons in the title bar on thin client.
Former-commit-id: 6418906d23 [formerly 2401caa24f] [formerly 6418906d23 [formerly 2401caa24f] [formerly a176a26618 [formerly 363ddb4af1075686fc5a1d80df884f59d93d7b99]]]
Former-commit-id: a176a26618
Former-commit-id: db11f9af58 [formerly ab5d8d6204]
Former-commit-id: da158b0d70
|
2014-06-23 15:37:10 -05:00 |
|
Nate Jensen
|
fde6ed28ce
|
Omaha #3133 remove unnecessary plugins
Change-Id: Id9930080f742143e707c14ba96e770389f7aaf09
Former-commit-id: b92a2671f3 [formerly 5e30984a41] [formerly b92a2671f3 [formerly 5e30984a41] [formerly 2f85537a55 [formerly 04d26bedbe8d6ccf7a353159f27b133aff42970e]]]
Former-commit-id: 2f85537a55
Former-commit-id: 123679b8ec [formerly 544b0f0dd9]
Former-commit-id: 8bcc2155c6
|
2014-06-23 13:00:44 -05:00 |
|
Nate Jensen
|
b54b30e037
|
Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
Former-commit-id: 718d941c23 [formerly 61640d5c22] [formerly 718d941c23 [formerly 61640d5c22] [formerly 172f18a5b1 [formerly 449a40d7981b0814f9cc7feb62f52b2259e83e5f]]]
Former-commit-id: 172f18a5b1
Former-commit-id: 4e8d9343dd [formerly 48995ed5ca]
Former-commit-id: 217a0999d0
|
2014-06-23 12:12:03 -05:00 |
|
Nate Jensen
|
b1ab93a361
|
Issue #3307 fix xml serialization of looping field
Former-commit-id: c7c0d9cb4b [formerly 51da67dd3f] [formerly c7c0d9cb4b [formerly 51da67dd3f] [formerly 97ef9fc343 [formerly c6ce72840a4ee0f44eacff46015b5382d86dd47f]]]
Former-commit-id: 97ef9fc343
Former-commit-id: 416e6fc85d [formerly a3c20eb98a]
Former-commit-id: 9a3a4d5bfd
|
2014-06-23 09:54:11 -05:00 |
|
Steve Harris
|
196f53e609
|
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: 16f5ff0979 [formerly b84dda5930] [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]
Former-commit-id: 419c5f4aba
Former-commit-id: af06c5a890 [formerly 66d30e59a3]
Former-commit-id: 935542914d
|
2014-06-20 14:01:55 -04:00 |
|