Commit graph

94 commits

Author SHA1 Message Date
Brian Clements
fcb9de6bf4 Omaha #3539 reworked link to editor action to avoid recursion warning
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01

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

Former-commit-id: c3a25024ae [formerly bfd9f59de8] [formerly c3a25024ae [formerly bfd9f59de8] [formerly e4c9a13adb [formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]]
Former-commit-id: e4c9a13adb
Former-commit-id: 50d2c6e24c [formerly bd9520f4fe]
Former-commit-id: 276dd801f2
2014-07-03 15:11:48 -05:00
Brian Clements
be0185379b 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: 0125117d9c [formerly 88ba6b47ad] [formerly 0125117d9c [formerly 88ba6b47ad] [formerly fc70dbc86e [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]]
Former-commit-id: fc70dbc86e
Former-commit-id: b186894f32 [formerly 44f8b3dce1]
Former-commit-id: 0be4260b4c
2014-06-30 15:57:58 -05:00
Richard Peter
50fdb66cb4 Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: bcffac8875 [formerly 706409b459] [formerly bcffac8875 [formerly 706409b459] [formerly f4cdd661fe [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]]
Former-commit-id: f4cdd661fe
Former-commit-id: b94dc3b045 [formerly e3c3d55883]
Former-commit-id: 25dd598b55
2014-06-27 16:52:39 -05:00
Brian Clements
ac986ca600 Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2

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

Former-commit-id: eb806a6bb3 [formerly 741afe7d39] [formerly eb806a6bb3 [formerly 741afe7d39] [formerly 31a08efb61 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]]
Former-commit-id: 31a08efb61
Former-commit-id: 2350f7f630 [formerly ed2823daef]
Former-commit-id: c1bfab0914
2014-06-27 15:33:11 -05:00
Nate Jensen
b54b30e037 Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
Former-commit-id: 718d941c23 [formerly 61640d5c22] [formerly 718d941c23 [formerly 61640d5c22] [formerly 172f18a5b1 [formerly 449a40d7981b0814f9cc7feb62f52b2259e83e5f]]]
Former-commit-id: 172f18a5b1
Former-commit-id: 4e8d9343dd [formerly 48995ed5ca]
Former-commit-id: 217a0999d0
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: f053e9b084 [formerly 9d626a97e5] [formerly f053e9b084 [formerly 9d626a97e5] [formerly 93a1ee71c4 [formerly a31b7f213081f384bd23d53a431ce53593254c25]]]
Former-commit-id: 93a1ee71c4
Former-commit-id: 3eb4cd513c [formerly a9827ef8e8]
Former-commit-id: 7060fe3fba
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: 21fca2e662 [formerly 9aa5a87c4b] [formerly 21fca2e662 [formerly 9aa5a87c4b] [formerly fd95df3bc0 [formerly b84f7571415871f2983b913cf816ed227b24bbac]]]
Former-commit-id: fd95df3bc0
Former-commit-id: 74c62e0bf9 [formerly 795fa49ced]
Former-commit-id: 5560b12a5a
2014-06-20 08:53:54 -05:00
Brian Clements
cdcf7d8143 Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 86e89665bf [formerly 37699395ef] [formerly 86e89665bf [formerly 37699395ef] [formerly 97a6f5bfe8 [formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]]
Former-commit-id: 97a6f5bfe8
Former-commit-id: 51e2606277 [formerly 60508bf674]
Former-commit-id: 4433482d56
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: 8205f7cd56 [formerly b6a2bf0ae4] [formerly 8205f7cd56 [formerly b6a2bf0ae4] [formerly 84e3f967d9 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]]
Former-commit-id: 84e3f967d9
Former-commit-id: 4dc81aabfa [formerly 5436efb886]
Former-commit-id: 616315d830
2014-06-17 09:26:24 -05:00
Brian Clements
338f293065 Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: 42e6e38c2e [formerly adbffa5ddd] [formerly 42e6e38c2e [formerly adbffa5ddd] [formerly 91eb7d40c2 [formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]]
Former-commit-id: 91eb7d40c2
Former-commit-id: b1fac777f4 [formerly 3bdbf79eeb]
Former-commit-id: e13aeb0ca5
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: 522d3c70f2 [formerly 80922824a3] [formerly 522d3c70f2 [formerly 80922824a3] [formerly c920a24300 [formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]]
Former-commit-id: c920a24300
Former-commit-id: 0bdefaabdd [formerly b15b6514fd]
Former-commit-id: 5e0aa25048
2014-06-12 11:21:15 -05:00
Brian Clements
f0ce9a6ca8 Omaha #3172 fixed ui filtering for contacts and sessions
Former-commit-id: 455af3612f [formerly b774503931] [formerly 455af3612f [formerly b774503931] [formerly 8dce7e9b85 [formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]]
Former-commit-id: 8dce7e9b85
Former-commit-id: c4447fc6c4 [formerly 4078bbaa63]
Former-commit-id: 213aab834f
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: b5e961d6b4 [formerly 0e18d45bdf] [formerly b5e961d6b4 [formerly 0e18d45bdf] [formerly 573ffcb0bf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]]
Former-commit-id: 573ffcb0bf
Former-commit-id: 6769aff618 [formerly e4433c5e10]
Former-commit-id: 3c6a10e154
2014-05-19 15:54:36 -05:00
Brian Clements
89f3a0a1d2 Issue #3076 added clear all to shared display sessions
Former-commit-id: 729e717be1 [formerly f545c548cc] [formerly 729e717be1 [formerly f545c548cc] [formerly 1432aa1302 [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]
Former-commit-id: 1432aa1302
Former-commit-id: 8674841154 [formerly 5583c3903b]
Former-commit-id: 3a60b0db05
2014-05-06 09:30:07 -05:00
Nate Jensen
42a27546f9 Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: d759efcaa8 [formerly f4d20c41f4] [formerly d759efcaa8 [formerly f4d20c41f4] [formerly 7d142d9d9d [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: 6f211aa9f8 [formerly f3b68178bd]
Former-commit-id: 3f9a33bf35
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: 334ad3ca81 [formerly 02f08d75c6] [formerly 334ad3ca81 [formerly 02f08d75c6] [formerly 94aa761e19 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]
Former-commit-id: 94aa761e19
Former-commit-id: 84f75ca30a [formerly 12304655e8]
Former-commit-id: c27f2d9e53
2014-04-24 16:10:27 -05:00
Brian Clements
9e2497714b Issue #2955 ignore duplicate session invites
Former-commit-id: e81ee94171 [formerly f888819646] [formerly e81ee94171 [formerly f888819646] [formerly 4fa9afc9ae [formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 39c2a1ac37 [formerly 75465b69ed]
Former-commit-id: 3b96c4c628
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: eed8c6cbba [formerly df05a79d63] [formerly eed8c6cbba [formerly df05a79d63] [formerly f13ac7e1b9 [formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]]
Former-commit-id: f13ac7e1b9
Former-commit-id: 421a4e4677 [formerly 222154d094]
Former-commit-id: e81836e371
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: 827112349a [formerly ad6e4712d6] [formerly 827112349a [formerly ad6e4712d6] [formerly 2b20cf5440 [formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]]
Former-commit-id: 2b20cf5440
Former-commit-id: 418741ce55 [formerly a0423843b3]
Former-commit-id: 1abd65120e
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: 117eeca83a [formerly f3ee7b453a] [formerly 117eeca83a [formerly f3ee7b453a] [formerly 6969321db0 [formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]
Former-commit-id: 6969321db0
Former-commit-id: 50acaac149 [formerly 5d2ec9b909]
Former-commit-id: d9a1bba4c8
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: fbecf66f79 [formerly 426f103e7b] [formerly fbecf66f79 [formerly 426f103e7b] [formerly 38d493ff1b [formerly 0c391f8c7f1694c6939419b5fcc4a6a963092ae3]]]
Former-commit-id: 38d493ff1b
Former-commit-id: 2b68a49a43 [formerly 20f3f8ffa2]
Former-commit-id: ff9101c057
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: cc1da5fb88 [formerly fe3ff669a7] [formerly cc1da5fb88 [formerly fe3ff669a7] [formerly 8df505325c [formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]]
Former-commit-id: 8df505325c
Former-commit-id: 484b197a56 [formerly be6818e96b]
Former-commit-id: ad96f9d128
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: bfd88f3e14 [formerly 1adbf6253a] [formerly bfd88f3e14 [formerly 1adbf6253a] [formerly 2a9d341910 [formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]]
Former-commit-id: 2a9d341910
Former-commit-id: 19c2695dca [formerly 8677a9f359]
Former-commit-id: 97c5fe6d4a
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: cdf3aa90e9 [formerly 717cdf4280] [formerly cdf3aa90e9 [formerly 717cdf4280] [formerly ef61a7c281 [formerly 9b6c20ac39765120efc523c03a3d11d4b21c1748]]]
Former-commit-id: ef61a7c281
Former-commit-id: e7005953eb [formerly 295ff106b6]
Former-commit-id: fb24e315bf
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: 71cf0d04e7 [formerly ead90bc794] [formerly 71cf0d04e7 [formerly ead90bc794] [formerly b507739637 [formerly bb61e3c39d5dabf7e698726f0a093d8cf4f7088a]]]
Former-commit-id: b507739637
Former-commit-id: 75f794d54d [formerly 9a082a1588]
Former-commit-id: ae984e4c16
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: ef791fe481 [formerly 1112ca621e] [formerly ef791fe481 [formerly 1112ca621e] [formerly bb915796ad [formerly f0bcc20987d814a716994f712c6132bb79963457]]]
Former-commit-id: bb915796ad
Former-commit-id: 549941882e [formerly 5c46c768d2]
Former-commit-id: f674aa07d7
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: db67c03382 [formerly 5250f7a442] [formerly db67c03382 [formerly 5250f7a442] [formerly 6ccedc1182 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]]
Former-commit-id: 6ccedc1182
Former-commit-id: 6f9ef9a515 [formerly e8907aa729]
Former-commit-id: 9acb5a4a5b
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: 6f7851d8c4 [formerly 8ab1bab974] [formerly 6f7851d8c4 [formerly 8ab1bab974] [formerly 6b22374046 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]
Former-commit-id: 6b22374046
Former-commit-id: ca5909e222 [formerly 7cf5f06f2a]
Former-commit-id: 054b47951d
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: 3a6e718ff0 [formerly 81e4c9b05d] [formerly 3a6e718ff0 [formerly 81e4c9b05d] [formerly d2a80ca966 [formerly e72a852935dcb519604b37dc873645d4b419ee43]]]
Former-commit-id: d2a80ca966
Former-commit-id: 0bf14203ff [formerly 4773c3722c]
Former-commit-id: ddeb7fe4d2
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: 5fcec27765 [formerly cc0fd1e9af] [formerly 5fcec27765 [formerly cc0fd1e9af] [formerly ea03096031 [formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]]
Former-commit-id: ea03096031
Former-commit-id: e41f9defa4 [formerly 3b25edad9a]
Former-commit-id: 8f72707b3a
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: bdde561f8a [formerly efefe62e0f] [formerly bdde561f8a [formerly efefe62e0f] [formerly 7da1547c22 [formerly a2d595f4232e86606f7e2338ece59961649080a3]]]
Former-commit-id: 7da1547c22
Former-commit-id: 2b67272b60 [formerly 7145820d62]
Former-commit-id: 3c6c0824ce
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: c0704488cc [formerly 6b20d38b1a] [formerly c0704488cc [formerly 6b20d38b1a] [formerly 579d2416cb [formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]]]
Former-commit-id: 579d2416cb
Former-commit-id: d5d42f2f6b [formerly 19560ebc7c]
Former-commit-id: 62f1451e50
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: 2a9b434883 [formerly 538261f6d5] [formerly 2a9b434883 [formerly 538261f6d5] [formerly d5df936431 [formerly 2f9981c5173f0c2523b586ce10147f738028b907]]]
Former-commit-id: d5df936431
Former-commit-id: 7aa5cebfb0 [formerly 92f1a3a9aa]
Former-commit-id: 0aea45197a
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: 66181ca3a5 [formerly 8967ddd94a] [formerly 66181ca3a5 [formerly 8967ddd94a] [formerly 169ad502de [formerly 9ffc540c21245b308334040234be03d78a501656]]]
Former-commit-id: 169ad502de
Former-commit-id: 3686e50328 [formerly f117f575eb]
Former-commit-id: 54d17b375f
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: d4659c48a6 [formerly 404faeeca0] [formerly d4659c48a6 [formerly 404faeeca0] [formerly 15e1b7a7f6 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: 1c685a9eb6 [formerly 2f56fd3c9d]
Former-commit-id: 4940c40a7f
2014-03-31 11:45:22 -05:00
Lee Venable
d1928c95d9 Issue #2960 - added checks for SashForm weights
Former-commit-id: bdb18ea85b [formerly 19dd95ba24] [formerly bdb18ea85b [formerly 19dd95ba24] [formerly 3018ff1f5f [formerly 1a3c0743b773f695fa881f83a9773a899a2ef111]]]
Former-commit-id: 3018ff1f5f
Former-commit-id: f7e1ee666b [formerly 1504b3532e]
Former-commit-id: 5bbb65637e
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: d2eed9891a [formerly d803986440] [formerly d2eed9891a [formerly d803986440] [formerly 98b5fd762e [formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]]
Former-commit-id: 98b5fd762e
Former-commit-id: f92754f752 [formerly b1d74f855e]
Former-commit-id: 531e66cbb6
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: c7dc0baeb9 [formerly 38e3305e60] [formerly c7dc0baeb9 [formerly 38e3305e60] [formerly 4861f92ef6 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]
Former-commit-id: 4861f92ef6
Former-commit-id: 307cdc15c1 [formerly 7c581cb5d7]
Former-commit-id: 015dc45eba
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: 758fdca514 [formerly 1e42d8a30d] [formerly 758fdca514 [formerly 1e42d8a30d] [formerly a06f058ea9 [formerly 666a354d6f676b899bd14371517bce9de88192d2]]]
Former-commit-id: a06f058ea9
Former-commit-id: 81ac35a1b8 [formerly d497c533e6]
Former-commit-id: 97c4e48255
2014-03-25 11:18:09 -05:00
Nate Jensen
8e3b78ba6a Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: d1f080fd05 [formerly 68f9181340] [formerly d1f080fd05 [formerly 68f9181340] [formerly 7b586ebd67 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]
Former-commit-id: 7b586ebd67
Former-commit-id: 447b1a36bb [formerly 0cad1fa167]
Former-commit-id: a5b0c8b432
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: eacc161ee4 [formerly fd31ea7fa5] [formerly eacc161ee4 [formerly fd31ea7fa5] [formerly ca27ceac1f [formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]]]
Former-commit-id: ca27ceac1f
Former-commit-id: 86fc8d74d5 [formerly fc7a71889c]
Former-commit-id: a1661a5389
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: 68b60eba47 [formerly e75d3dfb7c] [formerly 68b60eba47 [formerly e75d3dfb7c] [formerly 2fc1030fad [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]]
Former-commit-id: 2fc1030fad
Former-commit-id: 8589374171 [formerly ca1ec93450]
Former-commit-id: 5cb38bd511
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: ac65a87fe5 [formerly 3d10260065] [formerly ac65a87fe5 [formerly 3d10260065] [formerly 7bdef60a55 [formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]]]
Former-commit-id: 7bdef60a55
Former-commit-id: 1a3e88c5da [formerly 5bbe504f82]
Former-commit-id: b560f16623
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: 0e39a89ea3 [formerly 82778ad21b] [formerly 0e39a89ea3 [formerly 82778ad21b] [formerly f8180587d4 [formerly b723095f6d5d59b67370c7292f88f339d349993a]]]
Former-commit-id: f8180587d4
Former-commit-id: 32ccf77885 [formerly 34c5d1de25]
Former-commit-id: 2c0d7d2d3e
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: 6444131768 [formerly 8068c9aa83] [formerly 6444131768 [formerly 8068c9aa83] [formerly e01c5c3534 [formerly 13f134bafc5331939e23ce0e14d350593bb7c2e1]]]
Former-commit-id: e01c5c3534
Former-commit-id: 4fddc0c631 [formerly 832dd498fc]
Former-commit-id: fc1cc39479
2014-03-12 10:52:18 -05:00
Lee Venable
66a87595af Issue #2865 - added more null and dispose checks
Former-commit-id: fe6e7328c0 [formerly df65d7c7ce] [formerly fe6e7328c0 [formerly df65d7c7ce] [formerly 1f9d1af221 [formerly c2aa1d021c49e522a3b4a9dd17a55317a13e91e1]]]
Former-commit-id: 1f9d1af221
Former-commit-id: 8ef7fe57c4 [formerly 46fa017e1b]
Former-commit-id: 0931ce72c9
2014-03-11 16:30:33 -05:00
Lee Venable
374a2da1a1 Issue #2865 - fixed font memory leak
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d

Former-commit-id: 44733489b9 [formerly 2c67c4f6c4] [formerly 44733489b9 [formerly 2c67c4f6c4] [formerly 58d7f759b2 [formerly 2555d382f26278c5f972c17da778338142cdaaec]]]
Former-commit-id: 58d7f759b2
Former-commit-id: 86e6547a63 [formerly a5487de998]
Former-commit-id: 97a124ca58
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: 2456c2308f [formerly dc55cd5b5c] [formerly 2456c2308f [formerly dc55cd5b5c] [formerly aee98ecfb0 [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]
Former-commit-id: aee98ecfb0
Former-commit-id: 3486f1f241 [formerly 4f9a2577f2]
Former-commit-id: 6245b550aa
2014-03-10 14:06:45 -05:00