Commit graph

91 commits

Author SHA1 Message Date
Richard Peter
bcffac8875 Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: f4cdd661fe [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]
Former-commit-id: 706409b459
2014-06-27 16:52:39 -05:00
Brian Clements
023d1bde0b Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2

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

Former-commit-id: 31a08efb61 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]
Former-commit-id: 741afe7d39
2014-06-27 15:33:11 -05:00
Nate Jensen
718d941c23 Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
Former-commit-id: 172f18a5b1 [formerly 449a40d7981b0814f9cc7feb62f52b2259e83e5f]
Former-commit-id: 61640d5c22
2014-06-23 12:12:03 -05:00
Brian Clements
f053e9b084 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 a31b7f213081f384bd23d53a431ce53593254c25]
Former-commit-id: 9d626a97e5
2014-06-20 09:04:15 -05:00
Brian Clements
21fca2e662 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 b84f7571415871f2983b913cf816ed227b24bbac]
Former-commit-id: 9aa5a87c4b
2014-06-20 08:53:54 -05:00
Brian Clements
86e89665bf Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

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

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

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

Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4

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

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

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

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


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

Former-commit-id: b507739637 [formerly bb61e3c39d5dabf7e698726f0a093d8cf4f7088a]
Former-commit-id: ead90bc794
2014-04-21 09:00:42 -05:00
Brian Clements
ef791fe481 Issue #3021 increased width of create session dialog to fit error msg
Former-commit-id: bb915796ad [formerly f0bcc20987d814a716994f712c6132bb79963457]
Former-commit-id: 1112ca621e
2014-04-16 14:33:02 -05:00
Brian Clements
db67c03382 Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: 6ccedc1182 [formerly af9577548e40397c67f72eb60485ee8de48f169b]
Former-commit-id: 5250f7a442
2014-04-15 15:15:11 -05:00
Brian Clements
6f7851d8c4 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 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]
Former-commit-id: 8ab1bab974
2014-04-15 15:12:33 -05:00
Mike Duff
3a6e718ff0 Issue #2785 - Fix loading of groups in sub request dialog
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

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

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

Former-commit-id: 7da1547c22 [formerly a2d595f4232e86606f7e2338ece59961649080a3]
Former-commit-id: efefe62e0f
2014-04-08 14:14:20 -05:00
Nate Jensen
c0704488cc Merge "Issue #2632 - Remove user from list on sign-off. Fixed check for available" into development
Former-commit-id: 579d2416cb [formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]
Former-commit-id: 6b20d38b1a
2014-04-02 11:23:02 -05:00
Mike Duff
2a9b434883 Issue #2632 - Remove user from list on sign-off. Fixed check for available
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe

Former-commit-id: d5df936431 [formerly 2f9981c5173f0c2523b586ce10147f738028b907]
Former-commit-id: 538261f6d5
2014-04-02 10:08:45 -05:00
Mike Duff
66181ca3a5 Issue #2938 - Fix site/role change logic for messages
Change-Id: I5a08020f28b986c7815bb5ab2b71a34d9e105500

Former-commit-id: 169ad502de [formerly 9ffc540c21245b308334040234be03d78a501656]
Former-commit-id: 8967ddd94a
2014-04-02 08:12:53 -05:00
Brad Gonzales
d4659c48a6 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: 15e1b7a7f6 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]
Former-commit-id: 404faeeca0
2014-03-31 11:45:22 -05:00
Lee Venable
bdb18ea85b Issue #2960 - added checks for SashForm weights
Former-commit-id: 3018ff1f5f [formerly 1a3c0743b773f695fa881f83a9773a899a2ef111]
Former-commit-id: 19dd95ba24
2014-03-28 15:30:11 -05:00
Mike Duff
d2eed9891a Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b

Former-commit-id: 98b5fd762e [formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]
Former-commit-id: d803986440
2014-03-27 16:31:30 -05:00
Nate Jensen
c7dc0baeb9 Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
Former-commit-id: 4861f92ef6 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]
Former-commit-id: 38e3305e60
2014-03-25 13:11:29 -05:00
Mike Duff
758fdca514 Issue #2938 - Show status message for site/role changes, but not return from away
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2

Former-commit-id: a06f058ea9 [formerly 666a354d6f676b899bd14371517bce9de88192d2]
Former-commit-id: 1e42d8a30d
2014-03-25 11:18:09 -05:00
Nate Jensen
d1f080fd05 Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: 7b586ebd67 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]
Former-commit-id: 68f9181340
2014-03-25 10:24:11 -05:00
Mike Duff
eacc161ee4 Issue #2936 - Remove the join alert from the nws collaboration feed
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840

Former-commit-id: ca27ceac1f [formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]
Former-commit-id: fd31ea7fa5
2014-03-24 14:59:33 -05:00
Nate Jensen
68b60eba47 Issue #2895 fixed telestration when leadership returns to a previous
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: 2fc1030fad [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]
Former-commit-id: e75d3dfb7c
2014-03-18 12:52:01 -05:00
Mike Duff
ac65a87fe5 Issue #2798 - Fix issue with color not changing for existing user changing site.
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57

Former-commit-id: 7bdef60a55 [formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]
Former-commit-id: 3d10260065
2014-03-18 11:55:00 -05:00
Nate Jensen
0e39a89ea3 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: f8180587d4 [formerly b723095f6d5d59b67370c7292f88f339d349993a]
Former-commit-id: 82778ad21b
2014-03-12 16:05:19 -05:00
Mike Duff
6444131768 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: e01c5c3534 [formerly 13f134bafc5331939e23ce0e14d350593bb7c2e1]
Former-commit-id: 8068c9aa83
2014-03-12 10:52:18 -05:00
Lee Venable
fe6e7328c0 Issue #2865 - added more null and dispose checks
Former-commit-id: 1f9d1af221 [formerly c2aa1d021c49e522a3b4a9dd17a55317a13e91e1]
Former-commit-id: df65d7c7ce
2014-03-11 16:30:33 -05:00
Lee Venable
44733489b9 Issue #2865 - fixed font memory leak
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d

Former-commit-id: 58d7f759b2 [formerly 2555d382f26278c5f972c17da778338142cdaaec]
Former-commit-id: 2c67c4f6c4
2014-03-11 10:31:50 -05:00
Brian Clements
2456c2308f 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: aee98ecfb0 [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]
Former-commit-id: dc55cd5b5c
2014-03-10 14:06:45 -05:00
Brian Clements
2afc1a9319 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: dc94769c14 [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]
Former-commit-id: 44d161729f
2014-03-07 15:37:29 -06:00
Nate Jensen
ae9adefbf7 Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
Former-commit-id: 48fa8f8d1b [formerly e6dc5f076bfd4811b2b1cdaf3782a5066e032381]
Former-commit-id: cf4631f9bf
2014-03-05 14:41:12 -06:00
Mike Duff
25425a4268 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: 9c873e6dd9 [formerly b087558dce4e19596c93d47e986af50fae806a74]
Former-commit-id: e97e745b61
2014-03-05 14:39:55 -06:00