Nate Jensen
b54b30e037
Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
...
Former-commit-id: 718d941c2361640d5c22718d941c2361640d5c22172f18a5b1172f18a5b14e8d9343dd48995ed5ca217a0999d0
2014-06-23 12:12:03 -05:00
Brian Clements
bb58783ca4
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: f053e9b0849d626a97e5f053e9b0849d626a97e593a1ee71c493a1ee71c43eb4cd513ca9827ef8e87060fe3fba
2014-06-20 09:04:15 -05:00
Brian Clements
a8e31ffa21
Omaha #3281 collaboration views persist between perspectives
...
fixed bug that prevented re-opening collaboration after views were closed
Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3
Former-commit-id: 21fca2e6629aa5a87c4b21fca2e6629aa5a87c4bfd95df3bc0fd95df3bc074c62e0bf9795fa49ced5560b12a5a
2014-06-20 08:53:54 -05:00
Brian Clements
cdcf7d8143
Omaha #3078 added private chat to collaboration
...
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae
Former-commit-id: 86e89665bf37699395ef86e89665bf37699395ef97a6f5bfe897a6f5bfe851e260627760508bf6744433482d56
2014-06-17 11:52:58 -05:00
Brian Clements
0dcfac1a44
Omaha #3288 collaboration feed venue config comes from server
...
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0
Former-commit-id: 8205f7cd56b6a2bf0ae48205f7cd56b6a2bf0ae484e3f967d984e3f967d94dc81aabfa5436efb886616315d830
2014-06-17 09:26:24 -05:00
Brian Clements
338f293065
Omaha #3267 fixed collaboration NPE possibility
...
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260
Former-commit-id: 42e6e38c2eadbffa5ddd42e6e38c2eadbffa5ddd91eb7d40c291eb7d40c2b1fac777f43bdbf79eebe13aeb0ca5
2014-06-12 15:06:46 -05:00
Mike Duff
a87ac48a53
Omaha #3269 - Fix editing of Notifiers before saving
...
Amend - Remove save confirmation dialog, rename buttons
Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4
Former-commit-id: 522d3c70f280922824a3522d3c70f280922824a3c920a24300c920a243000bdefaabddb15b6514fd5e0aa25048
2014-06-12 11:21:15 -05:00
Brian Clements
f0ce9a6ca8
Omaha #3172 fixed ui filtering for contacts and sessions
...
Former-commit-id: 455af3612fb774503931455af3612fb7745039318dce7e9b858dce7e9b85c4447fc6c44078bbaa63213aab834f
2014-05-20 11:04:57 -05:00
Brian Clements
008c911f03
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: b5e961d6b40e18d45bdfb5e961d6b40e18d45bdf573ffcb0bf573ffcb0bf6769aff618e4433c5e103c6a10e154
2014-05-19 15:54:36 -05:00
Brian Clements
89f3a0a1d2
Issue #3076 added clear all to shared display sessions
...
Former-commit-id: 729e717be1f545c548cc729e717be1f545c548cc1432aa13021432aa130286748411545583c3903b3a60b0db05
2014-05-06 09:30:07 -05:00
Nate Jensen
42a27546f9
Issue #2956 more safety checks
...
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: d759efcaa8f4d20c41f4d759efcaa8f4d20c41f47d142d9d9d7d142d9d9d6f211aa9f8f3b68178bd3f9a33bf35
2014-05-01 16:28:16 -05:00
Brian Clements
670c4e1611
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: 334ad3ca8102f08d75c6334ad3ca8102f08d75c694aa761e1994aa761e1984f75ca30a12304655e8c27f2d9e53
2014-04-24 16:10:27 -05:00
Brian Clements
9e2497714b
Issue #2955 ignore duplicate session invites
...
Former-commit-id: e81ee94171f888819646e81ee94171f8888196464fa9afc9ae4fa9afc9ae39c2a1ac3775465b69ed3b96c4c628
2014-04-24 09:25:54 -05:00
Lee Venable
6c54817117
Issue #3040 - Fixed contact request and group name issues.
...
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e
Former-commit-id: eed8c6cbbadf05a79d63eed8c6cbbadf05a79d63f13ac7e1b9f13ac7e1b9421a4e4677222154d094e81836e371
2014-04-23 18:24:25 -05:00
Nate Jensen
61eca0980f
Merge "Issue #2822 shared display invitations always go to cave" into development
...
Former-commit-id: 827112349aad6e4712d6827112349aad6e4712d62b20cf54402b20cf5440418741ce55a0423843b31abd65120e
2014-04-23 15:30:44 -05:00
Brian Clements
8cdeb571f3
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: 117eeca83af3ee7b453a117eeca83af3ee7b453a6969321db06969321db050acaac1495d2ec9b909d9a1bba4c8
2014-04-23 14:16:42 -05:00
Nate Jensen
7c349e268e
Issue #3060 safety checks for SWT widgets being disposed
...
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2
Former-commit-id: fbecf66f79426f103e7bfbecf66f79426f103e7b38d493ff1b38d493ff1b2b68a49a4320f3f8ffa2ff9101c057
2014-04-23 12:26:27 -05:00
Nate Jensen
2b71b60b2e
Merge "Issue #3056 made venue participant equals method case insensitive" into development
...
Former-commit-id: cc1da5fb88fe3ff669a7cc1da5fb88fe3ff669a78df505325c8df505325c484b197a56be6818e96bad96f9d128
2014-04-22 12:50:27 -05:00
Brian Clements
d74f192819
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: bfd88f3e141adbf6253abfd88f3e141adbf6253a2a9d3419102a9d34191019c2695dca8677a9f35997c5fe6d4a
2014-04-22 11:55:36 -05:00
Brian Clements
fb74637aa8
Issue #3038 added initialized flag to session feed view
...
differentiates between roster population and new joins
Former-commit-id: cdf3aa90e9717cdf4280cdf3aa90e9717cdf4280ef61a7c281ef61a7c281e7005953eb295ff106b6fb24e315bf
2014-04-22 10:01:27 -05:00
Mike Duff
6c4490b08c
Issue #2955 - Made chat invitation dialogs non-modal
...
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023
Former-commit-id: 71cf0d04e7ead90bc79471cf0d04e7ead90bc794b507739637b50773963775f794d54d9a082a1588ae984e4c16
2014-04-21 09:00:42 -05:00
Brian Clements
9a8c3231c6
Issue #3021 increased width of create session dialog to fit error msg
...
Former-commit-id: ef791fe4811112ca621eef791fe4811112ca621ebb915796adbb915796ad549941882e5c46c768d2f674aa07d7
2014-04-16 14:33:02 -05:00
Brian Clements
8945b26e9b
Issue #2822 only allow transfer leader if participant is using shared display
...
Former-commit-id: db67c033825250f7a442db67c033825250f7a4426ccedc11826ccedc11826f9ef9a515e8907aa7299acb5a4a5b
2014-04-15 15:15:11 -05:00
Brian Clements
86081dda91
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: 6f7851d8c48ab1bab9746f7851d8c48ab1bab9746b223740466b22374046ca5909e2227cf5f06f2a054b47951d
2014-04-15 15:12:33 -05:00
Mike Duff
78a0ad33ef
Issue #2785 - Fix loading of groups in sub request dialog
...
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722
Former-commit-id: 3a6e718ff081e4c9b05d3a6e718ff081e4c9b05dd2a80ca966d2a80ca9660bf14203ff4773c3722cddeb7fe4d2
2014-04-15 10:10:18 -05:00
Brad Gonzales
91d546d015
Issue #2937 Connect to the venue after the feed view is available.
...
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936
Former-commit-id: 5fcec27765cc0fd1e9af5fcec27765cc0fd1e9afea03096031ea03096031e41f9defa43b25edad9a8f72707b3a
2014-04-10 14:01:53 -05:00
Mike Duff
2b520fe31e
Issue #2785 - Change connection order of events
...
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb
Former-commit-id: bdde561f8aefefe62e0fbdde561f8aefefe62e0f7da1547c227da1547c222b67272b607145820d623c6c0824ce
2014-04-08 14:14:20 -05:00
Nate Jensen
691c4411fc
Merge "Issue #2632 - Remove user from list on sign-off. Fixed check for available" into development
...
Former-commit-id: c0704488cc6b20d38b1ac0704488cc6b20d38b1a579d2416cb579d2416cbd5d42f2f6b19560ebc7c62f1451e50
2014-04-02 11:23:02 -05:00
Mike Duff
ce774c07a8
Issue #2632 - Remove user from list on sign-off. Fixed check for available
...
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe
Former-commit-id: 2a9b434883538261f6d52a9b434883538261f6d5d5df936431d5df9364317aa5cebfb092f1a3a9aa0aea45197a
2014-04-02 10:08:45 -05:00
Mike Duff
cc53c1ac23
Issue #2938 - Fix site/role change logic for messages
...
Change-Id: I5a08020f28b986c7815bb5ab2b71a34d9e105500
Former-commit-id: 66181ca3a58967ddd94a66181ca3a58967ddd94a169ad502de169ad502de3686e50328f117f575eb54d17b375f
2014-04-02 08:12:53 -05:00
Brad Gonzales
5506e9362a
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: d4659c48a6404faeeca0d4659c48a6404faeeca015e1b7a7f615e1b7a7f61c685a9eb62f56fd3c9d4940c40a7f
2014-03-31 11:45:22 -05:00
Lee Venable
d1928c95d9
Issue #2960 - added checks for SashForm weights
...
Former-commit-id: bdb18ea85b19dd95ba24bdb18ea85b19dd95ba243018ff1f5f3018ff1f5ff7e1ee666b1504b3532e5bbb65637e
2014-03-28 15:30:11 -05:00
Mike Duff
5e0e640336
Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
...
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b
Former-commit-id: d2eed9891ad803986440d2eed9891ad80398644098b5fd762e98b5fd762ef92754f752b1d74f855e531e66cbb6
2014-03-27 16:31:30 -05:00
Nate Jensen
a36bdb3b99
Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
...
Former-commit-id: c7dc0baeb938e3305e60c7dc0baeb938e3305e604861f92ef64861f92ef6307cdc15c17c581cb5d7015dc45eba
2014-03-25 13:11:29 -05:00
Mike Duff
7705874ea3
Issue #2938 - Show status message for site/role changes, but not return from away
...
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2
Former-commit-id: 758fdca5141e42d8a30d758fdca5141e42d8a30da06f058ea9a06f058ea981ac35a1b8d497c533e697c4e48255
2014-03-25 11:18:09 -05:00
Nate Jensen
8e3b78ba6a
Issue #2935 fix refresh issue
...
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994
Former-commit-id: d1f080fd0568f9181340d1f080fd0568f91813407b586ebd677b586ebd67447b1a36bb0cad1fa167a5b0c8b432
2014-03-25 10:24:11 -05:00
Mike Duff
9075ec61a0
Issue #2936 - Remove the join alert from the nws collaboration feed
...
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840
Former-commit-id: eacc161ee4fd31ea7fa5eacc161ee4fd31ea7fa5ca27ceac1fca27ceac1f86fc8d74d5fc7a71889ca1661a5389
2014-03-24 14:59:33 -05:00
Nate Jensen
1125203c93
Issue #2895 fixed telestration when leadership returns to a previous
...
leader
Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033
Former-commit-id: 68b60eba47e75d3dfb7c68b60eba47e75d3dfb7c2fc1030fad2fc1030fad8589374171ca1ec934505cb38bd511
2014-03-18 12:52:01 -05:00
Mike Duff
179082ebf9
Issue #2798 - Fix issue with color not changing for existing user changing site.
...
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57
Former-commit-id: ac65a87fe53d10260065ac65a87fe53d102600657bdef60a557bdef60a551a3e88c5da5bbe504f82b560f16623
2014-03-18 11:55:00 -05:00
Nate Jensen
718d69723b
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: 0e39a89ea382778ad21b0e39a89ea382778ad21bf8180587d4f8180587d432ccf7788534c5d1de252c0d7d2d3e
2014-03-12 16:05:19 -05:00
Mike Duff
6e1ef1196a
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: 64441317688068c9aa8364441317688068c9aa83e01c5c3534e01c5c35344fddc0c631832dd498fcfc1cc39479
2014-03-12 10:52:18 -05:00
Lee Venable
66a87595af
Issue #2865 - added more null and dispose checks
...
Former-commit-id: fe6e7328c0df65d7c7cefe6e7328c0df65d7c7ce1f9d1af2211f9d1af2218ef7fe57c446fa017e1b0931ce72c9
2014-03-11 16:30:33 -05:00
Lee Venable
374a2da1a1
Issue #2865 - fixed font memory leak
...
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d
Former-commit-id: 44733489b92c67c4f6c444733489b92c67c4f6c458d7f759b258d7f759b286e6547a63a5487de99897a124ca58
2014-03-11 10:31:50 -05:00
Brian Clements
c4e9aff9fc
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: 2456c2308fdc55cd5b5c2456c2308fdc55cd5b5caee98ecfb0aee98ecfb03486f1f2414f9a2577f26245b550aa
2014-03-10 14:06:45 -05:00
Brian Clements
975bfca460
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: 2afc1a931944d161729f2afc1a931944d161729fdc94769c14dc94769c14acb20cfbbeac63129ad16590587d9e
2014-03-07 15:37:29 -06:00
Nate Jensen
f84030e2b7
Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
...
Former-commit-id: ae9adefbf7cf4631f9bfae9adefbf7cf4631f9bf48fa8f8d1b48fa8f8d1bb097d488cad3f18729c38380226f6b
2014-03-05 14:41:12 -06:00
Mike Duff
8a798710c5
Issue #2798 - Fix user presence messages and settings
...
Peer review comments
Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa
Former-commit-id: 25425a4268e97e745b6125425a4268e97e745b619c873e6dd99c873e6dd90251ad5bcac0bf150e1515c32a1513
2014-03-05 14:39:55 -06:00
Mike Duff
c6e743bbc1
Issue #2632 - Fix problem with multiple notifiers per user.
...
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000
Former-commit-id: 14107f09148c693a5f7014107f09148c693a5f709963324b609963324b60198d9e67803bdf20dea385ac8c85e0
2014-03-05 12:02:33 -06:00
Brian Clements
6dc478d975
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: d76dd2a8f6c0e4615967d76dd2a8f6c0e4615967c9906cde88c9906cde883d4323b447d06182573edec443b1af
2014-03-05 09:00:57 -06:00
Max Schenkelberg
c6cf08db73
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: 59434c8a60a01a6d68d059434c8a60a01a6d68d0cbf8b9249ccbf8b9249c39e1c4fa46654da3c0a2f509321134
2014-03-04 09:23:36 -06:00
