Commit graph

126 commits

Author SHA1 Message Date
Mark Peters
5b234da86c Omaha #4563 Need more prominent visual distinction between logged in and logged off collaboration users
Change-Id: I271bc49aeba596274284865a2985088de1851ac5

Former-commit-id: f3bc363c459c5f514cc33f15feb343c2902064dc
2015-06-23 11:52:44 -05:00
Bryan Kowal
714d065fef Omaha #4401 - refactored filtering to a common location so that it can be used by other components.
Change-Id: Ia2d88e2055b1448099512f4aca81e47e6f80cffd

Former-commit-id: 8bdd6c6f0c890dbbaddf72d1a9e2fa8b3eb4d1c0
2015-06-16 17:55:42 -05:00
Mark Peters
aade6d1bb8 Omaha #4328 Investigate more prominent visual notification of new chat messages on tabs that don't have focus
Change-Id: I72de62e52404308f20d54fd82917644ae0090cdd

Former-commit-id: 12373e096823b8eaeb0fbf45a0dffa3c55a984f0
2015-05-22 14:01:49 -05:00
David Lovely
80dc4c85d9 Omaha #4146 Bundled class files in a jar when unpacked.
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02

Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
2015-05-19 10:23:35 -05:00
Mark Peters
2d7c0a50e2 Omaha #4362 Add spellcheck capability to collaboration chat input box
Change-Id: I532322c43985224c724a91eead825775b3d9b1ce

Former-commit-id: 8ad95da67c44cba94da1084a238b6c5ac57d3022
2015-04-15 14:52:53 -05:00
Nate Jensen
78fb64303c Merge "Omaha #4327 Need more prominent notification of new collaboration messages when minimized" into omaha_16.1.1
Former-commit-id: 8187807ebe261b1dcd7fccebf38d7eb0ff05ba98
2015-04-02 10:20:54 -05:00
Mark Peters
2bd5916f07 Omaha #4327 Need more prominent notification of new collaboration messages when minimized
Change-Id: I83ebb9446cbabc5f15fd4eaebffbe5f56da317b9

Former-commit-id: 7c5badf7404a4199b8436c68e23873bf321dd6a1
2015-04-01 16:57:47 -05:00
Steve Harris
1c1844ad65 Merge branch 'omaha_15.1.1' into omaha_16.1.1
Conflicts:
	cave/build/p2-build.xml


Former-commit-id: 908fc24c43aab13856a375d8f79b4d0e576bea9a
2015-03-27 13:52:27 -05:00
Steve Harris
165971a4f6 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
Mark Peters
2ba50e9fa4 Omaha #4316 Collaboration chats need to show dates
Change-Id: I9eff75484acc4d5ed9c7f23714e0412070a99144

Former-commit-id: 32a5f5f314a97c834df8fb487d88ffc7013a3413
2015-03-25 14:17:15 -05:00
Mark Peters
7efcfcd429 Omaha #4265 Collaboration alert words should be able to load from different localization levels
Change-Id: Ia11db64b7e5a0ac246355b9bfbe6207484ef7bc1

Former-commit-id: 203ada0e884d0c7ade4642ffbc227faeac393254
2015-03-24 15:59:36 -05:00
Nate Jensen
808ae0398b 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
85b687be0b 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
cc9720e678 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
8eb10d0456 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
9234ceb485 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
8cc1aa9f33 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
46c0d7d42c Omaha #3709 reworked custom user color configuration
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3

Former-commit-id: 18825c076fe273c9ae2e8040ccea2de0698b2877
2015-01-12 11:06:57 -06:00
Brian Clements
93b33929d6 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
7cc21da419 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
05eabb4a91 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
1880d72b9d 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
7ae71cf1dc 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
5ad0cde96b 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
3d43e87374 Omaha #3709 Collaboration chat colors for PeerToPeerView
Change-Id: I78a5f13caa685c993a28293f6a110fd52b2b7b08

Former-commit-id: 341b54d6d23f08499345b8972a77acc9e2ca8c8b
2014-11-21 12:57:08 -06:00
Brian Clements
a8cc3b8f08 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
e002132009 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
0a42113bbb Omaha #3708 fixed possible NPE in SiteConfigurationManager
Change-Id: Ic63d25ed626bec38fea2374c4122d29b44e064ab

Former-commit-id: 21924a6b536409681073f65d769bef53db049102
2014-10-14 15:49:36 -05:00
Brian Clements
2a7feaebfe 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
fb6131869c 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
f0921db20c 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
40d4abe4cd 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
f871058f67 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
e4c9a13adb 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
fc70dbc86e 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
f4cdd661fe 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
fe149faffa Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2

Former-commit-id: e216af49d135ceeff5e6cd251c6742602230553c
2014-06-27 16:33:27 -05:00
Brian Clements
31a08efb61 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
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
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
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
Brian Clements
91eb7d40c2 Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: a23e57f3d1a6f4213216a7e038b85b17b6628faa
2014-06-12 15:06:46 -05:00
Mike Duff
c920a24300 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
8dce7e9b85 Omaha #3172 fixed ui filtering for contacts and sessions
Former-commit-id: 4e6f168df1f957c5eed73a281441a0d4d0d76cdb
2014-05-20 11:04:57 -05:00
Brian Clements
573ffcb0bf 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
1432aa1302 Issue #3076 added clear all to shared display sessions
Former-commit-id: 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb
2014-05-06 09:30:07 -05:00
Nate Jensen
7d142d9d9d Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: a24190f35b87351a5f699ac05041bec7a13a1cdb
2014-05-01 16:28:16 -05:00
Brian Clements
94aa761e19 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