Commit graph

32 commits

Author SHA1 Message Date
Brian Clements
c420979556 Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client


Former-commit-id: abc01f5475 [formerly 06c16118e1] [formerly dc074a9650] [formerly abc01f5475 [formerly 06c16118e1] [formerly dc074a9650] [formerly 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 30027665ac [formerly 77bb396c9a] [formerly 7c130f893c124249133b51cb750375f7ea62663d [formerly bee7cdb71a]]
Former-commit-id: 2bd4a38066d755ff2faaae6125ca4744d0e08564 [formerly ddc0945e40]
Former-commit-id: b47b194564
2014-02-19 08:32:26 -06:00
Brian Clements
393036071a Issue #2751 fixed blocked icon for roster entries
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels


Former-commit-id: ab8f47413f [formerly e894019715] [formerly a94b366e26] [formerly ab8f47413f [formerly e894019715] [formerly a94b366e26] [formerly 3307f5ea5e [formerly a94b366e26 [formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]]]
Former-commit-id: 3307f5ea5e
Former-commit-id: f5a25c9030 [formerly 02d3a9ae7e] [formerly 0a4ca2ccc03c0b3bc7d6e3a7885088347d34525e [formerly 476d0c3257]]
Former-commit-id: 6d18992103101e38f58bfbe34e30a1e17a53251b [formerly 6574733eba]
Former-commit-id: df4c4af7e9
2014-02-17 17:11:36 -06:00
Nate Jensen
4c3bdc0dfb Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]]
Former-commit-id: a85575a763
Former-commit-id: 740e71adba [formerly 139479b4e1] [formerly 759372ba16bb02e06f0e8472c362cf3299be0ff5 [formerly 11fb06810f]]
Former-commit-id: fe5669f9eeae8061972d1a92d1593cd4aea98162 [formerly 70285796ac]
Former-commit-id: 65068869e1
2014-02-13 15:35:53 -06:00
Nate Jensen
484e8d1625 Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: ec6d8585e1 [formerly f2b32fa1ae] [formerly 2643d01b74] [formerly ec6d8585e1 [formerly f2b32fa1ae] [formerly 2643d01b74] [formerly d8e2d2837e [formerly 2643d01b74 [formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]]]]
Former-commit-id: d8e2d2837e
Former-commit-id: 2772ad3c9c [formerly 1f3c4090a0] [formerly e7dc3b65fcb3fa03216ea4dfccc11e35d47a79ef [formerly b31470f7e3]]
Former-commit-id: f21f0c2edda75779b51cb9b768a1562125025411 [formerly 3fb847a74c]
Former-commit-id: 1aeeeffb0d
2014-02-13 14:02:55 -06:00
Brian Clements
85c67054ae Issue #2751 user identity refactor
VenueParticipant no longer a subtype of UserId
New interface for both
refactored base classes to be generic for user types


Former-commit-id: 01653c76de [formerly 16ed18e0c6] [formerly ef52908906] [formerly 01653c76de [formerly 16ed18e0c6] [formerly ef52908906] [formerly 0ac7ff81cf [formerly ef52908906 [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]]]]
Former-commit-id: 0ac7ff81cf
Former-commit-id: 21b1a6844a [formerly e6de3a118d] [formerly 01dac7e88270bd83aeb03bd3e6b701e82c5f1b0b [formerly 3ec3ad0543]]
Former-commit-id: f2dc7cf04af4442851840305e26a4b79ceb9be1d [formerly 1cc21dc160]
Former-commit-id: aa06f65038
2014-02-13 13:51:39 -06:00
Brian Clements
36881a8077 Issue #2700 fixed subscribe request group input
user was being added to roster twice, the second time overwrote the group info
changed dialog to pass group info back so we only add once


Former-commit-id: a0eb8342bf [formerly 2d72c0f475] [formerly 579f7c826d] [formerly a0eb8342bf [formerly 2d72c0f475] [formerly 579f7c826d] [formerly caa8360ac7 [formerly 579f7c826d [formerly 0c4a7915870f374cb4e728303939335cb0691c84]]]]
Former-commit-id: caa8360ac7
Former-commit-id: d4afb01ecc [formerly 46ea69990d] [formerly 68affea48bc5b76e4b2afb6e939f8ab5903347db [formerly bafe2972a4]]
Former-commit-id: d73388f45bd1a17bac824f589802ad0559ac404f [formerly 8b618ea95b]
Former-commit-id: a3157035bc
2014-02-13 09:47:02 -06:00
Brian Clements
098bb233b9 Issue #2799 fixed double click chat not working for roster entries
Former-commit-id: 2a687e7ac5 [formerly 1e19c8d62c] [formerly 1bf3a09056] [formerly 2a687e7ac5 [formerly 1e19c8d62c] [formerly 1bf3a09056] [formerly 9d7490a158 [formerly 1bf3a09056 [formerly 06cfbcccff89fd79efd3188c45653dce160fc90a]]]]
Former-commit-id: 9d7490a158
Former-commit-id: 0145571fe4 [formerly 667a1450cf] [formerly 4759fd1ad623c2d68120a23d29513e3f9b15ecd5 [formerly f22268295e]]
Former-commit-id: 3e3d4092ea498f9a8728a7a6f8ff214aa8d5fdf2 [formerly 5b95f2a058]
Former-commit-id: 2b421aadcb
2014-02-12 17:06:44 -06:00
Brian Clements
73452f84c6 Issue #2699 require non blank handle
previously defaulted to userid if handle left blank
now reprompts for handle
preferences now default to userid to pre-fill handle


Former-commit-id: 88db377b41 [formerly 8f07ae2a42] [formerly 0765451a9d] [formerly 88db377b41 [formerly 8f07ae2a42] [formerly 0765451a9d] [formerly ddf5b2a3ef [formerly 0765451a9d [formerly ae5f2d2b547241e7ba9c22aabaf64fceceb1b563]]]]
Former-commit-id: ddf5b2a3ef
Former-commit-id: 8b275e94b2 [formerly 9c67bcbbcf] [formerly f1871690aa5457b126ba46efaeed7a47b128ed69 [formerly fab4fea177]]
Former-commit-id: e5c43d72b21488421468d6cf473bc494a320eb33 [formerly 8e9f1136ae]
Former-commit-id: 2fc99f92ee
2014-02-12 09:13:48 -06:00
Brian Clements
1b7e747bad Issue #2699 removed over cautious handle validation
xmpp does not limit the characters that can go in a handle
fixed id from room parsing to account for special characters


Former-commit-id: 6c6467d235 [formerly 639f774567] [formerly 7d6e116b9f] [formerly 6c6467d235 [formerly 639f774567] [formerly 7d6e116b9f] [formerly 6518b88fe5 [formerly 7d6e116b9f [formerly 24343a796d0089824dde2f7039cdf93ed0ebf88c]]]]
Former-commit-id: 6518b88fe5
Former-commit-id: 0dd73fed5a [formerly 6efb4f51d2] [formerly 8705994ebee4fa744b73413cf439e077ecb61c30 [formerly 8742be3a13]]
Former-commit-id: fa2a42a7032255748771e650cfd51cf203641fca [formerly 014b59e1a1]
Former-commit-id: 27f19f406a
2014-02-07 10:06:06 -06:00
Brian Clements
04f027986f Issue #2699 fixed assumption that usersearch was exact
usersearch returns matches for any part of string
added method to restrict to exact matches only


Former-commit-id: ddbfe9a763 [formerly bebd62c6b6] [formerly cfa3c9e0e8] [formerly ddbfe9a763 [formerly bebd62c6b6] [formerly cfa3c9e0e8] [formerly 6ea009a2e1 [formerly cfa3c9e0e8 [formerly 74daa7109149073c615d13c25092f6d08a77b936]]]]
Former-commit-id: 6ea009a2e1
Former-commit-id: 876b60e15d [formerly bc75d43bc3] [formerly 32509d9365c50f4522e4f0eb5ec73059ee0d9acf [formerly aff354a3d7]]
Former-commit-id: 0e4922ca913a4b5bfebceb41096f25f36219a7f2 [formerly 9370df47fe]
Former-commit-id: cd1b7dec1b
2014-02-03 15:34:58 -06:00
Brian Clements
65afd1e4d2 Issue #2699 added handle config to prefs
default handle autofills session dialogs
is also used to connect to feed venue (error popup if already taken)


Former-commit-id: 83d6ca0855 [formerly 21c75d1d01] [formerly 1ff4ed1ae9] [formerly 83d6ca0855 [formerly 21c75d1d01] [formerly 1ff4ed1ae9] [formerly 16c1aaed3e [formerly 1ff4ed1ae9 [formerly f10f42753c541d4003b4c67a84a1d50e033941d3]]]]
Former-commit-id: 16c1aaed3e
Former-commit-id: c6287ecffc [formerly 2f60d1b579] [formerly a84830a2b6c074a8c5eb328da49682053240a4cd [formerly 7c867338c8]]
Former-commit-id: bc8262effd654ec4296479d2b0c4396a2891766e [formerly 671bfaa75c]
Former-commit-id: 592cf33f35
2014-02-03 12:59:57 -06:00
Brian Clements
fb03f7b570 Issue #2700 fixed subscribe back after contact request accept
we were sending the wrong presence type when accepting request
pidgin handled it, but it wasn't to the spec
fixed by adding contact to roster if not already a friend
request authorization dialog doesn't prompt for group if they are already in one


Former-commit-id: dc59e8fa2d [formerly 7176bf59b8] [formerly b88eaeb73e] [formerly dc59e8fa2d [formerly 7176bf59b8] [formerly b88eaeb73e] [formerly b0402be1d3 [formerly b88eaeb73e [formerly 4d860337ea821975b6ddb4846f102199347a4dcc]]]]
Former-commit-id: b0402be1d3
Former-commit-id: 7678703ae0 [formerly 9210aae10a] [formerly 49b91dbbac727f3af22f35a351ce544d8ce31b75 [formerly b651ada4b3]]
Former-commit-id: e467e72241d8923b566978180702bf8b00148966 [formerly 7e1425c419]
Former-commit-id: f2a97eb00e
2014-01-31 13:10:35 -06:00
Brian Clements
3c70c9ff9c Issue #2698 added handles to venues
venues now handle identity differently with VenueParticipant instead of UserId
fixed alias bug due to roster entry change


Former-commit-id: bd410b2529 [formerly 4e2cb3f7ae] [formerly 3e585945d6] [formerly bd410b2529 [formerly 4e2cb3f7ae] [formerly 3e585945d6] [formerly 3250eb34f5 [formerly 3e585945d6 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]]]]
Former-commit-id: 3250eb34f5
Former-commit-id: 35b53a61cd [formerly 4190b13ae2] [formerly 15ea8433323667869df6df396f6377d11f2a7079 [formerly 4f4d5c5d69]]
Former-commit-id: bfcea1a4566d36807b6744b7f53ddc0082dc12da [formerly e04cb11154]
Former-commit-id: cf8b85f3d2
2014-01-31 09:44:31 -06:00
Brian Clements
32e12b3094 Issue #2698 made sessions private and invite only
removed venue info because you can't get it for private rooms
improved error handling for existing room when attempting to create
fixed default compression config


