Nate Jensen
c882f1c656
Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1
...
Former-commit-id: 835b65b7b855bd088ce555bd088ce5a83159ff6a
2014-06-18 17:17:17 -05:00
Nate Jensen
679c3cfc12
Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1
...
Former-commit-id: fbd7e64fe2f0e0866155f0e0866155393718bf41
2014-06-18 17:17:04 -05:00
Nate Jensen
9d943b869c
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: 9a76fd4db00db147238d0db147238d43a6ca22ac
2014-06-18 17:07:19 -05:00
Nate Jensen
63adaa42b1
Omaha #3242 thread safety for inset map
...
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857
Former-commit-id: 30e76a1fd59b98b63bb59b98b63bb533f858e951
2014-06-18 17:02:10 -05:00
Nate Jensen
718c6f8901
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: 3ba4931eeea18fa3f026a18fa3f026b6ba8c0a3d
2014-06-18 16:48:48 -05:00
Nate Jensen
472b055826
Omaha #3242 fix error if user zooms on cross section before it's loaded
...
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830
Former-commit-id: 46c843f51a1add8fca081add8fca08aa579b85e7
2014-06-18 16:37:49 -05:00
Nate Jensen
9fad6c4712
Omaha #3242 support ensemble id in time series legends
...
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08
Former-commit-id: e10a73c17b1a8995fc2d1a8995fc2d73082de461
2014-06-18 15:37:14 -05:00
Benjamin Phillippe
ce6d87cdcb
Omaha #3255 Fix build
...
Former-commit-id: bc9e7f1cb33864eb622e3864eb622eebecdaeb36
2014-06-18 14:03:23 -05:00
Benjamin Phillippe
2451e01f8f
Omaha #3255 Fixing Build
...
Former-commit-id: 7e7cecceea621a3f1a5c621a3f1a5ca50a8e79a1
2014-06-18 13:57:27 -05:00
Nate Jensen
45f7c49885
Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
...
Former-commit-id: 9fd4e4a8d9042b69ba9a042b69ba9a0167a89312
2014-06-18 12:14:45 -05:00
Nate Jensen
0b6265a9b5
Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1
...
Former-commit-id: 32bc3e4056b3e73d78ccb3e73d78cc079828ecce
2014-06-18 11:11:34 -05:00
Nate Jensen
68679fd1a5
Omaha #3274 fix generation of viz .ini files
...
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7
Former-commit-id: 17dc45e7ca465a0fef71465a0fef71f958ca8de2
2014-06-18 10:03:17 -05:00
Benjamin Phillippe
50e9bbd139
Omaha #3255 Dependency cleanup
...
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: c2ed8a39d1270caaadde270caaaddeb41f79658f
2014-06-18 09:54:40 -05:00
Steve Harris
3e2eeedc29
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: 676948e239cc7e6bc52acc7e6bc52a9de49b59ea
2014-06-18 08:52:25 -05:00
Nate Jensen
7299d9ccb8
Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1
...
Former-commit-id: 764f977bf6a2783be56aa2783be56a344a6b80ef
2014-06-17 18:09:33 -05:00
Nate Jensen
b0d4a3006b
Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1
...
Former-commit-id: 7fc256d076dcab909b4bdcab909b4bbb60b170e8
2014-06-17 17:01:46 -05:00
Brian Clements
ccac7c3d47
Issue #2903 prevent shared display crash from missing point style enum value
...
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: 5d03048fff9946f782419946f78241b8a0a60df6
2014-06-17 17:01:23 -05:00
Nate Jensen
3828961fa0
Omaha #3245 fix GFE starting without a cave data
...
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7
Former-commit-id: 8ab7d86a8f19aa9dc96e19aa9dc96e2ce0e5aee5
2014-06-17 16:31:20 -05:00
Nate Jensen
58a8a337d1
Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1
...
Former-commit-id: c05ae83ea27fb85a1acc7fb85a1acc12ef85f665
2014-06-17 16:24:42 -05:00
Brian Clements
bb4ff41368
Omaha #3078 collaboration shared display data over private chat
...
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf
Former-commit-id: add8286d529a427606ae9a427606aeb518cb2418
2014-06-17 14:32:17 -05:00
Nate Jensen
1dcfbab3fd
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: acd7620d7ad8dc6eceefd8dc6eceefbd2ef07395
2014-06-17 14:21:55 -05:00
Ron Anderson
39bf0a24c0
Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1
...
Former-commit-id: 855b4ad7c1d5c2170a20d5c2170a20b0a7be6203
2014-06-17 13:54:11 -05:00
Ron Anderson
8e920811f3
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: 1a8ccd0181b7843361f6b7843361f6404098d861
2014-06-17 13:46:38 -05:00
Brian Clements
8fee2a762c
Omaha #3078 added private chat to collaboration
...
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 97a6f5bfe837699395ef37699395ef86e89665bf
2014-06-17 11:52:58 -05:00
Nate Jensen
b774f28cc8
Merge "Omaha #3288 collaboration feed venue config comes from server" into omaha_14.4.1
...
Former-commit-id: d334c16d1c812f679b22812f679b221df0cf7aff
2014-06-17 11:19:03 -05:00
Nate Jensen
172777137a
Omaha #3274 switch viz to G1 garbage collector
...
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 44cb0e6ae64a91c3320b4a91c3320b14a520dbd9
2014-06-17 10:54:57 -05:00
Brian Clements
f38f9fae51
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: 84e3f967d9b6a2bf0ae4b6a2bf0ae48205f7cd56
2014-06-17 09:26:24 -05:00
Nate Jensen
af077fdf89
Omaha #3255 attempt to fix build
...
Change-Id: I8b21eaebaa60a7051ccbc9d12d33df742c471f25
Former-commit-id: 3c57231c82bc48674092bc48674092985c88d38b
2014-06-17 08:42:29 -05:00
Nate Jensen
382fd79fb5
Omaha #3255 fix build
...
Change-Id: I0bff28eb7d430c7a789539a76c893ecf0a64ac46
Former-commit-id: c65c392d63a8bae916f3a8bae916f34fd29b211a
2014-06-17 07:40:18 -05:00
Ben Steffensmeier
7e5eb9d3ae
Omaha #2061 Update ncep copies of radar resources.
...
Former-commit-id: 8064a7486614b5c0d79214b5c0d7928d521a40d0
2014-06-16 10:56:40 -05:00
Nate Jensen
40c2a6c486
Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
...
Former-commit-id: 9b7ed95e6bb1acd1709ab1acd1709a95b2e262a0
2014-06-16 09:26:30 -05:00
Nate Jensen
edfb0ca7d5
Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1
...
Former-commit-id: b3df7745d45fad6501a75fad6501a7c2766190a4
2014-06-16 09:00:47 -05:00
Nate Jensen
f29aea8b46
Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1
...
Former-commit-id: 5908a4501a181a87e72d181a87e72d4544d7d3e0
2014-06-16 09:00:39 -05:00
Greg Armendariz
670fb899a5
Merge "Omaha #3247 - Update qpid dependency" into omaha_14.4.1
...
Former-commit-id: 8c568a223efaebbc13f7faebbc13f7e73a0de182
2014-06-16 08:57:12 -05:00
Nate Jensen
8ce9a5e5b8
Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
...
Former-commit-id: ed36453f09c2aa87470dc2aa87470deddc8f373a
2014-06-16 08:31:30 -05:00
Steve Harris
4d724b6474
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: e1c8ad26119213369739921336973997843cf58e
2014-06-16 08:19:12 -05:00
Steve Harris
e67900933d
Merge branch 'master_14.3.1' (14.3.1-10,11) into omaha_14.3.1
...
Former-commit-id: 6c82cc5c3d1d2b8aeb7b1d2b8aeb7b0c3dcb77d5
2014-06-16 07:49:58 -05:00
Greg Armendariz
65ced96c6b
Omaha #3247 - Update qpid dependency
...
Former-commit-id: 70104bc9aadb4e94b713db4e94b713c14107d4cf
2014-06-14 08:13:14 -05:00
Ben Steffensmeier
0545a079a0
Omaha #3265 Fix potential NPE in D2D time matching.
...
Former-commit-id: 29b423645e81fbf3b69781fbf3b6979caf60a551
2014-06-13 16:58:35 -05:00
Ben Steffensmeier
4080f9b50b
Omaha #3163 Fix NPE when styleless strings are sent to 14.3
...
Former-commit-id: 7245544e1f1f8f612d3a1f8f612d3ad2997f9fc0
2014-06-13 16:49:25 -05:00
Benjamin Phillippe
57c27d984c
Omaha #3255 Fix Build
...
Former-commit-id: 63d104d18da22c77cbfba22c77cbfb67ee2613d7
2014-06-13 11:17:55 -05:00
Benjamin Phillippe
00e6a892b8
Omaha #3255 Fix Build
...
Former-commit-id: 493302f63b0baf11790f0baf11790f9a2b844db1
2014-06-13 10:55:23 -05:00
Ron Anderson
64090e1be9
Merge "Omaha #3244 Improved GFE purge error handling" into omaha_14.4.1
...
Former-commit-id: 97c35aacd2ee21383c07ee21383c07606920b67d
2014-06-13 10:45:48 -05:00
Ron Anderson
27f4e3b8d7
Merge "Omaha #3262 smarter detection of java packages/classes" into omaha_14.4.1
...
Former-commit-id: 8857dfe49a00eac78a0200eac78a029cc016dbfb
2014-06-12 18:19:25 -05:00
Richard Peter
5f33d12ce9
Merge "Omaha #3229 added bufr buoy support" into omaha_14.4.1
...
Former-commit-id: 7a750bc86a9f2854abe89f2854abe85c343e736a
2014-06-12 16:50:20 -05:00
Richard Peter
0489e36866
Merge "Omaha #3280 Sister ticket to 3141 for DD repo. Setup SOAP metadata transfers for DPA" into omaha_14.4.1
...
Former-commit-id: 418ad24111b630aa2971b630aa2971581b2cc7b7
2014-06-12 16:50:09 -05:00
Benjamin Phillippe
14bfdcbd05
Omaha #3255 Fixing bundle version to fix build
...
Former-commit-id: ed5a7a50f27da0490ede7da0490ede025597ee18
2014-06-12 16:39:25 -05:00
Nate Jensen
6419485d6b
Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1
...
Former-commit-id: fc905ca588ba2f130b13ba2f130b13254ba2762f
2014-06-12 15:14:50 -05:00
Brian Clements
667cda6c19
Omaha #3267 fixed collaboration NPE possibility
...
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260
Former-commit-id: 91eb7d40c2adbffa5dddadbffa5ddd42e6e38c2e
2014-06-12 15:06:46 -05:00
Ben Steffensmeier
0016b16e61
Omaha #3263 Check for null when mosaic time matches.
...
Former-commit-id: df2fed2be35355ca8c1c5355ca8c1cc105de1a4c
2014-06-12 15:00:26 -05:00
