Nate Jensen
d7b438bccf
Merge "Issue #2861 added synchronized blocks where necessary" into development
...
Former-commit-id: 54d015cb4f
[formerly 59dcb3a97d
] [formerly 54d015cb4f
[formerly 59dcb3a97d
] [formerly 2eea0b9205
[formerly e108aa41bb586593f50970da53109a82d2bb8452]]]
Former-commit-id: 2eea0b9205
Former-commit-id: 2def452e2c
[formerly 17ee130b2a
]
Former-commit-id: f8e7bfa835
2014-03-05 14:14:25 -06:00
Max Schenkelberg
7f9bea7552
Issue #2861 added synchronized blocks where necessary
...
Change-Id: I86a483612f618b04c1ef938ebc8f95decb496811
Former-commit-id: 83ac37724e
[formerly 10bfa59aef
] [formerly 83ac37724e
[formerly 10bfa59aef
] [formerly b5ed7ac361
[formerly 1c019671d35dc4d544fa9ceaeabe0a075e3e5ede]]]
Former-commit-id: b5ed7ac361
Former-commit-id: a8b436c867
[formerly 0fbc2df17d
]
Former-commit-id: 9b26076206
2014-03-05 13:51:06 -06:00
Nate Jensen
e97545fd54
Merge "Issue #2843 Harden recycle." into development
...
Former-commit-id: 09311b8270
[formerly 7a2a489c77
] [formerly 09311b8270
[formerly 7a2a489c77
] [formerly 308ab7c314
[formerly c36359b0aaa1540f6d941e9445b41ed929a91e14]]]
Former-commit-id: 308ab7c314
Former-commit-id: d07da4c425
[formerly d82a7d3640
]
Former-commit-id: d4305f1578
2014-03-05 11:41:05 -06:00
Ben Steffensmeier
4b966138f6
Issue #2843 Harden recycle.
...
Former-commit-id: 22adc336df
[formerly 26c1a8e494
] [formerly 22adc336df
[formerly 26c1a8e494
] [formerly 3cd6b29e75
[formerly 364b818dbd055b13fd8d5bb9f40c16f730f30b53]]]
Former-commit-id: 3cd6b29e75
Former-commit-id: ed0ec90407
[formerly af1bdf1b53
]
Former-commit-id: 2c687a4064
2014-03-05 11:16:12 -06:00
Brian Clements
6dc478d975
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: d76dd2a8f6
[formerly c0e4615967
] [formerly d76dd2a8f6
[formerly c0e4615967
] [formerly c9906cde88
[formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]]]
Former-commit-id: c9906cde88
Former-commit-id: 3d4323b447
[formerly d06182573e
]
Former-commit-id: dec443b1af
2014-03-05 09:00:57 -06:00
Nate Jensen
6d836f5d82
Merge "Issue #2832 fix watches and warnings in collaboration displays" into development
...
Former-commit-id: 8ebe236ce9
[formerly 67fa21cfd9
] [formerly 8ebe236ce9
[formerly 67fa21cfd9
] [formerly faf3dbb670
[formerly 27ce4812affb11b506a21b5cf54c4b74b8c49031]]]
Former-commit-id: faf3dbb670
Former-commit-id: 0b827a343b
[formerly ddf96ad45b
]
Former-commit-id: c427ff8471
2014-03-04 13:59:01 -06:00
Nate Jensen
fb903ade0b
Issue #2832 fix watches and warnings in collaboration displays
...
Change-Id: Id24366f8ee0cc9e13d3822fefaee13e92b95126f
Former-commit-id: 559b1794af
[formerly e3d211c8d7
] [formerly 559b1794af
[formerly e3d211c8d7
] [formerly 3c3e483d18
[formerly bb84ca01bb74bc93710ba92fcbdb13b30dc2454e]]]
Former-commit-id: 3c3e483d18
Former-commit-id: e08b21fc40
[formerly 4c0df85caf
]
Former-commit-id: 21d3110c28
2014-03-04 13:18:16 -06:00
Richard Peter
13bad4e99e
Merge "Issue #2791 Use Data Source for all grid data access." into development
...
Former-commit-id: 090829f75e
[formerly f87a913017
] [formerly 090829f75e
[formerly f87a913017
] [formerly 873fa00fac
[formerly 0b9954f00ca5f5a61a1cd79d094408e43b115abe]]]
Former-commit-id: 873fa00fac
Former-commit-id: 3a96d0758a
[formerly 2a5b0fb3ba
]
Former-commit-id: dfa3f06e8e
2014-03-04 12:43:17 -06:00
Nate Jensen
1d27417675
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: 75611f0631
[formerly f50a2789dd
] [formerly 75611f0631
[formerly f50a2789dd
] [formerly 7ac7dd5f01
[formerly 788133c5ea1a3005ed309a466e8cafad6db84ce3]]]
Former-commit-id: 7ac7dd5f01
Former-commit-id: 44e9b34927
[formerly a2b3bc717e
]
Former-commit-id: cb9d2a3298
2014-03-04 10:55:05 -06:00
Max Schenkelberg
c6cf08db73
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: 59434c8a60
[formerly a01a6d68d0
] [formerly 59434c8a60
[formerly a01a6d68d0
] [formerly cbf8b9249c
[formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]
Former-commit-id: cbf8b9249c
Former-commit-id: 39e1c4fa46
[formerly 654da3c0a2
]
Former-commit-id: f509321134
2014-03-04 09:23:36 -06:00
Max Schenkelberg
83103254e7
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: 6edfb8965f
[formerly dbcbd1b560
] [formerly 6edfb8965f
[formerly dbcbd1b560
] [formerly 1854bbb477
[formerly 51664693bd87df52acdb74d5286b61eeb06b792d]]]
Former-commit-id: 1854bbb477
Former-commit-id: bff80c3ee9
[formerly 6658c94e6e
]
Former-commit-id: 96bdc00728
2014-03-03 17:59:48 -06:00
Nate Jensen
224fd09dab
Issue #2792 enforce getDensity() will not return above max
...
Change-Id: I3d9f8587f73f50083436900b9f8d058bfdc20af1
Former-commit-id: 7f31e34dc9
[formerly 384b531d26
] [formerly 7f31e34dc9
[formerly 384b531d26
] [formerly 22153d43bb
[formerly a502a64219e869401b1bff82fbb73e67565a6dae]]]
Former-commit-id: 22153d43bb
Former-commit-id: e40fbf0ba0
[formerly 58c9dc0c69
]
Former-commit-id: 6f488f855f
2014-03-03 14:44:16 -06:00
Brian Clements
44fdea985e
Issue #2667 fixed bin lightning menus
...
the column name for the source of the lightning data was changed
Former-commit-id: 5d21675a91
[formerly 91936beadf
] [formerly 5d21675a91
[formerly 91936beadf
] [formerly 7a7d476899
[formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]]
Former-commit-id: 7a7d476899
Former-commit-id: bf4c119278
[formerly 724bafd44f
]
Former-commit-id: dc8667011b
2014-03-03 13:17:05 -06:00
Ben Steffensmeier
a19e960342
Issue #2791 Use Data Source for all grid data access.
...
Former-commit-id: 02cef4ddaa
[formerly 6fa441396f
] [formerly 02cef4ddaa
[formerly 6fa441396f
] [formerly 05770129c1
[formerly 961c232e35da077ef4fc0b62cb04a8f4cb9fb6f0]]]
Former-commit-id: 05770129c1
Former-commit-id: 72b117cf42
[formerly 4094ef6170
]
Former-commit-id: c6f1b922b2
2014-02-28 17:06:33 -06:00
Brian Clements
f00f8eb1d9
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: 9d0b02e0a4
[formerly ce24bd1018
] [formerly 9d0b02e0a4
[formerly ce24bd1018
] [formerly d8e283e1b4
[formerly e0e4dfdedff283c809060257fbf04e777faf318d]]]
Former-commit-id: d8e283e1b4
Former-commit-id: f56cbac9fb
[formerly edd72cbde4
]
Former-commit-id: 6d4abdc37c
2014-02-28 16:15:17 -06:00
Lee Venable
1ffa59cf4f
Merge "Issue #2632 - Implement buddy pounce (Contact Notifiers) Review comments" into development
...
Former-commit-id: 40f3df6aff
[formerly f171e3adb0
] [formerly 40f3df6aff
[formerly f171e3adb0
] [formerly c77634951c
[formerly 1a72af70658f288d43e397d12499de1a08ff2ba8]]]
Former-commit-id: c77634951c
Former-commit-id: 67f7d52f74
[formerly 734f69403a
]
Former-commit-id: 7bbedd6edd
2014-02-28 13:50:15 -06:00
Mike Duff
6c60255b75
Issue #2632 - Implement buddy pounce (Contact Notifiers)
...
Review comments
Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7
Former-commit-id: 377c1f9998
[formerly 5440ff64d1
] [formerly 377c1f9998
[formerly 5440ff64d1
] [formerly 5f433b4f6b
[formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 63fc5f8c66
[formerly ee06fc58b5
]
Former-commit-id: 02fa0d3c59
2014-02-28 13:23:34 -06:00
Richard Peter
34e2ab0d43
Merge "Issue #2791 Switch contouring to use DataSource for data access." into development
...
Former-commit-id: 18ec1e12ae
[formerly 5565bc88af
] [formerly 18ec1e12ae
[formerly 5565bc88af
] [formerly d5e09a82a7
[formerly 029efeddc9a20b10f8991976be5640bff2e14cfc]]]
Former-commit-id: d5e09a82a7
Former-commit-id: e4dc3ea6cf
[formerly f5c3e5d549
]
Former-commit-id: d736455a8a
2014-02-28 11:52:51 -06:00
Ben Steffensmeier
118991ec22
Issue #2791 Switch contouring to use DataSource for data access.
...
Former-commit-id: fbf6371c8e
[formerly 4b7f3b2a5b
] [formerly fbf6371c8e
[formerly 4b7f3b2a5b
] [formerly 23ce77d864
[formerly 6c90be7554bcbbf0aeb363b6e76c455d3896be83]]]
Former-commit-id: 23ce77d864
Former-commit-id: 278ef9f0d4
[formerly a7787a7ff2
]
Former-commit-id: c0c017e451
2014-02-28 11:28:02 -06:00
Nate Jensen
4e66e5bcc5
Merge "Issue #2703 Fix GFE time matching in iscMode." into development
...
Former-commit-id: b40f5477b4
[formerly 63244f840f
] [formerly b40f5477b4
[formerly 63244f840f
] [formerly 908d308825
[formerly 252551462222ae8b7364ab39f1e927daec89a32c]]]
Former-commit-id: 908d308825
Former-commit-id: fb68c4c07f
[formerly 92527f1ffa
]
Former-commit-id: f0bb217f04
2014-02-28 09:53:27 -06:00
Richard Peter
5fab51d41b
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: 7bd6a07913
[formerly 0e25ae35c1
] [formerly 7bd6a07913
[formerly 0e25ae35c1
] [formerly 1c150e6e8b
[formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]
Former-commit-id: 1c150e6e8b
Former-commit-id: 50a1b270c5
[formerly f13c86bc3e
]
Former-commit-id: 9b3f8f9649
2014-02-27 15:18:26 -06:00
Richard Peter
68eade49a2
Issue #2509 : Fix Merge of 13.5.2-4 ncep resources
...
Change-Id: I9ed15a3114d07a210795cd26e3096a8cddd548d3
Former-commit-id: c267c5a08f
[formerly 86d42ed603
] [formerly c267c5a08f
[formerly 86d42ed603
] [formerly 862069dfd3
[formerly 08990cfd910707cbf1731a8f271a52ff922a6345]]]
Former-commit-id: 862069dfd3
Former-commit-id: 237ada7b8b
[formerly c0d495d9c3
]
Former-commit-id: 9489565efb
2014-02-27 13:46:47 -06:00
Richard Peter
8d35f1ce5f
Issue #2509 : Fix merge of SS #124
...
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1
Former-commit-id: a23c8f2c27
[formerly 729d608a15
] [formerly a23c8f2c27
[formerly 729d608a15
] [formerly d54fee5dae
[formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]]
Former-commit-id: d54fee5dae
Former-commit-id: 67093287a0
[formerly 229437773b
]
Former-commit-id: 9ca22fce7f
2014-02-27 13:20:49 -06:00
Nate Jensen
445fd40303
Merge "Issue #2312 Fix file dialog input on export image dialog." into development
...
Former-commit-id: 414cc002b1
[formerly 71d494eb34
] [formerly 414cc002b1
[formerly 71d494eb34
] [formerly d1ec11d932
[formerly 4c4325675377cd170468a0c3dbe4632f5330227e]]]
Former-commit-id: d1ec11d932
Former-commit-id: 80ef0dc055
[formerly 9a39867de4
]
Former-commit-id: ee788777ad
2014-02-27 09:10:07 -06:00
Lee Venable
54fa6c12b3
Issue #2795 - added code to check for null images.
...
Former-commit-id: 5546b537cf
[formerly 0c7395d423
] [formerly 5546b537cf
[formerly 0c7395d423
] [formerly 49530206f4
[formerly 64cde69f612f25bf6c4a60db24791e3842b956a9]]]
Former-commit-id: 49530206f4
Former-commit-id: 35f6f35186
[formerly facc67e6b5
]
Former-commit-id: 3932c3f02f
2014-02-26 15:50:46 -06:00
Ben Steffensmeier
0dd62678f2
Issue #2711 Use level factory more.
...
Former-commit-id: 1069ef8d67
[formerly d7a3ae4fdb
] [formerly 1069ef8d67
[formerly d7a3ae4fdb
] [formerly 3da086b71f
[formerly db58ae5999ea088cb93a8016836a6c62efe347e4]]]
Former-commit-id: 3da086b71f
Former-commit-id: 29f9a87085
[formerly f45646ae91
]
Former-commit-id: 3a5f655ea4
2014-02-26 15:10:40 -06:00
Ben Steffensmeier
5fd6a533b8
Issue #2312 Fix file dialog input on export image dialog.
...
Former-commit-id: 2fd8351874
[formerly e1dc75f97a
] [formerly 2fd8351874
[formerly e1dc75f97a
] [formerly 6d0a78e233
[formerly 3742e480c1551b8870a6ac719b87b1e4b3c98d2a]]]
Former-commit-id: 6d0a78e233
Former-commit-id: 058652febe
[formerly 2d11421854
]
Former-commit-id: 542c8ae3a1
2014-02-26 14:57:59 -06:00
Ben Steffensmeier
d899433612
Issue #2703 Fix GFE time matching in iscMode.
...
Former-commit-id: 2425b9665c
[formerly d8bfdd1a7e
] [formerly 2425b9665c
[formerly d8bfdd1a7e
] [formerly 07bc9f075f
[formerly cbc63092bed92bb35a450c012b5bc882e4c82b35]]]
Former-commit-id: 07bc9f075f
Former-commit-id: 0fde78c595
[formerly 804cbb48e6
]
Former-commit-id: 6843396c78
2014-02-26 14:45:19 -06:00
Lee Venable
8d49130542
Issue #2833 - fixed subset dialog from disappearing when the subscription button double clicked.
...
Former-commit-id: bb4b034375
[formerly 94cede8153
] [formerly bb4b034375
[formerly 94cede8153
] [formerly e0ee93bab3
[formerly a075d26c10bf7459419180f416d3e9ccefb94075]]]
Former-commit-id: e0ee93bab3
Former-commit-id: 91d419662c
[formerly e0fbc02307
]
Former-commit-id: 316ba53e74
2014-02-26 13:21:58 -06:00
Brian Clements
1001ef1ec2
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: 3f0e9d7a77
[formerly eef242194a
] [formerly 3f0e9d7a77
[formerly eef242194a
] [formerly 3d365a4cd2
[formerly 6211a9622c944171b78d04ef9263d26e6eed7687]]]
Former-commit-id: 3d365a4cd2
Former-commit-id: 1f5d296314
[formerly 473fcda0cf
]
Former-commit-id: a102e927b1
2014-02-25 09:17:36 -06:00
Nate Jensen
caaffabda3
Merge "Issue #2830 sort TAF dataTimes so latest are retrieved" into omaha_14.2.1
...
Former-commit-id: 8ef957d2f0
[formerly 279f05a1d5
] [formerly 8ef957d2f0
[formerly 279f05a1d5
] [formerly 060eafc272
[formerly 5ce14324c20f4c73f77c827dc2991381acca813c]]]
Former-commit-id: 060eafc272
Former-commit-id: 2f58408036
[formerly a5477ea272
]
Former-commit-id: d9411eb382
2014-02-24 16:17:20 -06:00
Nate Jensen
78c8f1a62c
Issue #2830 sort TAF dataTimes so latest are retrieved
...
Former-commit-id: 230b8bf117
[formerly 8a00a419a1
] [formerly 230b8bf117
[formerly 8a00a419a1
] [formerly f353c44cc0
[formerly 04db02beec9d77e568c76541448bce0cd2f6c2d0]]]
Former-commit-id: f353c44cc0
Former-commit-id: a97f5b5ff7
[formerly 74329bcb89
]
Former-commit-id: 02d2f0c713
2014-02-24 15:35:13 -06:00
Ron Anderson
3c673caec2
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: 45ccac0859
[formerly 4364e7497c
] [formerly 45ccac0859
[formerly 4364e7497c
] [formerly 2db5f26840
[formerly 6567ae1f172ec982d8a2d6d25e8aca97292f9b1d]]]
Former-commit-id: 2db5f26840
Former-commit-id: 7d3af157f8
[formerly 3b2ea2d6ac
]
Former-commit-id: f2b0cc20e8
2014-02-24 13:46:48 -06:00
Brian Clements
48cfc3c933
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: 9217ba24c5
[formerly 3f362519aa
] [formerly 9217ba24c5
[formerly 3f362519aa
] [formerly 386e9cc96a
[formerly 58c826ec371f10295fa6f4e236ff85a52698719d]]]
Former-commit-id: 386e9cc96a
Former-commit-id: 73cb7b7313
[formerly b9c9be4c4f
]
Former-commit-id: 4abf737852
2014-02-24 13:19:07 -06:00
Ben Steffensmeier
07ffe9f711
Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
...
Former-commit-id: 780dc19fac
[formerly 70ae372303
] [formerly 780dc19fac
[formerly 70ae372303
] [formerly e08d4f77c3
[formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]
Former-commit-id: e08d4f77c3
Former-commit-id: 7aca322faa
[formerly a6bf896593
]
Former-commit-id: 7e29aa25a9
2014-02-21 17:37:19 -06:00
Mike Duff
692830c5c9
Issue #2631 - Set preference defaults in the Activator.
...
Removed unused file.
Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e
Former-commit-id: a96a833f51
[formerly ed5cb91406
] [formerly a96a833f51
[formerly ed5cb91406
] [formerly a7b1e79d2d
[formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]]
Former-commit-id: a7b1e79d2d
Former-commit-id: f98eec12b9
[formerly d90f4495c2
]
Former-commit-id: 5014499431
2014-02-20 15:09:10 -06:00
Brian Clements
1d2406e180
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: a2bdfa25cc
[formerly aaa2de20f4
] [formerly a2bdfa25cc
[formerly aaa2de20f4
] [formerly 89a48c3f6b
[formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: 04697836b8
[formerly 4b7ba54dc3
]
Former-commit-id: e3973b9fc7
2014-02-20 11:50:54 -06:00
Brian Clements
9b0fd74f5b
Issue #2751 implemented room/topic ownership transfer
...
Former-commit-id: a8ff1effc1
[formerly c3cadff705
] [formerly a8ff1effc1
[formerly c3cadff705
] [formerly ab72938246
[formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]
Former-commit-id: ab72938246
Former-commit-id: 9d00fe2bab
[formerly d9ac2c0037
]
Former-commit-id: d218686d1f
2014-02-20 11:10:14 -06:00
Nate Jensen
3955f66213
Issue #2704 fix startup issues where settings are valid but dialog
...
doens't realize it
Former-commit-id: 6ef26a636c
[formerly 32bd9fd635
] [formerly 6ef26a636c
[formerly 32bd9fd635
] [formerly 0f81b80467
[formerly 588323380dd3ef4f21d9cd1cac8c9a3478ed66a1]]]
Former-commit-id: 0f81b80467
Former-commit-id: 6e2150ccd7
[formerly 9f33e97c1b
]
Former-commit-id: 1f5f895dcf
2014-02-20 10:53:21 -06:00
Nate Jensen
4628b0c67c
Merge "Issue #2628 - Change cast from short to int for MPE colorbar" into development
...
Former-commit-id: 4563e38db2
[formerly 3078b69273
] [formerly 4563e38db2
[formerly 3078b69273
] [formerly 5856957c57
[formerly 7820be8f078be179c7963cbae73cd3023a70c306]]]
Former-commit-id: 5856957c57
Former-commit-id: c936a659a5
[formerly 5412b72c57
]
Former-commit-id: 9e261c9c22
2014-02-19 17:22:00 -06:00
Nate Jensen
1db1ae5a38
Merge "Issue #2761 add region level to localization" into development
...
Former-commit-id: 3782880dac
[formerly 9011e1b31e
] [formerly 3782880dac
[formerly 9011e1b31e
] [formerly 6e59175ce4
[formerly 59789454912e36ed64eb18fa83561fb7325945e2]]]
Former-commit-id: 6e59175ce4
Former-commit-id: 9394879520
[formerly b1e2788958
]
Former-commit-id: 8f73511086
2014-02-19 17:18:24 -06:00
Nate Jensen
dbdcfa8e41
Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
...
Former-commit-id: a241472c34
[formerly df376abcb7
] [formerly a241472c34
[formerly df376abcb7
] [formerly f99cf7df47
[formerly ff080a6b5184f486348a015f31b957325fa280fa]]]
Former-commit-id: f99cf7df47
Former-commit-id: d3ec0da1bb
[formerly 8b152a8027
]
Former-commit-id: dafb323edb
2014-02-19 16:19:27 -06:00
Ron Anderson
331803d94a
Merge "Issue #2819 Removed more unnecessary .clone() calls" into development
...
Former-commit-id: 8703c43937
[formerly 98d2417f94
] [formerly 8703c43937
[formerly 98d2417f94
] [formerly b8c00d8ead
[formerly d4fb7ae2684b26e93c33467de0b1813e263ce9e6]]]
Former-commit-id: b8c00d8ead
Former-commit-id: b9904edc3a
[formerly 7e7f0abfdc
]
Former-commit-id: db9cc1e6b5
2014-02-19 15:39:56 -06:00
Mike Duff
401973b39e
Issue #2631 - Add sound preference for users joining a room.
...
review comments
Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207
Former-commit-id: e2a6251a6b
[formerly 663ea8decd
] [formerly e2a6251a6b
[formerly 663ea8decd
] [formerly 95fcee385a
[formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]
Former-commit-id: 95fcee385a
Former-commit-id: 89c4a3e04b
[formerly 3100a71f34
]
Former-commit-id: 92d356f4f0
2014-02-19 15:26:14 -06:00
Mike Duff
0494f646ab
Issue #2628 - Change cast from short to int for MPE colorbar
...
Change-Id: I936853788469b7a9cf35e3c90643bfbbbb2cc46c
Former-commit-id: 48a0b34b5f
[formerly 682c6af456
] [formerly 48a0b34b5f
[formerly 682c6af456
] [formerly 183657fb33
[formerly d21c88a52604ff5f95e713eea0a61b1f6b33455e]]]
Former-commit-id: 183657fb33
Former-commit-id: 8be2622f85
[formerly 86fce9d547
]
Former-commit-id: 06b243a7fd
2014-02-19 15:20:29 -06:00
Nate Jensen
659bc630be
Merge "Issue #2751 fixed chat room bugs" into development
...
Former-commit-id: b4ac186728
[formerly 4b4cca776f
] [formerly b4ac186728
[formerly 4b4cca776f
] [formerly c72e2be969
[formerly 86d03d7d6741b176a23dd93efd996154d3beaecb]]]
Former-commit-id: c72e2be969
Former-commit-id: 5ef747c703
[formerly 7099b45023
]
Former-commit-id: 696937bfcc
2014-02-19 14:52:24 -06:00
Ron Anderson
e91fd1d683
Issue #2819 Removed more unnecessary .clone() calls
...
Change-Id: I6924801040b238354527edfd57b4a3999f844617
Former-commit-id: 663cb4cb62
[formerly 5258aecf45
] [formerly 663cb4cb62
[formerly 5258aecf45
] [formerly 419e9d0b8d
[formerly ce896b573fcef99e30e3bda5f53b0941cd1b2e36]]]
Former-commit-id: 419e9d0b8d
Former-commit-id: 908e43039e
[formerly 8a41723ba6
]
Former-commit-id: b0a4b63689
2014-02-19 11:55:11 -06:00
Mike Duff
304a9dc507
Issue #2734 - default time range to 24 hours.
...
Change-Id: If50ab9d45e3c8a1074f258583e07d248582c1f1d
Former-commit-id: bc180503b1
[formerly 19033601bf
] [formerly bc180503b1
[formerly 19033601bf
] [formerly 0b316f7bd9
[formerly 30d52d79ba79c79b8cdfbfdd8d61b1b7b04afef5]]]
Former-commit-id: 0b316f7bd9
Former-commit-id: 06ed3db690
[formerly 7710724c5a
]
Former-commit-id: e6fb8413b9
2014-02-19 10:23:48 -06:00
Matt Nash
1814b1448e
Issue #2761 add region level to localization
...
Amend : Change comment now that we do not get file from localization
Change-Id: I864f2b4e1c84261ada3bf6169dbd3389d9b61ae2
Former-commit-id: 3f67324d7c
[formerly 2d20e84f6a
] [formerly 3f67324d7c
[formerly 2d20e84f6a
] [formerly 1835019567
[formerly 8b8e8e2bafaa4abb7c0b637f745a49eb7f6aa8f6]]]
Former-commit-id: 1835019567
Former-commit-id: ae1d36b6d0
[formerly bb10484bd0
]
Former-commit-id: 3b39e1d2bc
2014-02-19 10:01:25 -06:00
Brian Clements
b47b194564
Issue #2751 fixed chat room bugs
...
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client
Former-commit-id: 06c16118e1
[formerly dc074a9650
] [formerly 06c16118e1
[formerly dc074a9650
] [formerly 3a135b8eac
[formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 77bb396c9a
[formerly bee7cdb71a
]
Former-commit-id: ddc0945e40
2014-02-19 08:32:26 -06:00