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 |
|
Brian Clements
|
bb58783ca4
|
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: f053e9b084 [formerly 9d626a97e5] [formerly f053e9b084 [formerly 9d626a97e5] [formerly 93a1ee71c4 [formerly a31b7f213081f384bd23d53a431ce53593254c25]]]
Former-commit-id: 93a1ee71c4
Former-commit-id: 3eb4cd513c [formerly a9827ef8e8]
Former-commit-id: 7060fe3fba
|
2014-06-20 09:04:15 -05:00 |
|
Brian Clements
|
a8e31ffa21
|
Omaha #3281 collaboration views persist between perspectives
fixed bug that prevented re-opening collaboration after views were closed
Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3
Former-commit-id: 21fca2e662 [formerly 9aa5a87c4b] [formerly 21fca2e662 [formerly 9aa5a87c4b] [formerly fd95df3bc0 [formerly b84f7571415871f2983b913cf816ed227b24bbac]]]
Former-commit-id: fd95df3bc0
Former-commit-id: 74c62e0bf9 [formerly 795fa49ced]
Former-commit-id: 5560b12a5a
|
2014-06-20 08:53:54 -05:00 |
|
Nate Jensen
|
cc90e21628
|
Omaha #3245 remove -vm argument
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13
Former-commit-id: 02372893b6 [formerly 123b22d90a] [formerly 02372893b6 [formerly 123b22d90a] [formerly d60d2b5caf [formerly 003c2d49ecc20cfae2cdefb14119e7d0b143e4c6]]]
Former-commit-id: d60d2b5caf
Former-commit-id: 98e2cb8d62 [formerly ef20c3192e]
Former-commit-id: 7af79aca86
|
2014-06-19 14:44:24 -05:00 |
|
Nate Jensen
|
1d44a9f517
|
Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
Former-commit-id: 3971e05c4c [formerly 644fdf50c7] [formerly 3971e05c4c [formerly 644fdf50c7] [formerly caf278ca5c [formerly 741f2710372a713c53e70602395bf7c54fd17cdf]]]
Former-commit-id: caf278ca5c
Former-commit-id: ad63e5b322 [formerly 977a3818f1]
Former-commit-id: d67339b3a9
|
2014-06-19 13:42:06 -05:00 |
|
Nate Jensen
|
255d1859f4
|
Omaha #3255 fix cave install of data delivery
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e
Former-commit-id: 76658aa485 [formerly eff82573df] [formerly 76658aa485 [formerly eff82573df] [formerly f01e19946c [formerly bc22cda0a2bcdb550ad4d57a9be522336d4bc633]]]
Former-commit-id: f01e19946c
Former-commit-id: 6990acc1a7 [formerly cb5d6fe187]
Former-commit-id: 43cdc7fccb
|
2014-06-19 13:15:40 -05:00 |
|
Brian Clements
|
cadb1091fb
|
Omaha #3214 added pulse and cloud flash rendering to cave
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce
Former-commit-id: 6345119f9b [formerly 7dd90e6f85] [formerly 6345119f9b [formerly 7dd90e6f85] [formerly a18069809a [formerly 136bb5feca753f83f53d9d1e9381061853edc402]]]
Former-commit-id: a18069809a
Former-commit-id: bd2288e066 [formerly 6d5cbf29a5]
Former-commit-id: 74d4ebf071
|
2014-06-19 12:50:56 -05:00 |
|
Nate Jensen
|
813921a97c
|
Merge "Omaha #3255 Remove cxf from cave feature to fix build" into omaha_14.4.1
Former-commit-id: c19f10ddd4 [formerly 66cb3d5f03] [formerly c19f10ddd4 [formerly 66cb3d5f03] [formerly 27df878d86 [formerly 73c71e83588237e0a39d173c648f68a8e35bf119]]]
Former-commit-id: 27df878d86
Former-commit-id: d34ee39b1c [formerly 918e5664bb]
Former-commit-id: 9c0adc1c15
|
2014-06-19 10:59:35 -05:00 |
|
Benjamin Phillippe
|
7dd8c59365
|
Omaha #3255 Remove cxf from cave feature to fix build
Former-commit-id: 8428c676d7 [formerly 8d2605199e] [formerly 8428c676d7 [formerly 8d2605199e] [formerly fc024e6d4c [formerly b6f01bfe3f45ab4c3299879db44763994f7f8222]]]
Former-commit-id: fc024e6d4c
Former-commit-id: d9298ddd4f [formerly a90b1891b1]
Former-commit-id: fb3ea7760d
|
2014-06-19 10:58:11 -05:00 |
|
Nate Jensen
|
89d67fbce7
|
Omaha #3242 clean up more graphs
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4
Former-commit-id: 9e317cb9bc [formerly aca7b46243] [formerly 9e317cb9bc [formerly aca7b46243] [formerly 7bb2aebd59 [formerly 667817cf9473889f8c5cc39dd71814f1181a3805]]]
Former-commit-id: 7bb2aebd59
Former-commit-id: 88607607d7 [formerly 33f36374d0]
Former-commit-id: a1467e4361
|
2014-06-18 18:23:36 -05:00 |
|
Nate Jensen
|
da89b20f75
|
Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1
Former-commit-id: a83159ff6a [formerly 55bd088ce5] [formerly a83159ff6a [formerly 55bd088ce5] [formerly 835b65b7b8 [formerly 43684d4c0fe8f4b79ef384c08d01d2bdd51990e6]]]
Former-commit-id: 835b65b7b8
Former-commit-id: 135656f5f5 [formerly 19383d86f2]
Former-commit-id: c02a5a88eb
|
2014-06-18 17:17:17 -05:00 |
|
Nate Jensen
|
76f8d24c33
|
Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1
Former-commit-id: 393718bf41 [formerly f0e0866155] [formerly 393718bf41 [formerly f0e0866155] [formerly fbd7e64fe2 [formerly 84257c99914950f412f1e3d8c12b691fb428086f]]]
Former-commit-id: fbd7e64fe2
Former-commit-id: 9e8f46a84c [formerly 098712e6a0]
Former-commit-id: ddae1dc541
|
2014-06-18 17:17:04 -05:00 |
|
Nate Jensen
|
697c53e6bb
|
Merge "Omaha #3242 fix errors that can occur if a user zooms or pans while the time series is still loading" into omaha_14.4.1
Former-commit-id: 43a6ca22ac [formerly 0db147238d] [formerly 43a6ca22ac [formerly 0db147238d] [formerly 9a76fd4db0 [formerly 968613aaa91648a8e860eff88293744ddc00464c]]]
Former-commit-id: 9a76fd4db0
Former-commit-id: 2e569fea17 [formerly 7867dc1ff6]
Former-commit-id: a57ea807ea
|
2014-06-18 17:07:19 -05:00 |
|
Nate Jensen
|
d68030a1cc
|
Omaha #3242 thread safety for inset map
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857
Former-commit-id: 33f858e951 [formerly 9b98b63bb5] [formerly 33f858e951 [formerly 9b98b63bb5] [formerly 30e76a1fd5 [formerly d06eedeefc7997f6c881cf267c7f24979afbd9d7]]]
Former-commit-id: 30e76a1fd5
Former-commit-id: 40ca9ab166 [formerly a32552846d]
Former-commit-id: 3a7c95c110
|
2014-06-18 17:02:10 -05:00 |
|
Nate Jensen
|
e46c6a4ed4
|
Omaha #3242 fix errors that can occur if a user zooms or pans while the
time series is still loading
Change-Id: Ibcdc9681c651731f7da554c8cca40e260303aebb
Former-commit-id: b6ba8c0a3d [formerly a18fa3f026] [formerly b6ba8c0a3d [formerly a18fa3f026] [formerly 3ba4931eee [formerly 7999e026e8ff02ccb0f155af8770b0d8aac43339]]]
Former-commit-id: 3ba4931eee
Former-commit-id: 51e5563415 [formerly a990471021]
Former-commit-id: 4e673d8358
|
2014-06-18 16:48:48 -05:00 |
|
Nate Jensen
|
c65c47c798
|
Omaha #3242 fix error if user zooms on cross section before it's loaded
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830
Former-commit-id: aa579b85e7 [formerly 1add8fca08] [formerly aa579b85e7 [formerly 1add8fca08] [formerly 46c843f51a [formerly 4a7eebe03c9cd84702e6cda1258503da725a10bb]]]
Former-commit-id: 46c843f51a
Former-commit-id: 18ce2d6635 [formerly 32038939b3]
Former-commit-id: 4c44afbf22
|
2014-06-18 16:37:49 -05:00 |
|
Nate Jensen
|
bf95e2a827
|
Omaha #3242 support ensemble id in time series legends
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08
Former-commit-id: 73082de461 [formerly 1a8995fc2d] [formerly 73082de461 [formerly 1a8995fc2d] [formerly e10a73c17b [formerly 453c1eecf4f08203b4c6e2a74ad5dc366d85d359]]]
Former-commit-id: e10a73c17b
Former-commit-id: d6f84d8281 [formerly a575c57ecc]
Former-commit-id: 1d244a4a95
|
2014-06-18 15:37:14 -05:00 |
|
Benjamin Phillippe
|
55e4811fe8
|
Omaha #3255 Fixing Build
Former-commit-id: a50a8e79a1 [formerly 621a3f1a5c] [formerly a50a8e79a1 [formerly 621a3f1a5c] [formerly 7e7cecceea [formerly a2a18d6f4a9f536172c264eeeee3ff51e225981f]]]
Former-commit-id: 7e7cecceea
Former-commit-id: d59ea2591d [formerly f6dc8523d7]
Former-commit-id: 07c5831045
|
2014-06-18 13:57:27 -05:00 |
|
Nate Jensen
|
2e803f21b3
|
Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
Former-commit-id: 0167a89312 [formerly 042b69ba9a] [formerly 0167a89312 [formerly 042b69ba9a] [formerly 9fd4e4a8d9 [formerly b209ae6772fe33ca73a130468c4c314f86ffeba5]]]
Former-commit-id: 9fd4e4a8d9
Former-commit-id: fdebae41d5 [formerly 806b3b1490]
Former-commit-id: 5d1cf81f99
|
2014-06-18 12:14:45 -05:00 |
|
Nate Jensen
|
86a57cc2c5
|
Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1
Former-commit-id: 079828ecce [formerly b3e73d78cc] [formerly 079828ecce [formerly b3e73d78cc] [formerly 32bc3e4056 [formerly 5d378ca9529b48bd0a1422aec3263310f8350161]]]
Former-commit-id: 32bc3e4056
Former-commit-id: b6c7e0dfd2 [formerly c59136990b]
Former-commit-id: 7872e29f1b
|
2014-06-18 11:11:34 -05:00 |
|
Nate Jensen
|
787b6d8a60
|
Omaha #3274 fix generation of viz .ini files
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7
Former-commit-id: f958ca8de2 [formerly 465a0fef71] [formerly f958ca8de2 [formerly 465a0fef71] [formerly 17dc45e7ca [formerly dd628b80f7798bb66d3c54568b9549e66870ddec]]]
Former-commit-id: 17dc45e7ca
Former-commit-id: fe17c9b8b9 [formerly a9fc46a6fb]
Former-commit-id: 4129bd518d
|
2014-06-18 10:03:17 -05:00 |
|
Benjamin Phillippe
|
a8d99c348d
|
Omaha #3255 Dependency cleanup
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: b41f79658f [formerly 270caaadde] [formerly b41f79658f [formerly 270caaadde] [formerly c2ed8a39d1 [formerly dbac62df979f23402594dc6439b53e7884ea1bd1]]]
Former-commit-id: c2ed8a39d1
Former-commit-id: 38abcb36f5 [formerly 447fb0572a]
Former-commit-id: 5d908f2288
|
2014-06-18 09:54:40 -05:00 |
|
Steve Harris
|
a6d5652425
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (these go to ufcore):
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/AbstractGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/cmenu/ChangePointStyleAction.java
Former-commit-id: 9de49b59ea [formerly cc7e6bc52a] [formerly 9de49b59ea [formerly cc7e6bc52a] [formerly 676948e239 [formerly da50f581c90ea0cca5f43c45c44cb8ac045a6c8c]]]
Former-commit-id: 676948e239
Former-commit-id: 586f563839 [formerly 18b2a1df08]
Former-commit-id: 545d6da097
|
2014-06-18 08:52:25 -05:00 |
|
Brian.Dyke
|
b602d29456
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: be589ceb9b [formerly 399c06820a] [formerly be589ceb9b [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: e28febcf27 [formerly 9031f58d02]
Former-commit-id: 3e10995d87
|
2014-06-18 08:55:49 -04:00 |
|
Nate Jensen
|
3923c96927
|
Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1
Former-commit-id: 344a6b80ef [formerly a2783be56a] [formerly 344a6b80ef [formerly a2783be56a] [formerly 764f977bf6 [formerly 4468390aaf89456e93b45fca20aeca7fb96d8c12]]]
Former-commit-id: 764f977bf6
Former-commit-id: 686f6f67a0 [formerly bc5cedb1c8]
Former-commit-id: 7011f15929
|
2014-06-17 18:09:33 -05:00 |
|
Nate Jensen
|
f21b672114
|
Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1
Former-commit-id: bb60b170e8 [formerly dcab909b4b] [formerly bb60b170e8 [formerly dcab909b4b] [formerly 7fc256d076 [formerly c632bf24ee15cc85da9d7e7fb0a295912bf06b78]]]
Former-commit-id: 7fc256d076
Former-commit-id: 1f9f0ba7f3 [formerly a499624f5f]
Former-commit-id: f94209e681
|
2014-06-17 17:01:46 -05:00 |
|
Brian Clements
|
ed95461c36
|
Issue #2903 prevent shared display crash from missing point style enum value
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: b8a0a60df6 [formerly 9946f78241] [formerly b8a0a60df6 [formerly 9946f78241] [formerly 5d03048fff [formerly 5d298b39786d37aa365ccfe2c337214d1e46f1a9]]]
Former-commit-id: 5d03048fff
Former-commit-id: dbe778cbe0 [formerly 59d92634b0]
Former-commit-id: 48e634b14a
|
2014-06-17 17:01:23 -05:00 |
|
Nate Jensen
|
11753fc2d3
|
Omaha #3245 fix GFE starting without a cave data
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7
Former-commit-id: 2ce0e5aee5 [formerly 19aa9dc96e] [formerly 2ce0e5aee5 [formerly 19aa9dc96e] [formerly 8ab7d86a8f [formerly 539d497c5fc80efd5099e76a9e95a4709ace041d]]]
Former-commit-id: 8ab7d86a8f
Former-commit-id: 5129fee3e6 [formerly 451b265ce6]
Former-commit-id: e59c180fdc
|
2014-06-17 16:31:20 -05:00 |
|
Nate Jensen
|
aec31b09bc
|
Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1
Former-commit-id: 12ef85f665 [formerly 7fb85a1acc] [formerly 12ef85f665 [formerly 7fb85a1acc] [formerly c05ae83ea2 [formerly 2c2b3891003076484539ef5fa7d6772b6336c635]]]
Former-commit-id: c05ae83ea2
Former-commit-id: f925285131 [formerly 0d71d5dc2b]
Former-commit-id: 181da0bc6a
|
2014-06-17 16:24:42 -05:00 |
|
Brian Clements
|
3702533a45
|
Omaha #3078 collaboration shared display data over private chat
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf
Former-commit-id: b518cb2418 [formerly 9a427606ae] [formerly b518cb2418 [formerly 9a427606ae] [formerly add8286d52 [formerly a51847aff197f805a4e48c9ecdb0c16f874e6a78]]]
Former-commit-id: add8286d52
Former-commit-id: 13bf7e0793 [formerly 06b7415cec]
Former-commit-id: a993d1f90a
|
2014-06-17 14:32:17 -05:00 |
|