Commit graph

2723 commits

Author SHA1 Message Date
Nate Jensen
8e316de47f Merge "Issue #2791 Move D2D Grids to direct memory." into development
Former-commit-id: 451a7fe552 [formerly 0d547ab0bf] [formerly be9cc9397f] [formerly a91e941d3e [formerly be9cc9397f [formerly acd6c523e7b1ab836b3529bacdbebb5fcfce3c3c]]]
Former-commit-id: a91e941d3e
Former-commit-id: 266a7471ea5ed64f00aec1ecc850d972c7695845 [formerly fb50424456]
Former-commit-id: 76ded096a8
2014-03-05 15:02:46 -06:00
Ben Steffensmeier
ceb056d304 Issue #2791 Move D2D Grids to direct memory.
Former-commit-id: 6dc44e895f [formerly fd34cf3993] [formerly 12ed63619a] [formerly 775c29e77c [formerly 12ed63619a [formerly 8d8a06be12652349032f15ab1e31d5f23adf0b24]]]
Former-commit-id: 775c29e77c
Former-commit-id: e70e825d566372eb4b060f189bea9a1c2b022f0d [formerly a06a98750f]
Former-commit-id: 2bc8805fbc
2014-03-05 14:57:28 -06:00
Nate Jensen
ddebec5791 Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
Former-commit-id: dcbafebc0d [formerly ae9adefbf7] [formerly cf4631f9bf] [formerly 48fa8f8d1b [formerly cf4631f9bf [formerly e6dc5f076bfd4811b2b1cdaf3782a5066e032381]]]
Former-commit-id: 48fa8f8d1b
Former-commit-id: 81dc1f611ab2e4fba7afbbabdd044e8afece9c33 [formerly d3f18729c3]
Former-commit-id: b097d488ca
2014-03-05 14:41:12 -06:00
Mike Duff
b88162e504 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: ec892bb7a7 [formerly 25425a4268] [formerly e97e745b61] [formerly 9c873e6dd9 [formerly e97e745b61 [formerly b087558dce4e19596c93d47e986af50fae806a74]]]
Former-commit-id: 9c873e6dd9
Former-commit-id: acfecc3a2b5c6336080649496608081ffae17a97 [formerly c0bf150e15]
Former-commit-id: 0251ad5bca
2014-03-05 14:39:55 -06:00
Nate Jensen
12e353a3d6 Merge "Issue #2861 added synchronized blocks where necessary" into development
Former-commit-id: d0fd1154d4 [formerly 54d015cb4f] [formerly 59dcb3a97d] [formerly 2eea0b9205 [formerly 59dcb3a97d [formerly e108aa41bb586593f50970da53109a82d2bb8452]]]
Former-commit-id: 2eea0b9205
Former-commit-id: dbdb17eebbf238d2f134aa977e9bff14bc685964 [formerly 17ee130b2a]
Former-commit-id: 2def452e2c
2014-03-05 14:14:25 -06:00
Max Schenkelberg
035d96ce04 Issue #2861 added synchronized blocks where necessary
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811

Former-commit-id: 1dad35e391 [formerly 83ac37724e] [formerly 10bfa59aef] [formerly b5ed7ac361 [formerly 10bfa59aef [formerly 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede]]]
Former-commit-id: b5ed7ac361
Former-commit-id: 71e348fc3ebb000927a4b5fcacb3a3ed1a3931df [formerly 0fbc2df17d]
Former-commit-id: a8b436c867
2014-03-05 13:51:06 -06:00
Mike Duff
1c0d844dc2 Issue #2632 - Fix problem with multiple notifiers per user.
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000

