Commit graph

85 commits

Author SHA1 Message Date
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
Brian Clements
5250f7a442 Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: af9577548e40397c67f72eb60485ee8de48f169b
2014-04-15 15:15:11 -05:00
Brian Clements
8ab1bab974 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: 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3
2014-04-15 15:12:33 -05:00
Mike Duff
81e4c9b05d Issue #2785 - Fix loading of groups in sub request dialog
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

Former-commit-id: e72a852935dcb519604b37dc873645d4b419ee43
2014-04-15 10:10:18 -05:00
Brad Gonzales
cc0fd1e9af Issue #2937 Connect to the venue after the feed view is available.
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

Former-commit-id: 7b0e689a06eeee9f7c39dd79642fcde8e329c990
2014-04-10 14:01:53 -05:00
Mike Duff
efefe62e0f Issue #2785 - Change connection order of events
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb

Former-commit-id: a2d595f4232e86606f7e2338ece59961649080a3
2014-04-08 14:14:20 -05:00
Nate Jensen
6b20d38b1a Merge "Issue #2632 - Remove user from list on sign-off. Fixed check for available" into development
Former-commit-id: 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611
2014-04-02 11:23:02 -05:00
Mike Duff
538261f6d5 Issue #2632 - Remove user from list on sign-off. Fixed check for available
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe

Former-commit-id: 2f9981c5173f0c2523b586ce10147f738028b907
2014-04-02 10:08:45 -05:00
Mike Duff
8967ddd94a Issue #2938 - Fix site/role change logic for messages
Change-Id: I5a08020f28b986c7815bb5ab2b71a34d9e105500

Former-commit-id: 9ffc540c21245b308334040234be03d78a501656
2014-04-02 08:12:53 -05:00
Brad Gonzales
404faeeca0 Issue #2937 Separate room logging into a subdirectory to separate room logs from
other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory
for dependency jars so that symbolic links are not needed in order to build.  Fixes for Archive log access
and search.

Change-Id: I7ca111cebb4dae998ce1390f3bb73b0f48eb7174

Former-commit-id: 480c86e5bbe6866b8c4c285006d3d7f7fed2b056
2014-03-31 11:45:22 -05:00
Lee Venable
19dd95ba24 Issue #2960 - added checks for SashForm weights
Former-commit-id: 1a3c0743b773f695fa881f83a9773a899a2ef111
2014-03-28 15:30:11 -05:00
Mike Duff
d803986440 Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b

Former-commit-id: a50bd58e95a929fe569f5df68dd4d4a8b6625807
2014-03-27 16:31:30 -05:00
Nate Jensen
38e3305e60 Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
Former-commit-id: 578a9ec587b83d77c6e6882a7e8bf71aecd996ff
2014-03-25 13:11:29 -05:00
Mike Duff
1e42d8a30d Issue #2938 - Show status message for site/role changes, but not return from away
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2

Former-commit-id: 666a354d6f676b899bd14371517bce9de88192d2
2014-03-25 11:18:09 -05:00
Nate Jensen
68f9181340 Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: 517fd6fca0f08cbc166b58d67d86af43331533cf
2014-03-25 10:24:11 -05:00
Mike Duff
fd31ea7fa5 Issue #2936 - Remove the join alert from the nws collaboration feed
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840

Former-commit-id: ca47cb349b4749edaac6afe0648c18cb06a9f9df
2014-03-24 14:59:33 -05:00
Nate Jensen
e75d3dfb7c Issue #2895 fixed telestration when leadership returns to a previous
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0
2014-03-18 12:52:01 -05:00
Mike Duff
3d10260065 Issue #2798 - Fix issue with color not changing for existing user changing site.
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57

Former-commit-id: 8c82d25f6197e838bbd6119003d589bf4fa266ee
2014-03-18 11:55:00 -05:00
Nate Jensen
82778ad21b Merge "Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean." into development
Former-commit-id: b723095f6d5d59b67370c7292f88f339d349993a
2014-03-12 16:05:19 -05:00
Mike Duff
8068c9aa83 Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean.
Change-Id: I533e0831529038cb4205e38e706369ca74f4f824

Former-commit-id: 13f134bafc5331939e23ce0e14d350593bb7c2e1
2014-03-12 10:52:18 -05:00
Lee Venable
df65d7c7ce Issue #2865 - added more null and dispose checks
Former-commit-id: c2aa1d021c49e522a3b4a9dd17a55317a13e91e1
2014-03-11 16:30:33 -05:00
Lee Venable
2c67c4f6c4 Issue #2865 - fixed font memory leak
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d

Former-commit-id: 2555d382f26278c5f972c17da778338142cdaaec
2014-03-11 10:31:50 -05:00
Brian Clements
dc55cd5b5c Issue #2848 fixed session create, listen, join ordering
clients were missing events and messages because listeners weren't up before joining
collaboration connection needed to add to session map before joining the session
display containers needed to register with session event bus before joining the session
clients no longer send events to empty sessions


Former-commit-id: e832f6420b6363a3c951725e0d23f460b2efb42e
2014-03-10 14:06:45 -05:00
Brian Clements
44d161729f Issue #2751 ensured that room admins know real userids
the server can be queried for userids by room admins
this does not update the stored participant info in muc
added cached, on-demand check for userid for participants
needed for leadership transfer


Former-commit-id: b3bf76b676b7e75559236d67c687cd5011859a8b
2014-03-07 15:37:29 -06:00
Nate Jensen
cf4631f9bf Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
Former-commit-id: e6dc5f076bfd4811b2b1cdaf3782a5066e032381
2014-03-05 14:41:12 -06:00
Mike Duff
e97e745b61 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: b087558dce4e19596c93d47e986af50fae806a74
2014-03-05 14:39:55 -06:00
Mike Duff
8c693a5f70 Issue #2632 - Fix problem with multiple notifiers per user.
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000

Former-commit-id: 168a656194aa3b455f403aa92b290bbbe17d3b45
2014-03-05 12:02:33 -06:00
Brian Clements
c0e4615967 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: 3f7cfbbf1c60cffa0aa31f53b29521b78774042e
2014-03-05 09:00:57 -06:00
Max Schenkelberg
a01a6d68d0 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: cc34e3dbebe13ec4f63b7529f5053391135837ef
2014-03-04 09:23:36 -06:00
Mike Duff
5440ff64d1 Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 8ece6e53095ee80d7d4baa249125b3fe7a03add7
2014-02-28 13:23:34 -06:00
Mike Duff
ed5cb91406 Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: 61e803bb38b398fd6758d650b6120dc2514064b4
2014-02-20 15:09:10 -06:00
Brian Clements
aaa2de20f4 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: 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3
2014-02-20 11:50:54 -06:00