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
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
Brian Clements
fd95df3bc0
Omaha #3281 collaboration views persist between perspectives
...
fixed bug that prevented re-opening collaboration after views were closed
Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3
Former-commit-id: b84f7571415871f2983b913cf816ed227b24bbac
2014-06-20 08:53:54 -05:00
Nate Jensen
d60d2b5caf
Omaha #3245 remove -vm argument
...
Change-Id: Ic4170cc85683121845013380fb2780b922e5fc13
Former-commit-id: 003c2d49ecc20cfae2cdefb14119e7d0b143e4c6
2014-06-19 14:44:24 -05:00
Nate Jensen
caf278ca5c
Merge "Omaha #3214 added pulse and cloud flash rendering to cave" into omaha_14.4.1
...
Former-commit-id: 741f2710372a713c53e70602395bf7c54fd17cdf
2014-06-19 13:42:06 -05:00
Nate Jensen
f01e19946c
Omaha #3255 fix cave install of data delivery
...
Change-Id: I06820560fd6b18c4886c0b3bef993e6830037b4e
Former-commit-id: bc22cda0a2bcdb550ad4d57a9be522336d4bc633
2014-06-19 13:15:40 -05:00
Brian Clements
a18069809a
Omaha #3214 added pulse and cloud flash rendering to cave
...
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce
Former-commit-id: 136bb5feca753f83f53d9d1e9381061853edc402
2014-06-19 12:50:56 -05:00
Nate Jensen
27df878d86
Merge "Omaha #3255 Remove cxf from cave feature to fix build" into omaha_14.4.1
...
Former-commit-id: 73c71e83588237e0a39d173c648f68a8e35bf119
2014-06-19 10:59:35 -05:00
Benjamin Phillippe
fc024e6d4c
Omaha #3255 Remove cxf from cave feature to fix build
...
Former-commit-id: b6f01bfe3f45ab4c3299879db44763994f7f8222
2014-06-19 10:58:11 -05:00
Nate Jensen
7bb2aebd59
Omaha #3242 clean up more graphs
...
Change-Id: I2440877381afc684cb2a3b02cbdbe36905643de4
Former-commit-id: 667817cf9473889f8c5cc39dd71814f1181a3805
2014-06-18 18:23:36 -05:00
Nate Jensen
835b65b7b8
Merge "Omaha #3242 thread safety for inset map" into omaha_14.4.1
...
Former-commit-id: 43684d4c0fe8f4b79ef384c08d01d2bdd51990e6
2014-06-18 17:17:17 -05:00
Nate Jensen
fbd7e64fe2
Merge "Omaha #3242 support ensemble id in time series legends" into omaha_14.4.1
...
Former-commit-id: 84257c99914950f412f1e3d8c12b691fb428086f
2014-06-18 17:17:04 -05:00
Nate Jensen
9a76fd4db0
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: 968613aaa91648a8e860eff88293744ddc00464c
2014-06-18 17:07:19 -05:00
Nate Jensen
30e76a1fd5
Omaha #3242 thread safety for inset map
...
Change-Id: I358dfcb211444407095cd86657dee8ad522b5857
Former-commit-id: d06eedeefc7997f6c881cf267c7f24979afbd9d7
2014-06-18 17:02:10 -05:00
Nate Jensen
3ba4931eee
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: 7999e026e8ff02ccb0f155af8770b0d8aac43339
2014-06-18 16:48:48 -05:00
Nate Jensen
46c843f51a
Omaha #3242 fix error if user zooms on cross section before it's loaded
...
Change-Id: I9143840a5074e4e5c9995c94cb21686598d79830
Former-commit-id: 4a7eebe03c9cd84702e6cda1258503da725a10bb
2014-06-18 16:37:49 -05:00
Nate Jensen
e10a73c17b
Omaha #3242 support ensemble id in time series legends
...
Change-Id: I7f8435d274d3981e4871a5cf726bbf69e22a0d08
Former-commit-id: 453c1eecf4f08203b4c6e2a74ad5dc366d85d359
2014-06-18 15:37:14 -05:00
Benjamin Phillippe
7e7cecceea
Omaha #3255 Fixing Build
...
Former-commit-id: a2a18d6f4a9f536172c264eeeee3ff51e225981f
2014-06-18 13:57:27 -05:00
Nate Jensen
9fd4e4a8d9
Merge "Omaha #3255 Dependency cleanup" into omaha_14.4.1
...
Former-commit-id: b209ae6772fe33ca73a130468c4c314f86ffeba5
2014-06-18 12:14:45 -05:00
Nate Jensen
32bc3e4056
Merge "Omaha #3274 fix generation of viz .ini files" into omaha_14.4.1
...
Former-commit-id: 5d378ca9529b48bd0a1422aec3263310f8350161
2014-06-18 11:11:34 -05:00
Nate Jensen
17dc45e7ca
Omaha #3274 fix generation of viz .ini files
...
Change-Id: I5ca9b02310cd068df5ee30acf47396070142dfc7
Former-commit-id: dd628b80f7798bb66d3c54568b9549e66870ddec
2014-06-18 10:03:17 -05:00
Benjamin Phillippe
c2ed8a39d1
Omaha #3255 Dependency cleanup
...
Change-Id: Ic405d8f4fbe3f778d7e542529d566678c445647e
Former-commit-id: dbac62df979f23402594dc6439b53e7884ea1bd1
2014-06-18 09:54:40 -05:00
Steve Harris
676948e239
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: da50f581c90ea0cca5f43c45c44cb8ac045a6c8c
2014-06-18 08:52:25 -05:00
Nate Jensen
764f977bf6
Merge "Omaha #3078 collaboration shared display data over private chat" into omaha_14.4.1
...
Former-commit-id: 4468390aaf89456e93b45fca20aeca7fb96d8c12
2014-06-17 18:09:33 -05:00
Nate Jensen
7fc256d076
Merge "Omaha #3245 fix GFE starting without a cave data" into omaha_14.4.1
...
Former-commit-id: c632bf24ee15cc85da9d7e7fb0a295912bf06b78
2014-06-17 17:01:46 -05:00
Brian Clements
5d03048fff
Issue #2903 prevent shared display crash from missing point style enum value
...
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: 5d298b39786d37aa365ccfe2c337214d1e46f1a9
2014-06-17 17:01:23 -05:00
Nate Jensen
8ab7d86a8f
Omaha #3245 fix GFE starting without a cave data
...
Change-Id: I61e9766bccd099619bfedfd9a1e1121fe63120d7
Former-commit-id: 539d497c5fc80efd5099e76a9e95a4709ace041d
2014-06-17 16:31:20 -05:00
Nate Jensen
c05ae83ea2
Merge "Omaha #3078 added private chat to collaboration" into omaha_14.4.1
...
Former-commit-id: 2c2b3891003076484539ef5fa7d6772b6336c635
2014-06-17 16:24:42 -05:00
Brian Clements
add8286d52
Omaha #3078 collaboration shared display data over private chat
...
Change-Id: I0ede9310eb109adc1b08673027e9e36a68a09fbf
Former-commit-id: a51847aff197f805a4e48c9ecdb0c16f874e6a78
2014-06-17 14:32:17 -05:00
Nate Jensen
acd7620d7a
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: 6efd831efcc5372c7e7bfd52265d13de382407ee
2014-06-17 14:21:55 -05:00
Ron Anderson
855b4ad7c1
Merge "Omaha #3274 switch viz to G1 garbage collector" into omaha_14.4.1
...
Former-commit-id: a971a5b1d27611c8b3a9a47b76efafa0c2c7a9fc
2014-06-17 13:54:11 -05:00
Ron Anderson
1a8ccd0181
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: 0cf0e93eabd440cf0ca3e88ac36c62b3309b6527
2014-06-17 13:46:38 -05:00
Brian Clements
97a6f5bfe8
Omaha #3078 added private chat to collaboration
...
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 93f7d7088e7d7888a878558c6f2fcc368bf3ab05
2014-06-17 11:52:58 -05:00
Nate Jensen
44cb0e6ae6
Omaha #3274 switch viz to G1 garbage collector
...
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109
Former-commit-id: 0355813f030ac996427c64dfcb6cbd4dd781ad2f
2014-06-17 10:54:57 -05:00
Brian Clements
84e3f967d9
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: baab2ea12e1117446295ae60bc06228eb6139895
2014-06-17 09:26:24 -05:00
Nate Jensen
9b7ed95e6b
Merge "Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings." into omaha_14.4.1
...
Former-commit-id: 2ee54c1f78136332f1cd2c40da0c2e7953510e7f
2014-06-16 09:26:30 -05:00
Nate Jensen
b3df7745d4
Merge "Omaha #3265 Fix potential NPE in D2D time matching." into omaha_14.4.1
...
Former-commit-id: 83d1a4b6e69e3fe1bb350beba4f36eb3bf34e05d
2014-06-16 09:00:47 -05:00
Nate Jensen
5908a4501a
Merge "Omaha #3163 Fix NPE when styleless strings are sent to 14.3" into omaha_14.4.1
...
Former-commit-id: 34250721f97f05be61e9e4e8b6f71758347a9f60
2014-06-16 09:00:39 -05:00
Nate Jensen
ed36453f09
Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
...
Former-commit-id: 93f63c0d42941001e4d59a4840df5e5b525592bf
2014-06-16 08:31:30 -05:00
Steve Harris
e1c8ad2611
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: 48a7eabebb78db9b97201c44ff5c71af3ee78de7
2014-06-16 08:19:12 -05:00
Ben Steffensmeier
29b423645e
Omaha #3265 Fix potential NPE in D2D time matching.
...
Former-commit-id: 9fea363e4fd21f2e9dc06b9450b71eb174dd0a29
2014-06-13 16:58:35 -05:00
Ben Steffensmeier
7245544e1f
Omaha #3163 Fix NPE when styleless strings are sent to 14.3
...
Former-commit-id: 3c1dd0e7daea7149a02b1a5e2be1a0db27e662d5
2014-06-13 16:49:25 -05:00
Nate Jensen
fc905ca588
Merge "Omaha #3263 Check for null when mosaic time matches." into omaha_14.4.1
...
Former-commit-id: c8f486ed32dfffff69ff9e9fefe1320c4ec009f4
2014-06-12 15:14:50 -05:00
Brian Clements
91eb7d40c2
Omaha #3267 fixed collaboration NPE possibility
...
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260
Former-commit-id: a23e57f3d1a6f4213216a7e038b85b17b6628faa
2014-06-12 15:06:46 -05:00
Ben Steffensmeier
df2fed2be3
Omaha #3263 Check for null when mosaic time matches.
...
Former-commit-id: 913d70b860c1f129d1632dfd1d84e5fbcca5e2d9
2014-06-12 15:00:26 -05:00
Nate Jensen
d3417d8e45
Merge "Omaha #2061 Remove dataURI from acars." into omaha_14.4.1
...
Former-commit-id: 6e2588a672ceb81a922be9fcdac9a4212376ed5f
2014-06-12 14:27:47 -05:00
Ben Steffensmeier
35ad2f2b8d
Omaha #2061 Remove dataURI from acars.
...
Former-commit-id: e8b5ea58ca12878922be01c815a354703f5f4387
2014-06-12 13:59:45 -05:00
Nate Jensen
305564d6f0
Omaha #3270 fix warngen manifest's register buddy
...
Change-Id: I273bc344c60fb4c824241a28949a1ce9fb3020a2
Former-commit-id: 796e242b031087e08b9ba5e44664d6b400405c42
2014-06-12 13:58:27 -05:00
Brian Clements
ef0ecfd1d4
Issue #2903 changed collaboration jaxb xml to be base64 encoded
...
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c
Former-commit-id: afcfdf1ed08cd64deb085b909f0965e4ab68d92d
2014-06-12 13:40:33 -05:00
Nate Jensen
f118e1b0e9
Merge "Omaha #3269 - Fix editing of Notifiers before saving Amend - Remove save confirmation dialog, rename buttons" into omaha_14.4.1
...
Former-commit-id: 88280dedea4b6065a5603ac26e982eab0a2e0e72
2014-06-12 12:36:14 -05:00
