Commit graph

111 commits

Author SHA1 Message Date
Nate Jensen
a47e9b72ac Omaha #4238 null safety check if feed view temporarily exists in other perspectives
after logging out

Change-Id: I9bdfa86a1ae2d587cf3ad4487d0c6eae15f1ff25

Former-commit-id: 808ae0398b [formerly e078881789 [formerly b915adf57c64e5b0cf5f856436c9a1f01098a897]]
Former-commit-id: e078881789
Former-commit-id: 7e899a1c08
2015-03-10 18:38:41 -05:00
Mark Peters
bd18a8f195 Omaha #4154 Null pointer when trying to add a contact notifier in collaboration
Change-Id: Ie291a4638e5a82a45f5d8a7a46c80604997dea89

Former-commit-id: cc9720e678 [formerly a037243fee [formerly ade10f507637a6cc9689fd020d9bf5f98270b53c]]
Former-commit-id: a037243fee
Former-commit-id: ad7efdb649
2015-02-25 16:24:38 -06:00
Brian Clements
38aa18a7e0 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: 8cc1aa9f33 [formerly 1c2d8e01d0 [formerly c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec]]
Former-commit-id: 1c2d8e01d0
Former-commit-id: 17ccb3ab66
2015-01-14 13:00:25 -06:00
Brian Clements
63041f1980 Omaha #3709 reworked custom user color configuration
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3

Former-commit-id: 46c0d7d42c [formerly 3d33ce1341 [formerly 18825c076fe273c9ae2e8040ccea2de0698b2877]]
Former-commit-id: 3d33ce1341
Former-commit-id: 911b007d95
2015-01-12 11:06:57 -06:00
Mark Peters
bdb8c848dd Omaha #3709 Fix some minor issues with collaboration colors.
Change-Id: I07fbcd6db21c3ee3b5fa404ad1c004af7e3ac057

Former-commit-id: 7cc21da419 [formerly 530b52d7db [formerly f028c5040e50d3a2c96294d5c4d7ddd0e360defb]]
Former-commit-id: 530b52d7db
Former-commit-id: 6df0145869
2015-01-05 12:57:42 -06:00
Mark Peters
c054291607 Omaha #3709 Add icon that displays text colors next to color change menu items
Change-Id: I5a8fe5cc5679381587cb7b13cfa5984bf796ee42

Former-commit-id: 05eabb4a91 [formerly 7b591d8a68 [formerly ca40c8637ae75b25119864f0182cb25471d52219]]
Former-commit-id: 7b591d8a68
Former-commit-id: 5a19380c59
2014-12-12 13:09:14 -06:00
Mark Peters
9960f739c3 Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list
Change-Id: Ie03659376d3a035bb2acbd98b2e34a91e6b5ad57

Former-commit-id: 1880d72b9d [formerly a721ccbcac [formerly 447437edc9b14412615ff691784fa7545146a596]]
Former-commit-id: a721ccbcac
Former-commit-id: e1bf45baef
2014-12-09 11:47:22 -06:00
Mark Peters
9006dbbb47 Omaha #3709 Support foreground/background colors by user for group chats without shared display
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa

Former-commit-id: 7ae71cf1dc [formerly bd3ed3935c [formerly 73d8510ef265b47d2d45f36be3609ef8f35ece12]]
Former-commit-id: bd3ed3935c
Former-commit-id: 1b30658214
2014-12-04 10:37:53 -06:00
Mark Peters
e0375a393c Omaha #3709 Support foreground/background colors by site for nws-collaborate room
Change-Id: Id090446cf3ee5e9755039c228a0924fa3756add0

Former-commit-id: 5ad0cde96b [formerly a558047f95 [formerly 999feecc3880c10f5d19a2829d7552fa49595bd5]]
Former-commit-id: a558047f95
Former-commit-id: 3a10a13053
2014-12-02 11:24:01 -06:00
Mark Peters
9942ce6961 Omaha #3709 Collaboration chat colors for PeerToPeerView
Change-Id: I78a5f13caa685c993a28293f6a110fd52b2b7b08

Former-commit-id: 3d43e87374 [formerly 0332e4e693 [formerly 341b54d6d23f08499345b8972a77acc9e2ca8c8b]]
Former-commit-id: 0332e4e693
Former-commit-id: 10179bb1f4
2014-11-21 12:57:08 -06:00
Brian Clements
e89ad748a7 Omaha #3705 fixed collaboration public room empty participants list problem
Change-Id: I25e35b6f5dc1266191c04131b69c840ccd76363e