Former-commit-id: a670398424 [formerly 14107f0914] [formerly 8c693a5f70] [formerly 9963324b60 [formerly 8c693a5f70 [formerly 168a656194aa3b455f403aa92b290bbbe17d3b45]]]
Former-commit-id: 9963324b60
Former-commit-id: fd61ded4da051608ff2b758971fbc5bacbaca791 [formerly 3bdf20dea3]
Former-commit-id: 198d9e6780
2014-03-05 12:02:33 -06:00
Nate Jensen
b6d570e336 Merge "Issue #2843 Harden recycle." into development
Former-commit-id: c65bb2a011 [formerly 09311b8270] [formerly 7a2a489c77] [formerly 308ab7c314 [formerly 7a2a489c77 [formerly c36359b0aaa1540f6d941e9445b41ed929a91e14]]]
Former-commit-id: 308ab7c314
Former-commit-id: 60f7401ff670afef592b5d2107984da7668e6b19 [formerly d82a7d3640]
Former-commit-id: d07da4c425
2014-03-05 11:41:05 -06:00
Ben Steffensmeier
be60a9564d Issue #2843 Harden recycle.
Former-commit-id: 291d5f55df [formerly 22adc336df] [formerly 26c1a8e494] [formerly 3cd6b29e75 [formerly 26c1a8e494 [formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]]
Former-commit-id: 3cd6b29e75
Former-commit-id: 202049adf2dd36c8c9f4cee72fdf77a6f408f169 [formerly af1bdf1b53]
Former-commit-id: ed0ec90407
2014-03-05 11:16:12 -06:00
Brian Clements
f4a6d2a30d Issue #2837 collaboration icon changes
changed add/remove group icon colors
created icons for add/remove contact, alias contact and rename group


Former-commit-id: 17661200a1 [formerly d76dd2a8f6] [formerly c0e4615967] [formerly c9906cde88 [formerly c0e4615967 [formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]]]
Former-commit-id: c9906cde88
Former-commit-id: 1d8422aecbe75d313717ff186a0a87becafd9906 [formerly d06182573e]
Former-commit-id: 3d4323b447
2014-03-05 09:00:57 -06:00
Nate Jensen
12f218292c Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
Former-commit-id: 6b4d16b750 [formerly 8ebe236ce9] [formerly 67fa21cfd9] [formerly faf3dbb670 [formerly 67fa21cfd9 [formerly 27ce4812affb11b506a21b5cf54c4b74b8c49031]]]
Former-commit-id: faf3dbb670
Former-commit-id: b1b15434c34d3a515d2e371f1abe646a64b39293 [formerly ddf96ad45b]
Former-commit-id: 0b827a343b
2014-03-04 13:59:01 -06:00
Nate Jensen
0094132846 Issue #2832 fix watches and warnings in collaboration displays
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f

Former-commit-id: 41d80f6fce [formerly 559b1794af] [formerly e3d211c8d7] [formerly 3c3e483d18 [formerly e3d211c8d7 [formerly bb84ca01bb74bc93710ba92fcbdb13b30dc2454e]]]
Former-commit-id: 3c3e483d18
Former-commit-id: f48033e99ccba349f23f107d1871ca7961b89c90 [formerly 4c0df85caf]
Former-commit-id: e08b21fc40
2014-03-04 13:18:16 -06:00
Richard Peter
7e096adc4a Merge "Issue #2791 Use Data Source for all grid data access." into development
Former-commit-id: 83b99aad5c [formerly 090829f75e] [formerly f87a913017] [formerly 873fa00fac [formerly f87a913017 [formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]]
Former-commit-id: 873fa00fac
Former-commit-id: 31ea5b7bbf5848e0ada30ca517c3c6b17e7d4154 [formerly 2a5b0fb3ba]
Former-commit-id: 3a96d0758a
2014-03-04 12:43:17 -06:00
Nate Jensen
b3a4e1d562 Merge "Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done." into development
Former-commit-id: b0e727938b [formerly 75611f0631] [formerly f50a2789dd] [formerly 7ac7dd5f01 [formerly f50a2789dd [formerly 788133c5ea1a3005ed309a466e8cafad6db84ce3]]]
Former-commit-id: 7ac7dd5f01
Former-commit-id: 9ffb218b0f72703775dd6d2766c567fee092b78a [formerly a2b3bc717e]
Former-commit-id: 44e9b34927
2014-03-04 10:55:05 -06:00
Max Schenkelberg
d85fd52c26 Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]
Former-commit-id: cbf8b9249c
Former-commit-id: d886f6a0f4f81e75f3b006fbf72cebc9033f58c2 [formerly 654da3c0a2]
Former-commit-id: 39e1c4fa46
2014-03-04 09:23:36 -06:00
Max Schenkelberg
c37910a689 Issue #2804 Fixed clipping pane issues where clipped map borders would be visible due to other resources not resetting up the clipping pane when done.
Change-Id: If27cd7c8e11cdc6287303e6d5fc1f4990e300ada

Former-commit-id: 4bcdc9f85b [formerly 6edfb8965f] [formerly dbcbd1b560] [formerly 1854bbb477 [formerly dbcbd1b560 [formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]
Former-commit-id: 1854bbb477
Former-commit-id: 64e66813ccc56d3b7a703a331fd119c8cbcceb08 [formerly 6658c94e6e]
Former-commit-id: bff80c3ee9
2014-03-03 17:59:48 -06:00
Nate Jensen
47deb8f80c Issue #2792 enforce getDensity() will not return above max
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1

Former-commit-id: 0044c21ad5 [formerly 7f31e34dc9] [formerly 384b531d26] [formerly 22153d43bb [formerly 384b531d26 [formerly a502a64219e869401b1bff82fbb73e67565a6dae]]]
Former-commit-id: 22153d43bb
Former-commit-id: 8163999a8004a10d68d6b96b3ec92494a440eed2 [formerly 58c9dc0c69]
Former-commit-id: e40fbf0ba0
2014-03-03 14:44:16 -06:00
Brian Clements
472d08d2ad Issue #2667 fixed bin lightning menus
the column name for the source of the lightning data was changed


Former-commit-id: dedd9e80ed [formerly 5d21675a91] [formerly 91936beadf] [formerly 7a7d476899 [formerly 91936beadf [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]]
Former-commit-id: 7a7d476899
Former-commit-id: dbc2261d04afbbeaa80308981a4752188bec6977 [formerly 724bafd44f]
Former-commit-id: bf4c119278
2014-03-03 13:17:05 -06:00
Ben Steffensmeier
374ad2c1e8 Issue #2791 Use Data Source for all grid data access.
Former-commit-id: 16b6723cbb [formerly 02cef4ddaa] [formerly 6fa441396f] [formerly 05770129c1 [formerly 6fa441396f [formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]]
Former-commit-id: 05770129c1
Former-commit-id: bc40fd62dff2b342470d96a6441fc6239af6c193 [formerly 4094ef6170]
Former-commit-id: 72b117cf42
2014-02-28 17:06:33 -06:00
Brian Clements
43c19f09ba Issue #2756 implemented HTTP public key auth scheme
collaboration HTTP server now requires auth header (configured via openfire)
added auth to cave client


Former-commit-id: fd18963221 [formerly 9d0b02e0a4] [formerly ce24bd1018] [formerly d8e283e1b4 [formerly ce24bd1018 [formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]
Former-commit-id: d8e283e1b4
Former-commit-id: effe9ab4a85983edf2b983ee5e4b964df8a78343 [formerly edd72cbde4]
Former-commit-id: f56cbac9fb
2014-02-28 16:15:17 -06:00
Lee Venable
639f66e8b2 Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
Former-commit-id: 4631a29ca3 [formerly 40f3df6aff] [formerly f171e3adb0] [formerly c77634951c [formerly f171e3adb0 [formerly 1a72af70658f288d43e397d12499de1a08ff2ba8]]]
Former-commit-id: c77634951c
Former-commit-id: 2fb1bf66c74a373156ea360fd8e8e80b7e7e7b74 [formerly 734f69403a]
Former-commit-id: 67f7d52f74
2014-02-28 13:50:15 -06:00
Mike Duff
6c5c943a5e Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 512e634a97 [formerly 377c1f9998] [formerly 5440ff64d1] [formerly 5f433b4f6b [formerly 5440ff64d1 [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 0494775290c2982f78ac45adef680a21db012453 [formerly ee06fc58b5]
Former-commit-id: 63fc5f8c66
2014-02-28 13:23:34 -06:00
Richard Peter
feb0543e0e Merge "Issue #2791 Switch contouring to use DataSource for data access." into development
Former-commit-id: 39cf8178ff [formerly 18ec1e12ae] [formerly 5565bc88af] [formerly d5e09a82a7 [formerly 5565bc88af [formerly 029efeddc9a20b10f8991976be5640bff2e14cfc]]]
Former-commit-id: d5e09a82a7
Former-commit-id: b053fcbd2fdae8ed288d71313c48f36099ef20df [formerly f5c3e5d549]
Former-commit-id: e4dc3ea6cf
2014-02-28 11:52:51 -06:00
Ben Steffensmeier
b747a91eaa Issue #2791 Switch contouring to use DataSource for data access.
Former-commit-id: 7c8332a30f [formerly fbf6371c8e] [formerly 4b7f3b2a5b] [formerly 23ce77d864 [formerly 4b7f3b2a5b [formerly 6c90be7554bcbbf0aeb363b6e76c455d3896be83]]]
Former-commit-id: 23ce77d864
Former-commit-id: 527028ea9c54386652ea6e4a25326acedb61a15d [formerly a7787a7ff2]
Former-commit-id: 278ef9f0d4
2014-02-28 11:28:02 -06:00
Nate Jensen
7ab7887199 Merge "Issue #2703 Fix GFE time matching in iscMode." into development
Former-commit-id: 3153786b6f [formerly b40f5477b4] [formerly 63244f840f] [formerly 908d308825 [formerly 63244f840f [formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]
Former-commit-id: 908d308825
Former-commit-id: f763c6864aae7276537781234c118f3f876d018c [formerly 92527f1ffa]
Former-commit-id: fb68c4c07f
2014-02-28 09:53:27 -06:00
Richard Peter
1d6e9816e0 Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 79d3aa4e1a [formerly 7bd6a07913] [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 23c2e13876eeacd0c485ad3110006f8bd36a537c [formerly f13c86bc3e]
Former-commit-id: 50a1b270c5
2014-02-27 15:18:26 -06:00
Richard Peter
9f43d8e4b2 Issue #2509: Fix Merge of 13.5.2-4 ncep resources
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3

Former-commit-id: 63da19f472 [formerly c267c5a08f] [formerly 86d42ed603] [formerly 862069dfd3 [formerly 86d42ed603 [formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]
Former-commit-id: 862069dfd3
Former-commit-id: 2ae63270ca0112aca619a0c7564fa8a1154ef4f9 [formerly c0d495d9c3]
Former-commit-id: 237ada7b8b
2014-02-27 13:46:47 -06:00
Richard Peter
3b09c69f65 Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: ae39697315 [formerly a23c8f2c27] [formerly 729d608a15] [formerly d54fee5dae [formerly 729d608a15 [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]
Former-commit-id: d54fee5dae
Former-commit-id: 08cbaa7fb54883ec7360be105a26ab8de2e57993 [formerly 229437773b]
Former-commit-id: 67093287a0
2014-02-27 13:20:49 -06:00
Nate Jensen
b13f098262 Merge "Issue #2312 Fix file dialog input on export image dialog." into development
Former-commit-id: 6e94f1dbbf [formerly 414cc002b1] [formerly 71d494eb34] [formerly d1ec11d932 [formerly 71d494eb34 [formerly 4c4325675377cd170468a0c3dbe4632f5330227e]]]
Former-commit-id: d1ec11d932
Former-commit-id: 91dfb6da3c8d39b1c96ec2b8fcbe4d9047893d20 [formerly 9a39867de4]
Former-commit-id: 80ef0dc055
2014-02-27 09:10:07 -06:00
Lee Venable
da795bce98 Issue #2795 - added code to check for null images.
Former-commit-id: 191ca5f9ca [formerly 5546b537cf] [formerly 0c7395d423] [formerly 49530206f4 [formerly 0c7395d423 [formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]]
Former-commit-id: 49530206f4
Former-commit-id: 3612dfd65a9bb45c3bd962d6f9fe927cf481321f [formerly facc67e6b5]
Former-commit-id: 35f6f35186
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
4d1276def2 Issue #2711 Use level factory more.
Former-commit-id: 3d9b435262 [formerly 1069ef8d67] [formerly d7a3ae4fdb] [formerly 3da086b71f [formerly d7a3ae4fdb [formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]]
Former-commit-id: 3da086b71f
Former-commit-id: 81be956862611f9499f1e2716026d69eacf91f27 [formerly f45646ae91]
Former-commit-id: 29f9a87085
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
88fd930b77 Issue #2312 Fix file dialog input on export image dialog.
Former-commit-id: ee8f345cb2 [formerly 2fd8351874] [formerly e1dc75f97a] [formerly 6d0a78e233 [formerly e1dc75f97a [formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]]
Former-commit-id: 6d0a78e233
Former-commit-id: 33d269bf45b5c7555173d073fc5eeb1dc2b0f237 [formerly 2d11421854]
Former-commit-id: 058652febe
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
66b052cd5a Issue #2703 Fix GFE time matching in iscMode.
Former-commit-id: fa6dcaac84 [formerly 2425b9665c] [formerly d8bfdd1a7e] [formerly 07bc9f075f [formerly d8bfdd1a7e [formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 21789a864d2ed6b3a1c15882fe3f817dac2fd3f7 [formerly 804cbb48e6]
Former-commit-id: 0fde78c595
2014-02-26 14:45:19 -06:00
Lee Venable
de2bff4d95 Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
Former-commit-id: d74b2c0118 [formerly bb4b034375] [formerly 94cede8153] [formerly e0ee93bab3 [formerly 94cede8153 [formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]
Former-commit-id: e0ee93bab3
Former-commit-id: 08d8e41d0aefbc0220f2fd973374918a413db9bb [formerly e0fbc02307]
Former-commit-id: 91d419662c
2014-02-26 13:21:58 -06:00
Brian Clements
408b834fc6 Issue #2751 fixed webDAV path issue
webDAV needs every part of the path created individually
made the userid portion of the url use the entire id URL encoded


Former-commit-id: 9597ce5cd9 [formerly 3f0e9d7a77] [formerly eef242194a] [formerly 3d365a4cd2 [formerly eef242194a [formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]]
Former-commit-id: 3d365a4cd2
Former-commit-id: afda13c403f6099ee52fb2149ecc71798cd4f1b6 [formerly 473fcda0cf]
Former-commit-id: 1f5d296314
2014-02-25 09:17:36 -06:00
Nate Jensen
308a560602 Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
Former-commit-id: 055caba2bf [formerly 8ef957d2f0] [formerly 279f05a1d5] [formerly 060eafc272 [formerly 279f05a1d5 [formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]]
Former-commit-id: 060eafc272
Former-commit-id: 558be9d98a06c71a0e559cdc2b834c684467687f [formerly a5477ea272]
Former-commit-id: 2f58408036
2014-02-24 16:17:20 -06:00
Nate Jensen
4d460d3a26 Issue #2830 sort TAF dataTimes so latest are retrieved
Former-commit-id: a201d43d63 [formerly 230b8bf117] [formerly 8a00a419a1] [formerly f353c44cc0 [formerly 8a00a419a1 [formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]
Former-commit-id: f353c44cc0
Former-commit-id: 67f46ed66aeefd71f35b8ac193010ae9e960ed0b [formerly 74329bcb89]
Former-commit-id: a97f5b5ff7
2014-02-24 15:35:13 -06:00
Ron Anderson
5831f8d79e Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE

Change-Id: Iccf1487b3f0b354685ce2ff8b76e09ffc5350962

Former-commit-id: 049424e5f0 [formerly 45ccac0859] [formerly 4364e7497c] [formerly 2db5f26840 [formerly 4364e7497c [formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: a242c09c6983c820aa32c052d7deaed21a0982ec [formerly 3b2ea2d6ac]
Former-commit-id: 7d3af157f8
2014-02-24 13:46:48 -06:00
Brian Clements
743c6cd74b Issue #2751 fixed leader transfer infinite loop, added event validation
added username to paths in http urls to prevent old events from being picked up with new leader
added simple check to prevent invalid leader change events from being processed


Former-commit-id: a173972437 [formerly 9217ba24c5] [formerly 3f362519aa] [formerly 386e9cc96a [formerly 3f362519aa [formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]]
Former-commit-id: 386e9cc96a
Former-commit-id: 83e8dc39015b780c38746e7cdc688605acdb3a6e [formerly b9c9be4c4f]
Former-commit-id: 73cb7b7313
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
d27c21b9f6 Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: 152980350c [formerly 780dc19fac] [formerly 70ae372303] [formerly e08d4f77c3 [formerly 70ae372303 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]
Former-commit-id: e08d4f77c3
Former-commit-id: c293b1124e59af7c01e948de86093eee22fbb5d9 [formerly a6bf896593]
Former-commit-id: 7aca322faa
2014-02-21 17:37:19 -06:00
Mike Duff
5754117aad Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: 9eafacaac2 [formerly a96a833f51] [formerly ed5cb91406] [formerly a7b1e79d2d [formerly ed5cb91406 [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]]
Former-commit-id: a7b1e79d2d
Former-commit-id: 054cdc944f74842daa02964eb9d5d80d21f23654 [formerly d90f4495c2]
Former-commit-id: f98eec12b9
2014-02-20 15:09:10 -06:00
Brian Clements
e7584f3a49 Issue #2751 collab menu icons, fixed NPE
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog


Former-commit-id: 8bbf2bb6bd [formerly a2bdfa25cc] [formerly aaa2de20f4] [formerly 89a48c3f6b [formerly aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: 5cc63f048c2ca2bae92c62e08c20b8a3fc4c7681 [formerly 4b7ba54dc3]
Former-commit-id: 04697836b8
2014-02-20 11:50:54 -06:00
Brian Clements
08a0e5baf2 Issue #2751 implemented room/topic ownership transfer
Former-commit-id: 4e165aba58 [formerly a8ff1effc1] [formerly c3cadff705] [formerly ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]
Former-commit-id: ab72938246
Former-commit-id: d96f62f0208dbdcb69677a9d6b014fc0a7761a39 [formerly d9ac2c0037]
Former-commit-id: 9d00fe2bab
2014-02-20 11:10:14 -06:00
Nate Jensen
5d5518e29f Issue #2704 fix startup issues where settings are valid but dialog
doens't realize it


Former-commit-id: 6973755f4e [formerly 6ef26a636c] [formerly 32bd9fd635] [formerly 0f81b80467 [formerly 32bd9fd635 [formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]
Former-commit-id: 0f81b80467
Former-commit-id: bd38074eb147c551318fc588a5101194eae5605b [formerly 9f33e97c1b]
Former-commit-id: 6e2150ccd7
2014-02-20 10:53:21 -06:00
Nate Jensen
08ede8e9f3 Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
Former-commit-id: adb51300d8 [formerly 4563e38db2] [formerly 3078b69273] [formerly 5856957c57 [formerly 3078b69273 [formerly 7820be8f078be179c7963cbae73cd3023a70c306]]]
Former-commit-id: 5856957c57
Former-commit-id: 1a60933c3ce5c3f2514129d9f7ef73e507bb6d7c [formerly 5412b72c57]
Former-commit-id: c936a659a5
2014-02-19 17:22:00 -06:00
Nate Jensen
8a564e9987 Merge "Issue #2761 add region level to localization" into development
Former-commit-id: f939d93d7f [formerly 3782880dac] [formerly 9011e1b31e] [formerly 6e59175ce4 [formerly 9011e1b31e [formerly 59789454912e36ed64eb18fa83561fb7325945e2]]]
Former-commit-id: 6e59175ce4
Former-commit-id: 9bf4479e05cb345ab571f6736d903c87cbcab9f4 [formerly b1e2788958]
Former-commit-id: 9394879520
2014-02-19 17:18:24 -06:00
Nate Jensen
eeac24c773 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: f545a8a74d [formerly a241472c34] [formerly df376abcb7] [formerly f99cf7df47 [formerly df376abcb7 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]]
Former-commit-id: f99cf7df47
Former-commit-id: 76b7d9b753824f510f6d112e0bfada581f946906 [formerly 8b152a8027]
Former-commit-id: d3ec0da1bb
2014-02-19 16:19:27 -06:00
Ron Anderson
efbe57d909 Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
Former-commit-id: dab0ebc99e [formerly 8703c43937] [formerly d87e0842ed68e4ba44c266df39b6308f7366e5ee [formerly 98d2417f94]] [formerly b8c00d8ead [formerly 98d2417f94 [formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]]
Former-commit-id: b8c00d8ead
Former-commit-id: 5a4e4666cbcd00018ef121b89b85a78808d680db [formerly 7e7f0abfdc]
Former-commit-id: b9904edc3a
2014-02-19 15:39:56 -06:00
Mike Duff
a723f69ad9 Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: 659cb1f2a0 [formerly e2a6251a6b] [formerly 663ea8decd] [formerly 95fcee385a [formerly 663ea8decd [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]
Former-commit-id: 95fcee385a
Former-commit-id: 280611ef49d0a886c12f13b5471242ae42c55bac [formerly 3100a71f34]
Former-commit-id: 89c4a3e04b
2014-02-19 15:26:14 -06:00
Mike Duff
10765884a3 Issue #2628 - Change cast from short to int for MPE colorbar
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c

Former-commit-id: 8a29af4894 [formerly 48a0b34b5f] [formerly 682c6af456] [formerly 183657fb33 [formerly 682c6af456 [formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]]
Former-commit-id: 183657fb33
Former-commit-id: 4622ac20555cc93d1c3532eaaaec9b3ab36c4650 [formerly 86fce9d547]
Former-commit-id: 8be2622f85
2014-02-19 15:20:29 -06:00