Steve Harris
25bd3ee930
Merge tag 'OB_14.4.1-20m' into omaha_15.1.1
...
14.4.1-20m
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
2015-03-26 09:57:17 -05:00
Nate Jensen
e078881789
Omaha #4238 null safety check if feed view temporarily exists in other perspectives
...
after logging out
Change-Id: I9bdfa86a1ae2d587cf3ad4487d0c6eae15f1ff25
Former-commit-id: b915adf57c64e5b0cf5f856436c9a1f01098a897
2015-03-10 18:38:41 -05:00
Steve Harris
379163b888
Merge tag 'OB_14.4.1-16m' into omaha_15.1.1
...
14.4.1-16m
Former-commit-id: 468600e9d5144873e5af1529ae0d38673e81bb17
2015-03-09 18:54:39 -05:00
Mark Peters
a037243fee
Omaha #4154 Null pointer when trying to add a contact notifier in collaboration
...
Change-Id: Ie291a4638e5a82a45f5d8a7a46c80604997dea89
Former-commit-id: ade10f507637a6cc9689fd020d9bf5f98270b53c
2015-02-25 16:24:38 -06:00
Steve Harris
716879f58b
Merge tag 'OB_14.4.1-4m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java
Former-commit-id: 714ca199f27013313099920bb9f55009c794f7f8
2015-01-27 11:56:24 -06:00
Steve Harris
2c559f4c88
Merge tag 'OB_14.4.1-2m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)
Former-commit-id: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
2015-01-23 09:32:44 -06:00
Brian Clements
1c2d8e01d0
Omaha #3709 unify collaboration color management
...
group chat session colors controlled by session color manager
color config persistence moved to utility
shared display uses same action to change colors as other sessions
Change-Id: I8ba4a3fb4842e3f96f05ee6d16b7e81e9567f6d7
Former-commit-id: c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec
2015-01-14 13:00:25 -06:00
Brian Clements
3d33ce1341
Omaha #3709 reworked custom user color configuration
...
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3
Former-commit-id: 18825c076fe273c9ae2e8040ccea2de0698b2877
2015-01-12 11:06:57 -06:00
Brian Clements
b6fc6425df
Omaha #3933 added more checks for editor shareability in collaboration
...
Change-Id: If1c266c6d165c1dba3fbb781e286140edc88e742
Former-commit-id: 48603783d167be43d6e62d9e1579d695f627a0c7
2015-01-06 15:20:14 -06:00
Mark Peters
530b52d7db
Omaha #3709 Fix some minor issues with collaboration colors.
...
Change-Id: I07fbcd6db21c3ee3b5fa404ad1c004af7e3ac057
Former-commit-id: f028c5040e50d3a2c96294d5c4d7ddd0e360defb
2015-01-05 12:57:42 -06:00
Mark Peters
7b591d8a68
Omaha #3709 Add icon that displays text colors next to color change menu items
...
Change-Id: I5a8fe5cc5679381587cb7b13cfa5984bf796ee42
Former-commit-id: ca40c8637ae75b25119864f0182cb25471d52219
2014-12-12 13:09:14 -06:00
Mark Peters
a721ccbcac
Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list
...
Change-Id: Ie03659376d3a035bb2acbd98b2e34a91e6b5ad57
Former-commit-id: 447437edc9b14412615ff691784fa7545146a596
2014-12-09 11:47:22 -06:00
Mark Peters
bd3ed3935c
Omaha #3709 Support foreground/background colors by user for group chats without shared display
...
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa
Former-commit-id: 73d8510ef265b47d2d45f36be3609ef8f35ece12
2014-12-04 10:37:53 -06:00
Mark Peters
a558047f95
Omaha #3709 Support foreground/background colors by site for nws-collaborate room
...
Change-Id: Id090446cf3ee5e9755039c228a0924fa3756add0
Former-commit-id: 999feecc3880c10f5d19a2829d7552fa49595bd5
2014-12-02 11:24:01 -06:00
Mark Peters
0332e4e693
Omaha #3709 Collaboration chat colors for PeerToPeerView
...
Change-Id: I78a5f13caa685c993a28293f6a110fd52b2b7b08
Former-commit-id: 341b54d6d23f08499345b8972a77acc9e2ca8c8b
2014-11-21 12:57:08 -06:00
Brian Clements
4089f14d57
Omaha #3705 fixed collaboration public room empty participants list problem
...
Change-Id: I25e35b6f5dc1266191c04131b69c840ccd76363e
Former-commit-id: 251a206c409855ee105c97bdbfe80715142bf25d
2014-11-12 10:38:15 -06:00
Mark Peters
54a3e8d2eb
Omaha #3709 Collaboration chat windows need to support changing foreground and background color
...
Change-Id: I1f208c3e12e0fe989ae395423ad28454be3589f7
Former-commit-id: 8e00cd23205c4ab3f83c5594373f3736afe7fe83
2014-10-16 10:28:34 -05:00
Brian Clements
180696a594
Omaha #3708 fixed possible NPE in SiteConfigurationManager
...
Change-Id: Ic63d25ed626bec38fea2374c4122d29b44e064ab
Former-commit-id: 21924a6b536409681073f65d769bef53db049102
2014-10-14 15:49:36 -05:00
Brian Clements
dfb43fda31
Omaha #3708 collaboration feed room supports blacklists
...
refactored SiteConfigurationManager
Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5
Former-commit-id: 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78
2014-10-13 11:11:32 -05:00
Mark Peters
5d87f3d22d
Omaha #3711 Allow configuration of how chat lines will display
...
Change-Id: Ibe66602c4e527a265be4ce9758652eaebdbe132f
Former-commit-id: b929d424107b0a2495f4305fd2500e362cccce4e
2014-10-10 14:25:38 -05:00
Brian Clements
87964cb500
Omaha #3705 added collaboration public room search, bookmarking
...
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818
Former-commit-id: 919c816ba7af2082b9dcb0308128fa1b228475d2
2014-10-09 08:38:45 -05:00
Nate Jensen
8e74892cd6
Omaha #3356 remove OBE register buddies from collaboration
...
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f
Former-commit-id: 89de611bd1abdd016ae8a96db4c820004c52b406
2014-09-03 10:00:11 -05:00
Brian Clements
a609334abf
Omaha #3539 reworked link to editor action to avoid recursion warning
...
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01
Former-commit-id: dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3
2014-08-26 17:22:20 -05:00
Brian Clements
bfd9f59de8
Omaha #3342 added count to collaboration participant list
...
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e
Former-commit-id: 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4
2014-07-03 15:11:48 -05:00
Brian Clements
88ba6b47ad
Omaha #1798 fixed collaboration drawing issues when leader shares new map
...
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer
Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa
Former-commit-id: 4df0a485d285a920a53e812bec204683f5ff29f6
2014-06-30 15:57:58 -05:00
Richard Peter
706409b459
Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
...
Former-commit-id: f81ae068eca41eeae5d785668f4c1d7cf59ae9df
2014-06-27 16:52:39 -05:00
Brian Clements
dc7a76197d
Omaha #3323 fixed collaboration disposed font issue
...
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2
Former-commit-id: e216af49d135ceeff5e6cd251c6742602230553c
2014-06-27 16:33:27 -05:00
Brian Clements
741afe7d39
Omaha #3281 made venue session views non-sticky (except for feed view)
...
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0
Former-commit-id: e7f48359f00b2e91b39b7646da0f9f409f5d3805
2014-06-27 15:33:11 -05:00
Nate Jensen
61640d5c22
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
9d626a97e5
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
9aa5a87c4b
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
Brian Clements
37699395ef
Omaha #3078 added private chat to collaboration
...
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 93f7d7088e7d7888a878558c6f2fcc368bf3ab05
2014-06-17 11:52:58 -05:00
Brian Clements
b6a2bf0ae4
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: baab2ea12e1117446295ae60bc06228eb6139895
2014-06-17 09:26:24 -05:00
Brian Clements
adbffa5ddd
Omaha #3267 fixed collaboration NPE possibility
...
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260
Former-commit-id: a23e57f3d1a6f4213216a7e038b85b17b6628faa
2014-06-12 15:06:46 -05:00
Mike Duff
80922824a3
Omaha #3269 - Fix editing of Notifiers before saving
...
Amend - Remove save confirmation dialog, rename buttons
Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4
Former-commit-id: 47d57692c81757a8b8c0d3217e21f701f18cdf2c
2014-06-12 11:21:15 -05:00
Brian Clements
b774503931
Omaha #3172 fixed ui filtering for contacts and sessions
...
Former-commit-id: 4e6f168df1f957c5eed73a281441a0d4d0d76cdb
2014-05-20 11:04:57 -05:00
Brian Clements
0e18d45bdf
Omaha #3180 fixed inviting strangers and multiple users in collaboration
...
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited
Former-commit-id: 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb
2014-05-19 15:54:36 -05:00
Brian Clements
f545c548cc
Issue #3076 added clear all to shared display sessions
...
Former-commit-id: 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb
2014-05-06 09:30:07 -05:00
Nate Jensen
f4d20c41f4
Issue #2956 more safety checks
...
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: a24190f35b87351a5f699ac05041bec7a13a1cdb
2014-05-01 16:28:16 -05:00
Brian Clements
02f08d75c6
Issue #3070 fixed contact request handling
...
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with
Former-commit-id: 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096
2014-04-24 16:10:27 -05:00
Brian Clements
f888819646
Issue #2955 ignore duplicate session invites
...
Former-commit-id: a48b12b8aaeea250680c0726f72425eac170ecd7
2014-04-24 09:25:54 -05:00
Lee Venable
df05a79d63
Issue #3040 - Fixed contact request and group name issues.
...
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e
Former-commit-id: badc9fa46aebe7f7da25c3a115294a37b30aa507
2014-04-23 18:24:25 -05:00
Nate Jensen
ad6e4712d6
Merge "Issue #2822 shared display invitations always go to cave" into development
...
Former-commit-id: 2a61b602d55922e5b7f5002f794449880c2cc1a7
2014-04-23 15:30:44 -05:00
Brian Clements
f3ee7b453a
Issue #2822 shared display invitations always go to cave
...
if user is logged in to a client that supports shared displays, invites always go there
behaviour unchanged if not logged into a client that supports shared displays
added better resource name than 'Smack' for cave clients
Former-commit-id: 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3
2014-04-23 14:16:42 -05:00
Nate Jensen
426f103e7b
Issue #3060 safety checks for SWT widgets being disposed
...
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2
Former-commit-id: 0c391f8c7f1694c6939419b5fcc4a6a963092ae3
2014-04-23 12:26:27 -05:00
Nate Jensen
fe3ff669a7
Merge "Issue #3056 made venue participant equals method case insensitive" into development
...
Former-commit-id: d6f1435a902615724aed2ff0279a6deb29933ce1
2014-04-22 12:50:27 -05:00
Brian Clements
1adbf6253a
Issue #3056 made venue participant equals method case insensitive
...
needed since collaboration server lower cases room names
lower cased on creation so in memory matches what is on the server
Former-commit-id: 7a2423f4a90597706e52ce0f89bacb1a0e10f067
2014-04-22 11:55:36 -05:00
Brian Clements
717cdf4280
Issue #3038 added initialized flag to session feed view
...
differentiates between roster population and new joins
Former-commit-id: 9b6c20ac39765120efc523c03a3d11d4b21c1748
2014-04-22 10:01:27 -05:00
Mike Duff
ead90bc794
Issue #2955 - Made chat invitation dialogs non-modal
...
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023
Former-commit-id: bb61e3c39d5dabf7e698726f0a093d8cf4f7088a
2014-04-21 09:00:42 -05:00
Brian Clements
1112ca621e
Issue #3021 increased width of create session dialog to fit error msg
...
Former-commit-id: f0bcc20987d814a716994f712c6132bb79963457
2014-04-16 14:33:02 -05:00