Former-commit-id: a8cc3b8f08 [formerly 4089f14d57 [formerly 251a206c409855ee105c97bdbfe80715142bf25d]]
Former-commit-id: 4089f14d57
Former-commit-id: e4ee934545
2014-11-12 10:38:15 -06:00
Mark Peters
5a6f3ff09c Omaha #3709 Collaboration chat windows need to support changing foreground and background color
Change-Id: I1f208c3e12e0fe989ae395423ad28454be3589f7

Former-commit-id: e002132009 [formerly 54a3e8d2eb [formerly 8e00cd23205c4ab3f83c5594373f3736afe7fe83]]
Former-commit-id: 54a3e8d2eb
Former-commit-id: ec62b9a6f1
2014-10-16 10:28:34 -05:00
Brian Clements
847d9c9925 Omaha #3708 fixed possible NPE in SiteConfigurationManager
Change-Id: Ic63d25ed626bec38fea2374c4122d29b44e064ab

Former-commit-id: 0a42113bbb [formerly 180696a594 [formerly 21924a6b536409681073f65d769bef53db049102]]
Former-commit-id: 180696a594
Former-commit-id: 158aa3f439
2014-10-14 15:49:36 -05:00
Brian Clements
7d4dbd204e Omaha #3708 collaboration feed room supports blacklists
refactored SiteConfigurationManager

Change-Id: I74282074862674cac6b9190adafe38ed6d607dc5

Former-commit-id: 2a7feaebfe [formerly dfb43fda31 [formerly 9b2e76141b7cdd49c145d9d54f83e49ba3ea0d78]]
Former-commit-id: dfb43fda31
Former-commit-id: c33a5ad562
2014-10-13 11:11:32 -05:00
Mark Peters
4660b63394 Omaha #3711 Allow configuration of how chat lines will display
Change-Id: Ibe66602c4e527a265be4ce9758652eaebdbe132f

Former-commit-id: fb6131869c [formerly 5d87f3d22d [formerly b929d424107b0a2495f4305fd2500e362cccce4e]]
Former-commit-id: 5d87f3d22d
Former-commit-id: f8e3c8412b
2014-10-10 14:25:38 -05:00
Brian Clements
abb6b1f258 Omaha #3705 added collaboration public room search, bookmarking
Change-Id: I298254111d1eb305820c313ebe176f091fe7a818

Former-commit-id: f0921db20c [formerly 87964cb500 [formerly 919c816ba7af2082b9dcb0308128fa1b228475d2]]
Former-commit-id: 87964cb500
Former-commit-id: 1a6624d5d7
2014-10-09 08:38:45 -05:00
Nate Jensen
8b55dfa980 Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f

Former-commit-id: 40d4abe4cd [formerly 8e74892cd6 [formerly 89de611bd1abdd016ae8a96db4c820004c52b406]]
Former-commit-id: 8e74892cd6
Former-commit-id: b690c360ac
2014-09-03 10:00:11 -05:00
Brian Clements
9509568efa Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01

Former-commit-id: f871058f67 [formerly a609334abf [formerly dcf9ea1ef4f7a7139f6c3700c04e9f9e2fda98e3]]
Former-commit-id: a609334abf
Former-commit-id: a39a997a8d
2014-08-26 17:22:20 -05:00
Brian Clements
aad63c257d Omaha #3342 added count to collaboration participant list
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e