Former-commit-id: 190400fc34 [formerly 1f1be20d41] [formerly c498307b30] [formerly 190400fc34 [formerly 1f1be20d41] [formerly c498307b30] [formerly 5b9f694930 [formerly c498307b30 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]]]]
Former-commit-id: 5b9f694930
Former-commit-id: a225d12692 [formerly 07452b7778] [formerly ceb8a89c7f4c8cc41774e50c75969cbdacc6d919 [formerly 4a0682a9e8]]
Former-commit-id: 3c20002e1f0607d8975953734b488dccf3a7b829 [formerly 76ec4d56c8]
Former-commit-id: 96e89d9f83
2014-01-29 10:16:15 -06:00
Brian Clements
644f0267a0 Issue #2700 added contact request dialog
user is now prompted to accept contact request
added support for managing contacts that haven't accepted contact requests
contacts list shows new icon for contacts that haven't accepted contact requests


Former-commit-id: aa642d5577 [formerly b4d930bcb9] [formerly 6b1843f19a] [formerly aa642d5577 [formerly b4d930bcb9] [formerly 6b1843f19a] [formerly bd19366ada [formerly 6b1843f19a [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]]]
Former-commit-id: bd19366ada
Former-commit-id: a2cc9001ae [formerly bffa4d84fe] [formerly aa6da3ca1e9307689f8365bc7178e584cb7032e6 [formerly f22052321b]]
Former-commit-id: dc9a3ca142d4d8e444939f5ee6edf0e87d0ec277 [formerly 737745ade7]
Former-commit-id: ad3939140c
2014-01-28 10:07:11 -06:00
Brian Clements
b200f4b644 Issue #2701 removed local groups from collaboration
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group


Former-commit-id: fffb6aaf9a [formerly b86ad8ca6f] [formerly f615f2226f] [formerly fffb6aaf9a [formerly b86ad8ca6f] [formerly f615f2226f] [formerly 26ac549096 [formerly f615f2226f [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]]]
Former-commit-id: 26ac549096
Former-commit-id: e2ca671173 [formerly cfe945d76b] [formerly beabd84fb816fcf8a5201927f1389915efb941f7 [formerly 8944860cbb]]
Former-commit-id: 72e40ed0e3344ea4433f6ff8a72c7dd93e6418a3 [formerly dd9b3ca640]
Former-commit-id: ff1882e80a
2014-01-27 10:14:10 -06:00
Nate Jensen
b1755cad5e Merge "Issue #2630 added away timeout for collaboration inactivity" into development
Former-commit-id: 181994548e [formerly 8420f87348] [formerly bdb4d8bdeb] [formerly 181994548e [formerly 8420f87348] [formerly bdb4d8bdeb] [formerly eafe61cd37 [formerly bdb4d8bdeb [formerly 14d419fdd187e4e1e537590e626ec33d3f5b071f]]]]
Former-commit-id: eafe61cd37
Former-commit-id: c1e42e49e9 [formerly 5504ec1efd] [formerly 0bddc08432f572efd0ebc61e9e5e47a4becfcea3 [formerly 46dfbe9334]]
Former-commit-id: bd8deed99bbc7f7ad5f177ea9e2a03f802d31a51 [formerly b7a74dcb74]
Former-commit-id: 51df7b69cc
2014-01-15 13:48:13 -06:00
Brian Clements
39cf9fcff3 Issue #2630 added away timeout for collaboration inactivity
eclipse job in connection subscriber
preferences added to collaboration prefs page


Former-commit-id: b9c1e59353 [formerly 7e952c5ba8] [formerly 24190efb75] [formerly b9c1e59353 [formerly 7e952c5ba8] [formerly 24190efb75] [formerly 57fb953b8d [formerly 24190efb75 [formerly c6fded1429e44033bb989c1d9caaac87c72eb440]]]]
Former-commit-id: 57fb953b8d
Former-commit-id: 998e8ca8c2 [formerly 7410c36783] [formerly e2a3bebef2dc240ed45242a0f8d5e55ec133f6ab [formerly 53273c4e5a]]
Former-commit-id: 1c92976208e36cc1694dd96fb8d2f217602d28b3 [formerly 07b9ab8b7b]
Former-commit-id: 72b75a821d
2014-01-15 13:20:25 -06:00
Brian Clements
63f28de573 Issue #2630 fixed status parsing bug
status from preference store wasn't being parsed correctly
changed connection data to store as Mode object instead of string
added parse method to collaboration utils


Former-commit-id: e3f615b2b7 [formerly 45b5df24d4] [formerly 79446d983b] [formerly e3f615b2b7 [formerly 45b5df24d4] [formerly 79446d983b] [formerly bf6cf2f2ee [formerly 79446d983b [formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]]]]
Former-commit-id: bf6cf2f2ee
Former-commit-id: 46c751d7da [formerly bfbcbf382a] [formerly 053ba48475681c6ca6bde16071dbe1d6807e277a [formerly 1219713128]]
Former-commit-id: 23d203ea5595cd51d4faa850f994b37529fdfc41 [formerly 7afcf37c11]
Former-commit-id: 67e65db850
2014-01-15 10:24:09 -06:00
Brian Clements
1b96c01c0c Issue #2563 added user server add/remove functionality
now persists user entered servers to localization


Former-commit-id: 7279fbf6b3 [formerly af9292ea71] [formerly 487aa58778] [formerly 7279fbf6b3 [formerly af9292ea71] [formerly 487aa58778] [formerly c8cfc788f3 [formerly 487aa58778 [formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]]]]
Former-commit-id: c8cfc788f3
Former-commit-id: 9a28a4e067 [formerly a8f746f794] [formerly a779f96749690d34c737ced63e146304783cc395 [formerly 0c5b0eaf69]]
Former-commit-id: 1c604ef7f5b72be730f7448d407a893d4435dfd3 [formerly 30521ee989]
Former-commit-id: 542e01f322
2014-01-09 13:19:59 -06:00
Brian Clements
5e09af067a Issue #2563 fixed default xmpp port
The default port for postgres was there by mistake


Former-commit-id: ea63496cc3 [formerly e08c5ea04c] [formerly e263cdb63a] [formerly ea63496cc3 [formerly e08c5ea04c] [formerly e263cdb63a] [formerly dfcf6e9ade [formerly e263cdb63a [formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]]]]
Former-commit-id: dfcf6e9ade
Former-commit-id: 0193a9db0f [formerly 373feec7f5] [formerly 44850ca1b4681434bdd6bef977c019dc3e5fc792 [formerly 27b4ec6df6]]
Former-commit-id: 1e7281dd25d0e4462914a8f28e264032b5f0222a [formerly 22f322d887]
Former-commit-id: 426bb7b944
2014-01-07 10:52:50 -06:00
Brian Clements
4d02d8e6e7 Issue #2563 modified server config parsing to allow for custom port
Replaced parsing code that assumed no colon in the server name, which prevented connecting to servers that didn't use the default XMPP port.


Former-commit-id: 9102b08053 [formerly 4f2aa49807] [formerly cea12a1a1d] [formerly 9102b08053 [formerly 4f2aa49807] [formerly cea12a1a1d] [formerly b01e6f0c98 [formerly cea12a1a1d [formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]]]]
Former-commit-id: b01e6f0c98
Former-commit-id: bed3b77948 [formerly 74c6fdc613] [formerly 4ae9dcc3fd65cda97138587d88156c3cc3a8281c [formerly d64d95d0c6]]
Former-commit-id: b1724173d1c849579e5b1f5b75eabd48144df579 [formerly 37be43af82]
Former-commit-id: dd6fd2532c
2014-01-06 14:14:38 -06:00
Brian Clements
869430c984 Issue #2563 fixed label issue for non-grouped roster entry
the old code assumed that the username was populated in the roster object
new code uses the userId which is always populated


Former-commit-id: 0124fbd68d [formerly 0ce560149e] [formerly 73347283b6] [formerly 0124fbd68d [formerly 0ce560149e] [formerly 73347283b6] [formerly d07bc465d4 [formerly 73347283b6 [formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]]]]
Former-commit-id: d07bc465d4
Former-commit-id: 95c30dbe0f [formerly 5dcaa98110] [formerly 59f71ff2ec1502a0ff12db79de7f3fc00a2159bd [formerly 0f4be44a23]]
Former-commit-id: 17d976b3c03dfc4f2e898f19d4930be8e9d50ba3 [formerly 70d4484473]
Former-commit-id: 73a3213cd1
2013-12-20 14:40:00 -06:00
Brian Clements
4f746b4f28 Issue #2563 roster updates for stock servers
added functionality that makes the contact list compatible with server rosters that could be modified with other clients
added support for roster entries that aren't in a local or server group


Former-commit-id: b41eadd0be [formerly b120d74099] [formerly 2b8668a4eb] [formerly b41eadd0be [formerly b120d74099] [formerly 2b8668a4eb] [formerly e4bd8a3e2c [formerly 2b8668a4eb [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]]]]
Former-commit-id: e4bd8a3e2c
Former-commit-id: f084679410 [formerly 0882672686] [formerly 35a2c84384d4302036ad4c4d8408a681edbf9e81 [formerly 4b4c7ba50c]]
Former-commit-id: 68b1173a4b1aa0aa641dc59b6cc4c8c527791d0b [formerly 98fd3e6a4c]
Former-commit-id: 41f6c010af
2013-12-20 12:03:04 -06:00
Brian Clements
30d12d2955 Issue #2563 compatibility features for stock xmpp servers
added more listener handling for venue events and server disconnection
added capability to connect to a different server from UI
added better error messages for failed connection/login to server
fixed assumptions that server always sends HTTP url and has feed chatroom


Former-commit-id: 24b3713680 [formerly 621a8536e6] [formerly 09c0267237] [formerly 24b3713680 [formerly 621a8536e6] [formerly 09c0267237] [formerly af83c0cf87 [formerly 09c0267237 [formerly b3173727f3f685119be3668779eb5da7e075df50]]]]
Former-commit-id: af83c0cf87
Former-commit-id: 5dcd524fa1 [formerly 917d8dffee] [formerly f24abb8dd24a72ce76ad2bc6b3b272f81b4d74ad [formerly 43021ae281]]
Former-commit-id: 50f340c4c8e121845c4210287609a1479f391ceb [formerly e5430b4510]
Former-commit-id: b9977a1357
2013-12-20 10:41:13 -06:00
Brian Clements
5ab073884a Issue #2562 moved session data from chat to packet extension
delegated compression to smack
added timeout for http config
fixed getting all joined venues
fixed room invitation from non-cave client
create session checks for session name already used


Former-commit-id: c2b759b38e [formerly 2c20a87634] [formerly 80650337ce] [formerly c2b759b38e [formerly 2c20a87634] [formerly 80650337ce] [formerly ce0a34b53c [formerly 80650337ce [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]]]]
Former-commit-id: ce0a34b53c
Former-commit-id: 64dda165db [formerly d58f8d7134] [formerly 698a51437531736c124a805026ea7ca5cd199699 [formerly 4015dc23ee]]
Former-commit-id: 29642bf8db563174d87d99cd43c522c3dc419a43 [formerly aa8d869635]
Former-commit-id: 5ede797e27
2013-12-19 12:08:21 -06:00
Brian Clements
1197d89ded Issue #2561 removed ECF from collaboration
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]]
Former-commit-id: e6c4b39aca
Former-commit-id: 4d04f6edbf [formerly 5a7fca6352] [formerly ea97705eee929964d9b775519d5de735e490a0d4 [formerly b8df043202]]
Former-commit-id: ebcbc592123de417dee62c72e2708e136768fd8e [formerly 0cf7b822ce]
Former-commit-id: d7ddaa295d
2013-12-06 17:07:16 -06:00
Lee Venable
2bf50b46b9 Issue #2483 - Fixed image memory leak.
Former-commit-id: 1a52e2b388 [formerly 73caae724c] [formerly a2f75e547d] [formerly 1a52e2b388 [formerly 73caae724c] [formerly a2f75e547d] [formerly 3d6547d644 [formerly a2f75e547d [formerly b590a1d5799a94068fe9e444e40bb3819d596071]]]]
Former-commit-id: 3d6547d644
Former-commit-id: 0d399cc52a [formerly 25c7bd679f] [formerly 3d39b70d995dcfb7c2529bb9b72c3ce4df1b010c [formerly 74603afd97]]
Former-commit-id: f5083a1cd8fdfc81b02738eb21c687f754459c86 [formerly 8f1956da81]
Former-commit-id: ce35925120
2013-10-23 08:26:49 -05:00
Matt Nash
a12055eff6 Issue #1476 make fix for collaboration for issues with closing of views when detached
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

Former-commit-id: 999413b2e7 [formerly 311ac710ca] [formerly fdc6db0a50] [formerly 999413b2e7 [formerly 311ac710ca] [formerly fdc6db0a50] [formerly 1d25736871 [formerly fdc6db0a50 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]]]]
Former-commit-id: 1d25736871
Former-commit-id: b0a0086da1 [formerly 739a4ac2db] [formerly 04b14b2dd0b28e80f7bd47e6d8aa7a5e1bb12a5f [formerly 274becd212]]
Former-commit-id: 2008f23e609dbfef312c46bbc800643d207b4fab [formerly f02246ab07]
Former-commit-id: bad1cef443
2013-03-04 09:41:11 -06:00
Steve Harris
3e63f280a2 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00