steve.naples
2a49bbda2f
ASM #253 Update RadarBiasTableDialog to allow undo changes.
...
Change-Id: Ibfb87730fda8185b27777fd83606bc1397aca1f9
Former-commit-id: 90ed511478efe877d82b
2014-06-24 15:52:23 +00:00
Nate Jensen
26ba9ff221
Merge "Omaha #3238 Implement Interrogatable in SatResource." into omaha_14.4.1
...
Former-commit-id: 476eda35852d98fb83fc
2014-06-23 17:45:11 -05:00
Ben Steffensmeier
b1f14f631a
Omaha #3238 Implement Interrogatable in SatResource.
...
Former-commit-id: 7fe130b6e2ca853f7e93
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: 4b9c65f6c41e561fbc8d
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: a176a266182401caa24f
2014-06-23 15:37:10 -05:00
Nate Jensen
b92a2671f3
Omaha #3133 remove unnecessary plugins
...
Change-Id: Id9930080f742143e707c14ba96e770389f7aaf09
Former-commit-id: 2f85537a555e30984a41
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: 172f18a5b161640d5c22
2014-06-23 12:12:03 -05:00
Nate Jensen
c7c0d9cb4b
Issue #3307 fix xml serialization of looping field
...
Former-commit-id: 97ef9fc34351da67dd3f
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: 419c5f4abab84dda5930
2014-06-20 14:01:55 -04:00
Brian Clements
f053e9b084
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: 93a1ee71c49d626a97e5
2014-06-20 09:04:15 -05:00
Brian Clements
21fca2e662
Omaha #3281 collaboration views persist between perspectives
...
fixed bug that prevented re-opening collaboration after views were closed
Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3
Former-commit-id: fd95df3bc09aa5a87c4b
2014-06-20 08:53:54 -05:00
Nate Jensen
02372893b6
Omaha #3245 remove -vm argument
...
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13
Former-commit-id: d60d2b5caf123b22d90a
2014-06-19 14:44:24 -05:00
Nate Jensen
3971e05c4c
Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
...
Former-commit-id: caf278ca5c644fdf50c7
2014-06-19 13:42:06 -05:00
Nate Jensen
76658aa485
Omaha #3255 fix cave install of data delivery
...
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e
Former-commit-id: f01e19946ceff82573df
2014-06-19 13:15:40 -05:00
Brian Clements
6345119f9b
Omaha #3214 added pulse and cloud flash rendering to cave
...
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce
Former-commit-id: a18069809a7dd90e6f85
2014-06-19 12:50:56 -05:00
Nate Jensen
c19f10ddd4
Merge "Omaha #3255 Remove cxf from cave feature to fix build" into omaha_14.4.1
...
Former-commit-id: 27df878d8666cb3d5f03
2014-06-19 10:59:35 -05:00
Benjamin Phillippe
8428c676d7
Omaha #3255 Remove cxf from cave feature to fix build
...
Former-commit-id: fc024e6d4c8d2605199e
2014-06-19 10:58:11 -05:00
Nate Jensen
9e317cb9bc
Omaha #3242 clean up more graphs
...
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4
Former-commit-id: 7bb2aebd59aca7b46243
2014-06-18 18:23:36 -05:00
Nate Jensen
a83159ff6a
Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1
...
Former-commit-id: 835b65b7b855bd088ce5
2014-06-18 17:17:17 -05:00
Nate Jensen
393718bf41
Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1
...
Former-commit-id: fbd7e64fe2f0e0866155
2014-06-18 17:17:04 -05:00
Nate Jensen
43a6ca22ac
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: 9a76fd4db00db147238d
2014-06-18 17:07:19 -05:00
Nate Jensen
33f858e951
Omaha #3242 thread safety for inset map
...
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857
Former-commit-id: 30e76a1fd59b98b63bb5
2014-06-18 17:02:10 -05:00
Nate Jensen
b6ba8c0a3d
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: 3ba4931eeea18fa3f026
2014-06-18 16:48:48 -05:00
Nate Jensen
aa579b85e7
Omaha #3242 fix error if user zooms on cross section before it's loaded
...
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830
Former-commit-id: 46c843f51a1add8fca08
2014-06-18 16:37:49 -05:00
Nate Jensen
73082de461
Omaha #3242 support ensemble id in time series legends
...
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08
Former-commit-id: e10a73c17b1a8995fc2d
2014-06-18 15:37:14 -05:00
Benjamin Phillippe
a50a8e79a1
Omaha #3255 Fixing Build
...
Former-commit-id: 7e7cecceea621a3f1a5c
2014-06-18 13:57:27 -05:00
Nate Jensen
0167a89312
Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
...
Former-commit-id: 9fd4e4a8d9042b69ba9a
2014-06-18 12:14:45 -05:00
Nate Jensen
079828ecce
Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1
...
Former-commit-id: 32bc3e4056b3e73d78cc
2014-06-18 11:11:34 -05:00
Nate Jensen
f958ca8de2
Omaha #3274 fix generation of viz .ini files
...
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7
Former-commit-id: 17dc45e7ca465a0fef71
2014-06-18 10:03:17 -05:00
Benjamin Phillippe
b41f79658f
Omaha #3255 Dependency cleanup
...
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: c2ed8a39d1270caaadde
2014-06-18 09:54:40 -05:00
Steve Harris
9de49b59ea
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: 676948e239cc7e6bc52a
2014-06-18 08:52:25 -05:00
Brian.Dyke
be589ceb9b
CM-MERGE:OB13.5.6-4 into 14.1.3
...
Former-commit-id: 8ecdd9a192399c06820a
2014-06-18 08:55:49 -04:00
Nate Jensen
344a6b80ef
Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1
...
Former-commit-id: 764f977bf6a2783be56a
2014-06-17 18:09:33 -05:00
Nate Jensen
bb60b170e8
Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1
...
Former-commit-id: 7fc256d076dcab909b4b
2014-06-17 17:01:46 -05:00
Brian Clements
b8a0a60df6
Issue #2903 prevent shared display crash from missing point style enum value
...
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: 5d03048fff9946f78241
2014-06-17 17:01:23 -05:00
Nate Jensen
2ce0e5aee5
Omaha #3245 fix GFE starting without a cave data
...
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7
Former-commit-id: 8ab7d86a8f19aa9dc96e
2014-06-17 16:31:20 -05:00
Nate Jensen
12ef85f665
Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1
...
Former-commit-id: c05ae83ea27fb85a1acc
2014-06-17 16:24:42 -05:00
Brian Clements
b518cb2418
Omaha #3078 collaboration shared display data over private chat
...
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf
Former-commit-id: add8286d529a427606ae
2014-06-17 14:32:17 -05:00
Nate Jensen
bd2ef07395
Merge "Omaha #3110 Fix typos in revision comment and log message. Changed to log number of messages in queue instead of number being added to queue." into omaha_14.4.1
...
Former-commit-id: acd7620d7ad8dc6eceef
2014-06-17 14:21:55 -05:00
Ron Anderson
b0a7be6203
Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1
...
Former-commit-id: 855b4ad7c1d5c2170a20
2014-06-17 13:54:11 -05:00
Ron Anderson
404098d861
Omaha #3110 Fix typos in revision comment and log message.
...
Changed to log number of messages in queue instead of number being added to queue.
Change-Id: I0f6b2be8e62be964de993c6c66f042b371a80bd7
Former-commit-id: 1a8ccd0181b7843361f6
2014-06-17 13:46:38 -05:00
Brian Clements
86e89665bf
Omaha #3078 added private chat to collaboration
...
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 97a6f5bfe837699395ef
2014-06-17 11:52:58 -05:00
Nate Jensen
14a520dbd9
Omaha #3274 switch viz to G1 garbage collector
...
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 44cb0e6ae64a91c3320b
2014-06-17 10:54:57 -05:00
Brian Clements
8205f7cd56
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: 84e3f967d9b6a2bf0ae4
2014-06-17 09:26:24 -05:00
Nate Jensen
95b2e262a0
Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
...
Former-commit-id: 9b7ed95e6bb1acd1709a
2014-06-16 09:26:30 -05:00
Nate Jensen
c2766190a4
Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1
...
Former-commit-id: b3df7745d45fad6501a7
2014-06-16 09:00:47 -05:00
Nate Jensen
4544d7d3e0
Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1
...
Former-commit-id: 5908a4501a181a87e72d
2014-06-16 09:00:39 -05:00
Nate Jensen
eddc8f373a
Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
...
Former-commit-id: ed36453f09c2aa87470d
2014-06-16 08:31:30 -05:00
Steve Harris
97843cf58e
Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Vector.py
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CCP.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GVV.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java
Former-commit-id: e1c8ad26119213369739
2014-06-16 08:19:12 -05:00
Ben Steffensmeier
9caf60a551
Omaha #3265 Fix potential NPE in D2D time matching.
...
Former-commit-id: 29b423645e81fbf3b697
2014-06-13 16:58:35 -05:00