Former-commit-id: e4c9a13adb [formerly bfd9f59de8 [formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]
Former-commit-id: bfd9f59de8
Former-commit-id: c3a25024ae
2014-07-03 15:11:48 -05:00
Brian Clements
309900daab 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: fc70dbc86e [formerly 88ba6b47ad [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]
Former-commit-id: 88ba6b47ad
Former-commit-id: 0125117d9c
2014-06-30 15:57:58 -05:00
Richard Peter
5a74a3cf99 Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: f4cdd661fe [formerly 706409b459 [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]
Former-commit-id: 706409b459
Former-commit-id: bcffac8875
2014-06-27 16:52:39 -05:00
Brian Clements
c2cd991296 Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2

Former-commit-id: fe149faffa [formerly dc7a76197d [formerly e216af49d135ceeff5e6cd251c6742602230553c]]
Former-commit-id: dc7a76197d
Former-commit-id: 023d1bde0b
2014-06-27 16:33:27 -05:00
Brian Clements
9425ad16a3 Omaha #3281 made venue session views non-sticky (except for feed view)
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0

Former-commit-id: 31a08efb61 [formerly 741afe7d39 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]
Former-commit-id: 741afe7d39
Former-commit-id: eb806a6bb3
2014-06-27 15:33:11 -05:00
Nate Jensen
ebc605e2e8 Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
Former-commit-id: 172f18a5b1 [formerly 61640d5c22 [formerly 449a40d7981b0814f9cc7feb62f52b2259e83e5f]]
Former-commit-id: 61640d5c22
Former-commit-id: 718d941c23
2014-06-23 12:12:03 -05:00
Brian Clements
c2ac40caec 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: 93a1ee71c4 [formerly 9d626a97e5 [formerly a31b7f213081f384bd23d53a431ce53593254c25]]
Former-commit-id: 9d626a97e5
Former-commit-id: f053e9b084
2014-06-20 09:04:15 -05:00
Brian Clements
27f7b754a3 Omaha #3281 collaboration views persist between perspectives
fixed bug that prevented re-opening collaboration after views were closed

Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3

Former-commit-id: fd95df3bc0 [formerly 9aa5a87c4b [formerly b84f7571415871f2983b913cf816ed227b24bbac]]
Former-commit-id: 9aa5a87c4b
Former-commit-id: 21fca2e662
2014-06-20 08:53:54 -05:00
Brian Clements
8fee2a762c Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 97a6f5bfe8 [formerly 37699395ef [formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]
Former-commit-id: 37699395ef
Former-commit-id: 86e89665bf
2014-06-17 11:52:58 -05:00
Brian Clements
f38f9fae51 Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: 84e3f967d9 [formerly b6a2bf0ae4 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]
Former-commit-id: b6a2bf0ae4
Former-commit-id: 8205f7cd56
2014-06-17 09:26:24 -05:00
Brian Clements
667cda6c19 Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: 91eb7d40c2 [formerly adbffa5ddd [formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]
Former-commit-id: adbffa5ddd
Former-commit-id: 42e6e38c2e
2014-06-12 15:06:46 -05:00
Mike Duff
9ecb9c413f Omaha #3269 - Fix editing of Notifiers before saving
Amend - Remove save confirmation dialog, rename buttons

Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4

Former-commit-id: c920a24300 [formerly 80922824a3 [formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]
Former-commit-id: 80922824a3
Former-commit-id: 522d3c70f2
2014-06-12 11:21:15 -05:00
Brian Clements
83654c374a Omaha #3172 fixed ui filtering for contacts and sessions
Former-commit-id: 8dce7e9b85 [formerly b774503931 [formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]
Former-commit-id: b774503931
Former-commit-id: 455af3612f
2014-05-20 11:04:57 -05:00
Brian Clements
5bf4c253f6 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: 573ffcb0bf [formerly 0e18d45bdf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]
Former-commit-id: 0e18d45bdf
Former-commit-id: b5e961d6b4
2014-05-19 15:54:36 -05:00
Brian Clements
02c921ed12 Issue #3076 added clear all to shared display sessions
Former-commit-id: 1432aa1302 [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]
Former-commit-id: f545c548cc
Former-commit-id: 729e717be1
2014-05-06 09:30:07 -05:00
Nate Jensen
54c6d5d07f Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: 7d142d9d9d [formerly f4d20c41f4 [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]
Former-commit-id: f4d20c41f4
Former-commit-id: d759efcaa8
2014-05-01 16:28:16 -05:00
Brian Clements
345fe6f866 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: 94aa761e19 [formerly 02f08d75c6 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]
Former-commit-id: 02f08d75c6
Former-commit-id: 334ad3ca81
2014-04-24 16:10:27 -05:00
Brian Clements
9f18c5d54c Issue #2955 ignore duplicate session invites
Former-commit-id: 4fa9afc9ae [formerly f888819646 [formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]
Former-commit-id: f888819646
Former-commit-id: e81ee94171
2014-04-24 09:25:54 -05:00
Lee Venable
e17fa9f609 Issue #3040 - Fixed contact request and group name issues.
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e

Former-commit-id: f13ac7e1b9 [formerly df05a79d63 [formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]
Former-commit-id: df05a79d63
Former-commit-id: eed8c6cbba
2014-04-23 18:24:25 -05:00
Nate Jensen
68e3650305 Merge "Issue #2822 shared display invitations always go to cave" into development
Former-commit-id: 2b20cf5440 [formerly ad6e4712d6 [formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]
Former-commit-id: ad6e4712d6
Former-commit-id: 827112349a
2014-04-23 15:30:44 -05:00
Brian Clements
148d158380 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: 6969321db0 [formerly f3ee7b453a [formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]
Former-commit-id: f3ee7b453a
Former-commit-id: 117eeca83a
2014-04-23 14:16:42 -05:00
Nate Jensen
37371486ba Issue #3060 safety checks for SWT widgets being disposed
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2

Former-commit-id: 38d493ff1b [formerly 426f103e7b [formerly 0c391f8c7f1694c6939419b5fcc4a6a963092ae3]]
Former-commit-id: 426f103e7b
Former-commit-id: fbecf66f79
2014-04-23 12:26:27 -05:00
Nate Jensen
bf06389b9e Merge "Issue #3056 made venue participant equals method case insensitive" into development
Former-commit-id: 8df505325c [formerly fe3ff669a7 [formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]
Former-commit-id: fe3ff669a7
Former-commit-id: cc1da5fb88
2014-04-22 12:50:27 -05:00
Brian Clements
a5730ca7bd 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: 2a9d341910 [formerly 1adbf6253a [formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]
Former-commit-id: 1adbf6253a
Former-commit-id: bfd88f3e14
2014-04-22 11:55:36 -05:00
Brian Clements
1665175d35 Issue #3038 added initialized flag to session feed view
differentiates between roster population and new joins


Former-commit-id: ef61a7c281 [formerly 717cdf4280 [formerly 9b6c20ac39765120efc523c03a3d11d4b21c1748]]
Former-commit-id: 717cdf4280
Former-commit-id: cdf3aa90e9
2014-04-22 10:01:27 -05:00
Mike Duff
6da65fe71a Issue #2955 - Made chat invitation dialogs non-modal
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023

Former-commit-id: b507739637 [formerly ead90bc794 [formerly bb61e3c39d5dabf7e698726f0a093d8cf4f7088a]]
Former-commit-id: ead90bc794
Former-commit-id: 71cf0d04e7
2014-04-21 09:00:42 -05:00
Brian Clements
78c1b34cdf Issue #3021 increased width of create session dialog to fit error msg
Former-commit-id: bb915796ad [formerly 1112ca621e [formerly f0bcc20987d814a716994f712c6132bb79963457]]
Former-commit-id: 1112ca621e
Former-commit-id: ef791fe481
2014-04-16 14:33:02 -05:00
Brian Clements
dc1d2d39f8 Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: 6ccedc1182 [formerly 5250f7a442 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]
Former-commit-id: 5250f7a442
Former-commit-id: db67c03382
2014-04-15 15:15:11 -05:00
Brian Clements
3d8bcb8701 Issue #2903 made xmpp reconnect an explicit action by user
moved non-session classes out of session package
connection classes moved to connection package
made separate classes for connection listeners
removed password from heap
login dialog remembers last server used
added reconnect handler to prompt user to re-login after disconnect


Former-commit-id: 6b22374046 [formerly 8ab1bab974 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]
Former-commit-id: 8ab1bab974
Former-commit-id: 6f7851d8c4
2014-04-15 15:12:33 -05:00
Mike Duff
c70da23f91 Issue #2785 - Fix loading of groups in sub request dialog
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

Former-commit-id: d2a80ca966 [formerly 81e4c9b05d [formerly e72a852935dcb519604b37dc873645d4b419ee43]]
Former-commit-id: 81e4c9b05d
Former-commit-id: 3a6e718ff0
2014-04-15 10:10:18 -05:00
Brad Gonzales
0380e02c77 Issue #2937 Connect to the venue after the feed view is available.
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

Former-commit-id: ea03096031 [formerly cc0fd1e9af [formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]
Former-commit-id: cc0fd1e9af
Former-commit-id: 5fcec27765
2014-04-10 14:01:53 -05:00
Mike Duff
7c9a7d609e Issue #2785 - Change connection order of events
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb

Former-commit-id: 7da1547c22 [formerly efefe62e0f [formerly a2d595f4232e86606f7e2338ece59961649080a3]]
Former-commit-id: efefe62e0f
Former-commit-id: bdde561f8a
2014-04-08 14:14:20 -05:00