Commit graph

29 commits

Author SHA1 Message Date
Nate Jensen
f2b32fa1ae Merge "Issue #2700 fixed subscribe request group input" into development
Former-commit-id: d8e2d2837e [formerly af0e70e20c2a5ca276e9b819285d34c0113cafe7]
Former-commit-id: 2643d01b74
2014-02-13 14:02:55 -06:00
Brian Clements
16ed18e0c6 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: 0ac7ff81cf [formerly e91ae6eacf4af9e25afc213c3cd0c269c8d465f4]
Former-commit-id: ef52908906
2014-02-13 13:51:39 -06:00
Brian Clements
2d72c0f475 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: caa8360ac7 [formerly 0c4a7915870f374cb4e728303939335cb0691c84]
Former-commit-id: 579f7c826d
2014-02-13 09:47:02 -06:00
Brian Clements
1e19c8d62c Issue #2799 fixed double click chat not working for roster entries
Former-commit-id: 9d7490a158 [formerly 06cfbcccff89fd79efd3188c45653dce160fc90a]
Former-commit-id: 1bf3a09056
2014-02-12 17:06:44 -06:00
Brian Clements
8f07ae2a42 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: ddf5b2a3ef [formerly ae5f2d2b547241e7ba9c22aabaf64fceceb1b563]
Former-commit-id: 0765451a9d
2014-02-12 09:13:48 -06:00
Brian Clements
639f774567 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: 6518b88fe5 [formerly 24343a796d0089824dde2f7039cdf93ed0ebf88c]
Former-commit-id: 7d6e116b9f
2014-02-07 10:06:06 -06:00
Brian Clements
bebd62c6b6 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: 6ea009a2e1 [formerly 74daa7109149073c615d13c25092f6d08a77b936]
Former-commit-id: cfa3c9e0e8
2014-02-03 15:34:58 -06:00
Brian Clements
21c75d1d01 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: 16c1aaed3e [formerly f10f42753c541d4003b4c67a84a1d50e033941d3]
Former-commit-id: 1ff4ed1ae9
2014-02-03 12:59:57 -06:00
Brian Clements
7176bf59b8 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: b0402be1d3 [formerly 4d860337ea821975b6ddb4846f102199347a4dcc]
Former-commit-id: b88eaeb73e
2014-01-31 13:10:35 -06:00
Brian Clements
4e2cb3f7ae 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: 3250eb34f5 [formerly 9a8b011683ffe7194c48b1827d3a4f0ddf4f9627]
Former-commit-id: 3e585945d6
2014-01-31 09:44:31 -06:00
Brian Clements
1f1be20d41 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: 5b9f694930 [formerly 850cbc03ebea6f26ac7095abffe7729985c426c4]
Former-commit-id: c498307b30
2014-01-29 10:16:15 -06:00
Brian Clements
b4d930bcb9 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: bd19366ada [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]
Former-commit-id: 6b1843f19a
2014-01-28 10:07:11 -06:00
Brian Clements
b86ad8ca6f 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: 26ac549096 [formerly 06a9db4836fa2753a913e2314a8c003380416eac]
Former-commit-id: f615f2226f
2014-01-27 10:14:10 -06:00
Nate Jensen
8420f87348 Merge "Issue #2630 added away timeout for collaboration inactivity" into development
Former-commit-id: eafe61cd37 [formerly 14d419fdd187e4e1e537590e626ec33d3f5b071f]
Former-commit-id: bdb4d8bdeb
2014-01-15 13:48:13 -06:00
Brian Clements
7e952c5ba8 Issue #2630 added away timeout for collaboration inactivity
eclipse job in connection subscriber
preferences added to collaboration prefs page


Former-commit-id: 57fb953b8d [formerly c6fded1429e44033bb989c1d9caaac87c72eb440]
Former-commit-id: 24190efb75
2014-01-15 13:20:25 -06:00
Brian Clements
45b5df24d4 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: bf6cf2f2ee [formerly 0176ba7963a5ff5bbd37b2e0867cbf97f4a3ef66]
Former-commit-id: 79446d983b
2014-01-15 10:24:09 -06:00
Brian Clements
af9292ea71 Issue #2563 added user server add/remove functionality
now persists user entered servers to localization


Former-commit-id: c8cfc788f3 [formerly 43fc94e9cc2a7f518971d509478f3b9a65588d19]
Former-commit-id: 487aa58778
2014-01-09 13:19:59 -06:00
Brian Clements
e08c5ea04c Issue #2563 fixed default xmpp port
The default port for postgres was there by mistake


Former-commit-id: dfcf6e9ade [formerly c6e76f765aa6cbb50b238bb3d01de7fe365d150d]
Former-commit-id: e263cdb63a
2014-01-07 10:52:50 -06:00
Brian Clements
4f2aa49807 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: b01e6f0c98 [formerly b995fe2036d4c0e26e25edd7f4bffd956d82921f]
Former-commit-id: cea12a1a1d
2014-01-06 14:14:38 -06:00
Brian Clements
0ce560149e 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: d07bc465d4 [formerly 5fe0f88b3465ba65efabe2a41d1df392c85e041f]
Former-commit-id: 73347283b6
2013-12-20 14:40:00 -06:00
Brian Clements
b120d74099 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: e4bd8a3e2c [formerly 23d898308fb3aa673d85fdf00495d43e4c02a08f]
Former-commit-id: 2b8668a4eb
2013-12-20 12:03:04 -06:00
Brian Clements
621a8536e6 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: af83c0cf87 [formerly b3173727f3f685119be3668779eb5da7e075df50]
Former-commit-id: 09c0267237
2013-12-20 10:41:13 -06:00
Brian Clements
2c20a87634 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: ce0a34b53c [formerly 3781483ef6dd1889aa0ecd6ccc83bfb2461713b5]
Former-commit-id: 80650337ce
2013-12-19 12:08:21 -06:00
Brian Clements
5d1d44b60d 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: e6c4b39aca [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]
Former-commit-id: 8ece30944a
2013-12-06 17:07:16 -06:00
Lee Venable
73caae724c Issue #2483 - Fixed image memory leak.
Former-commit-id: 3d6547d644 [formerly b590a1d5799a94068fe9e444e40bb3819d596071]
Former-commit-id: a2f75e547d
2013-10-23 08:26:49 -05:00
Matt Nash
311ac710ca Issue #1476 make fix for collaboration for issues with closing of views when detached
Change-Id: Id35df245089ae352b5023ad2d31d1519379f8293

Former-commit-id: 1d25736871 [formerly 42a3798a2fcee3c383814b92c9010f77eb7b242a]
Former-commit-id: fdc6db0a50
2013-03-04 09:41:11 -06:00
Steve Harris
efd3392abe 13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]
Former-commit-id: 8e5f9e0e6c
2013-01-06 14:55:11 -06:00
Steve Harris
51208e5515 13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
2013-01-06 14:32:24 -06:00
Steve Harris
98171b5de9 12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: d3497e47eb
2012-10-16 13:27:07 -05:00