xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
286 commits 31 branches 40 tags 3.8 GiB
Commit graph

286 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Gonzales
45bd347c04 Issue #443 added more compression configuration to Tools.java. 
Former-commit-id: 961c6517a2 [formerly 2b77db0851] [formerly 135b560fb6] [formerly 217ee506e1 [formerly 135b560fb6 [formerly 6d430d5d4f14829ab2b1280c691aadbb966fb48c]]]
Former-commit-id: 217ee506e1
Former-commit-id: 92f689f92fccebb893f8eae33111c42d778991f9 [formerly 99d168d629]
Former-commit-id: 761238d582
 2012-04-12 12:08:37 -05:00
Matt Nash
1934d80646 Issue #429 add not yet implemented to a few buttons 
Former-commit-id: a87f6f7337 [formerly d2a0bb20f6] [formerly 31d2720a5c] [formerly 8083ddf51e [formerly 31d2720a5c [formerly 2e263d7fe77e1451af775f0c55eb82c5d092e45c]]]
Former-commit-id: 8083ddf51e
Former-commit-id: 3883efb66b72a7cc3840d5ffd7648a4bf2b6a3e1 [formerly dde8229516]
Former-commit-id: 29668ee637
 2012-04-12 10:50:07 -05:00
Max Schenkelberg
995f129817 Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration 
Former-commit-id: 73c1e75dba [formerly d53a9faa9a] [formerly 8b514dc862] [formerly c376abf87a [formerly 8b514dc862 [formerly df62b7a1fece621ad2c46112e0029da6fc3a230c]]]
Former-commit-id: c376abf87a
Former-commit-id: 3d00530d0c4aeb5b4a56428790dcd20703c5511f [formerly d3c4f6bf7b]
Former-commit-id: 9f2e23f26b
 2012-04-12 10:47:08 -05:00
Max Schenkelberg
36938dc222 Issue #239 got offscreen rendering working for clients 
Former-commit-id: da48c4f6ac [formerly b1687af0ac] [formerly 060330edeae7466dfddea42f793be62e75c7a224 [formerly 5ae0ed10d5]] [formerly 2de39bb487 [formerly 5ae0ed10d5 [formerly f41733465eb0ee048fb76a0d5467ce456d1cf7c9]]]
Former-commit-id: 2de39bb487
Former-commit-id: 0c28e5b5dcdc3b47b56f77d8ab45a6f1e98aba12 [formerly 1a340bb6e5]
Former-commit-id: 0f62e40dda
 2012-04-12 10:45:50 -05:00
Nate Jensen
86714a9fb8 Issue #444 filter right click menu and tooltips based on role 
Change-Id: Iab6942a6b58066df6e816e3425e717868aa36337

Former-commit-id: ed02fbb8d5 [formerly 4390eed955] [formerly 3d9bfcdb12] [formerly e7e5a34655 [formerly 3d9bfcdb12 [formerly f99b871ce5556840f8b90eead59f8a2659d6bc9a]]]
Former-commit-id: e7e5a34655
Former-commit-id: e9e4bbcce1fd98220a4d2e3cb5b3d04d4a1d6c7a [formerly 78d5b1dad6]
Former-commit-id: 8787f9e44c
 2012-04-12 10:23:39 -05:00
Matt Nash
a60d683af3 Issue #429 fix error as well as add checks 
Former-commit-id: f629464521 [formerly 9eb69d57f9] [formerly cf24a2cee9] [formerly a6c6695e5b [formerly cf24a2cee9 [formerly 317bf0f2ebdc76ee55f2db9eb81b80731f504847]]]
Former-commit-id: a6c6695e5b
Former-commit-id: 3f712e89b70262ce6bf878dd17a4275ce02c3b61 [formerly 0f604dd351]
Former-commit-id: 721621f785
 2012-04-12 09:45:37 -05:00
Brad Gonzales
edbb1e0979 Issue #443 added optional jaxb and thrift compression to collaboration, Tools.java. 
Former-commit-id: 225881d7f8 [formerly e039330b0d] [formerly 137b337f4b] [formerly 2a405eb253 [formerly 137b337f4b [formerly b07cd0c2157e72d679d76ec54987b2de41c10aae]]]
Former-commit-id: 2a405eb253
Former-commit-id: 83338eae8bf405661d2823894ce7c25c073f0908 [formerly e2f7f16a11]
Former-commit-id: ef047927f9
 2012-04-11 18:34:58 -05:00
Matt Nash
31e9ad5572 Issue #429 drawing additions, code cleanup, toolbar fixes 
Former-commit-id: ed088cca79 [formerly df7ddc0fa2] [formerly 8e83184569] [formerly b707408a0a [formerly 8e83184569 [formerly fa78aa2f7f4738770b37beb6b02fe5adbb074fae]]]
Former-commit-id: b707408a0a
Former-commit-id: ef6d30a7738eb6cb76773ec46f212263d3d1b13c [formerly c6d7a5a69b]
Former-commit-id: 8a04973191
 2012-04-11 16:45:28 -05:00
James Korman
75bbebd2fa Issue #437 - Add debug output to support roster development 
Former-commit-id: 3e7b1a14f3 [formerly 4a22bdb915] [formerly 826105c621] [formerly 14b193ad6f [formerly 826105c621 [formerly b502e55a4b95dc0483e5502154ba61f04e9132cc]]]
Former-commit-id: 14b193ad6f
Former-commit-id: 99e34ab0e7b92840a551a88b16fd8555d21a6228 [formerly 9f05fd9905]
Former-commit-id: ba45c3b8c8
 2012-04-11 16:23:04 -05:00
James Korman
d66cea837c Issue #437 - Added event notification for roster/roster status updates 
Former-commit-id: 60f690d126 [formerly b23bd53519] [formerly d664e77844] [formerly f25744ed0f [formerly d664e77844 [formerly 90f4901c8b7f86a8a0da3be7801d3a5b48b284a8]]]
Former-commit-id: f25744ed0f
Former-commit-id: dc44fb0a4c858381846c3d838d1753d761d66f98 [formerly 14c1af5d72]
Former-commit-id: 555679afc0
 2012-04-11 15:37:16 -05:00
Roger Ferrel
1da4339131 Issue #437 Bug fixes to user status 
Change-Id: Idd46418cc6f40a1f8a4f247942f5b730b851444f

Former-commit-id: 2e61538905 [formerly 3421463f53] [formerly 74c98303d5] [formerly d45396d9f0 [formerly 74c98303d5 [formerly 140fa8efdba2cd5c6cf8b2a1c9696e08d1dc931a]]]
Former-commit-id: d45396d9f0
Former-commit-id: 1cec54e406153589e76b7d319454697721cb75e5 [formerly eec9b69d47]
Former-commit-id: b63954e4de
 2012-04-11 12:26:46 -05:00
Max Schenkelberg
2d6e1728e9 Issue #239 Got maps resources syncing across users 
Former-commit-id: a94f6388f3 [formerly 60879f83bd] [formerly 8865c35e69] [formerly ea6b58c226 [formerly 8865c35e69 [formerly d3864aaf812ed78137a7c4124515a1f4300cd2b1]]]
Former-commit-id: ea6b58c226
Former-commit-id: 4695edc590a19b6ea96ba978a4a38e0f613e64c5 [formerly e90693f7d9]
Former-commit-id: 7d84449d7c
 2012-04-11 09:46:53 -05:00
Nate Jensen
5fed054bee Issue #444 some cleanup 
Change-Id: Ic790969f95e59fbf16a18d05bcc11cfe09a94916

Former-commit-id: 3b0f399ac7 [formerly da1163d487] [formerly 4405320bc8] [formerly f32611df47 [formerly 4405320bc8 [formerly 7731d22c58ee05a1c663a1d0da8f047ce49aa09c]]]
Former-commit-id: f32611df47
Former-commit-id: 87fe8cf1b441c0e889ae9fdc70325fbb10687574 [formerly 0286ff10ad]
Former-commit-id: e4ea4333eb
 2012-04-11 09:33:56 -05:00
Nate Jensen
1159e2db0e Issue #444 fix peer to peer send, remove redundancy of ID classes, send session leader and data provider with invite 
Change-Id: If381a0dab94e39da4e78e59e33e637f10a4057d7

Former-commit-id: 93bfd726cf [formerly ff36181458] [formerly 0f20bba406] [formerly 9b4b691ca9 [formerly 0f20bba406 [formerly 4aa478bd573ad7d9a801658c37a1d229d7bf5862]]]
Former-commit-id: 9b4b691ca9
Former-commit-id: d7d801ad3d55a7ba9400082d7d305bd51397d18e [formerly ae769c490b]
Former-commit-id: 929365719e
 2012-04-10 18:15:36 -05:00
Bryan Kowal
bcd015b390 Merge "Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features." into 11-Collaboration 
Former-commit-id: 354b3907fb [formerly 5d1892242a] [formerly 82783e27fd] [formerly 3baf9d03c2 [formerly 82783e27fd [formerly b1420977f92e3b5b206f33ce2e1275aee53cc2ae]]]
Former-commit-id: 3baf9d03c2
Former-commit-id: d378932ad42a50abccb7f393f0d20a538b2651f3 [formerly 61d0a876dd]
Former-commit-id: 929a056e1b
 2012-04-10 17:40:58 -05:00
Brad Gonzales
a4a8ae8e18 Issue #440 keep login window up when a username or password is incorrect. 
Former-commit-id: 3a9a646cf7 [formerly 7229f9b92a] [formerly ac35f8f2fb] [formerly 107c8ba7b9 [formerly ac35f8f2fb [formerly dc4bf6dfbb2f0c58f9986b524ad49f18656cebc7]]]
Former-commit-id: 107c8ba7b9
Former-commit-id: 06526a885a69fd5ed7b056fb56c936e7962d2a84 [formerly 1b7e35f876]
Former-commit-id: 7d7e792ed8
 2012-04-10 17:20:38 -05:00
Roger Ferrel
57e9f8fc75 Issue #437 Added change status menu option. 
Change-Id: Ie4b1d453aa3e75b77e360c26dcc838c13b7b6223

Former-commit-id: d6cd8ffdc1 [formerly ced485f863] [formerly 69ea7c724e] [formerly 020be00301 [formerly 69ea7c724e [formerly 82ae4e9433e71e9027566aed4595046ce0ef6dfa]]]
Former-commit-id: 020be00301
Former-commit-id: d420514e04ad2359f559a25fb096aa020b45f47a [formerly 8fa193bcbe]
Former-commit-id: 40b73d902c
 2012-04-10 16:50:26 -05:00
Bryan Kowal
8b08c8308e Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features. 
Former-commit-id: db3f60b23a [formerly b1a5abc6b3] [formerly 6ddeef48fa] [formerly ce99417a2a [formerly 6ddeef48fa [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]]
Former-commit-id: ce99417a2a
Former-commit-id: 2de12493f2b8810fd8a4d81ec071b4416735a9af [formerly 10a291afa1]
Former-commit-id: 541fe8fbbb
 2012-04-10 16:42:36 -05:00
James Korman
b573c1162c Issue #437 - Updates to status handling - Added SessionManager user presence. 
Former-commit-id: 64313163fb [formerly 44eae46180] [formerly 7bf01ecbc9] [formerly 07bc1bf83e [formerly 7bf01ecbc9 [formerly 77520e5b98de679a1f08b523fb85464a31bd4c02]]]
Former-commit-id: 07bc1bf83e
Former-commit-id: 0784456ab907baca539b6cb36890c1b39ca8354b [formerly 7272ede3c4]
Former-commit-id: 8afc2bc1a8
 2012-04-10 15:55:12 -05:00
Max Schenkelberg
2c47c3a99d Issue #239 Got zoom/pan events working for remote users 
Former-commit-id: 7416bd9839 [formerly 65f6c07530] [formerly 6e0c5c3cdf] [formerly 18e9f2c6ad [formerly 6e0c5c3cdf [formerly a817a720868fe887deca6ce6589014f0cd439c2d]]]
Former-commit-id: 18e9f2c6ad
Former-commit-id: 651085c3a24f9ed2b19ae0a5cf80b31fa2d7e0be [formerly 0d21a9a35e]
Former-commit-id: 9853d46099
 2012-04-10 14:40:51 -05:00
Matt Nash
e3b73bea8c Issue #429 comment out ability to start in debug mode for the connection 
Former-commit-id: 286b51b936 [formerly 62564ebb0c] [formerly 202fe2bb5e] [formerly f05b486e33 [formerly 202fe2bb5e [formerly 8293c897e3b11c026b2f07eb45e72f48897f8d9f]]]
Former-commit-id: f05b486e33
Former-commit-id: f32eb9eed5a4c3676fc28b4bce1e17de2b7ef30d [formerly 52e27b63f7]
Former-commit-id: 96f45cdb58
 2012-04-10 13:22:42 -05:00
Roger Ferrel
1b246c91c0 Issue #437 User status now properly displayed and updated in sessions. 
Change-Id: I7b0e077cb87f97388fddff27b846ce856cb6a999

Former-commit-id: 9e4ea5bef6 [formerly 7ebea1d964] [formerly d2e2fd8da3] [formerly 3fd25ff1cf [formerly d2e2fd8da3 [formerly 8ee6d7cf1a8b7e0bd2fa0abfe016cb221c60f2b3]]]
Former-commit-id: 3fd25ff1cf
Former-commit-id: a7ca24388156c67420d24fca9338db23ba6ad944 [formerly 57e809d913]
Former-commit-id: 16857ccb3a
 2012-04-10 11:11:26 -05:00
Nate Jensen
8a67c1211c Issue #427 cleanup 
Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024

Former-commit-id: 914012521e [formerly 68a3867d06] [formerly 2e5272cff9] [formerly ec92c842c4 [formerly 2e5272cff9 [formerly 93a7d3b6f52331034efe1e02fdd073959eee56ee]]]
Former-commit-id: ec92c842c4
Former-commit-id: f71fb863c9e4b9653e1c9491189ec17650d52a26 [formerly a924bd6489]
Former-commit-id: a16929c9bc
 2012-04-10 10:35:03 -05:00
Brad Gonzales
e1329c566e Issue #440 Changed login icon to green. 
Former-commit-id: 694c8d99ff [formerly 0eefb140ac] [formerly a378fea5d1] [formerly ca2a35d77c [formerly a378fea5d1 [formerly 69549e0e64ff8d14892db9e908692c47aeb3043c]]]
Former-commit-id: ca2a35d77c
Former-commit-id: 52517a936fc772f6cc69d253e33a050e945853cc [formerly 8d170cd14b]
Former-commit-id: d7421465f7
 2012-04-10 10:01:11 -05:00
Roger Ferrel
a043e15035 Issue #437 Presence status sent out when logged on to the server. 
Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164

Former-commit-id: 05d20a70ea [formerly 57abf56e09] [formerly b4c8d3a0d9] [formerly 521127b589 [formerly b4c8d3a0d9 [formerly 9391b95b6a26b34675370b3f7347fab4f08444e5]]]
Former-commit-id: 521127b589
Former-commit-id: ffe3bb947109a3d0dd60988e238123c19981b959 [formerly 946f7963c4]
Former-commit-id: 35c753c07f
 2012-04-09 16:00:25 -05:00
Matt Nash
bf85a9c5b8 Issue #429 changing 'private' aspect 
Former-commit-id: e94db84585 [formerly eba8ac8dd9] [formerly 9887678590] [formerly 98350f4ba5 [formerly 9887678590 [formerly 4c475ace9b0803b40bc90eca71a800a1ca2da4b5]]]
Former-commit-id: 98350f4ba5
Former-commit-id: 841444a4f8bb6733bfb89cf8569094f97587343f [formerly d6731254d6]
Former-commit-id: 1c93a3d702
 2012-04-09 15:21:07 -05:00
Roger Ferrel
e29b208070 Issue #437 Change to up date Presence in the Group View. 
Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8

Former-commit-id: 61f3e1fb0e [formerly 225a8762d1] [formerly c5399687bc] [formerly 2109190752 [formerly c5399687bc [formerly b64a623cda4ec00d555d8542da496286e0210dac]]]
Former-commit-id: 2109190752
Former-commit-id: 22d05609434586e7662300f737604417f4a3acb6 [formerly 1e4ed16880]
Former-commit-id: 7be7bceeaa
 2012-04-09 15:16:19 -05:00
Matt Nash
638bc4ea08 Issue #429 add resource data to ISerializableObject file to fix error 
Former-commit-id: 47a24a20c2 [formerly 2a7698e284] [formerly 42ce0e72f0] [formerly b340718346 [formerly 42ce0e72f0 [formerly b8fc69fc6746566e83b19ed4dfa8611858332aac]]]
Former-commit-id: b340718346
Former-commit-id: 8ffec5acab3087d00d96c6843996f230186044ba [formerly 22aec07dfd]
Former-commit-id: 80da3ac38f
 2012-04-09 12:42:44 -05:00
James Korman
4d47a5bd03 Issue #437 - Updated Presence - Add properties and new constructor 
Former-commit-id: 3e0929bc19 [formerly 9aa0176bb7] [formerly 48397d1d95] [formerly 53dc047d3d [formerly 48397d1d95 [formerly 5f94c705fa50346aca0befcc8eca7b609e685719]]]
Former-commit-id: 53dc047d3d
Former-commit-id: 0f523247a9d4006ee425b68577045c883a21f008 [formerly 0d6a5312d1]
Former-commit-id: 9a7c440f2d
 2012-04-09 11:42:19 -05:00
Brad Gonzales
faaaedf5a7 Issue #440 added login icon. Changed Logon to Login. 
Former-commit-id: 5a1970c902 [formerly 008b670b6a] [formerly 44a83e92ed] [formerly 7937986b11 [formerly 44a83e92ed [formerly d2b9c7981006dad91c5781fe0df96113530491df]]]
Former-commit-id: 7937986b11
Former-commit-id: d66ee38a743e9cdf115c208d9f81a7a986381f5e [formerly 552ce918ef]
Former-commit-id: 8084909235
 2012-04-09 11:38:08 -05:00
James Korman
799c36fc42 Issue #437 - Add code to update and post roster presence changes. 
Former-commit-id: f631252562 [formerly 31a93f32ab] [formerly bb31e9e2ea] [formerly df0cdcb563 [formerly bb31e9e2ea [formerly 8c5406eb39e9bd8590817e5eda854e20866ebbae]]]
Former-commit-id: df0cdcb563
Former-commit-id: df208c8a5f493e9b29484d90e37b78e16afb2504 [formerly f535049780]
Former-commit-id: 5062cfd2a3
 2012-04-09 10:01:55 -05:00
Max Schenkelberg
c19de5dcc3 Issue #239 Fixed D2D context activation so as not to override important 
keys when a unrelated view is active such as Product Browser or
Collaboration views.

Former-commit-id: 65e7184cc4 [formerly a5fa19c914] [formerly cbe92bdf32] [formerly 6812c1ba2b [formerly cbe92bdf32 [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]]
Former-commit-id: 6812c1ba2b
Former-commit-id: a24149c0db6c44d2a20bc8fb7a45708e704473a7 [formerly 824b24dfcb]
Former-commit-id: 532f2d691b
 2012-04-06 10:23:24 -05:00
Matt Nash
8e9e8b1c18 Issue #429 remove unused com.raytheon.viz.drawing plugin 
Former-commit-id: 30c3a6b53c [formerly 922fffeeed] [formerly af0513690d] [formerly 5bd8e5e47c [formerly af0513690d [formerly b02beff8d7beb6f33e5bcdcfb72a423d7f18584e]]]
Former-commit-id: 5bd8e5e47c
Former-commit-id: 4e43e26431e7cd66057f3709784fff899ebcb823 [formerly 437aa74095]
Former-commit-id: 803d45adfe
 2012-04-06 07:16:15 -05:00
Nate Jensen
788e4610bb Issue #444 initial role transfer code and some cleanup 
Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f

Former-commit-id: e1fb02a18e [formerly 28684fd160] [formerly c844026ff0cf81c160ed04f062d39ae45428738c [formerly c1543afc44]] [formerly 0ef84129c4 [formerly c1543afc44 [formerly c7276b7fddee718fd47f1f1b3fb75d5b483e62fc]]]
Former-commit-id: 0ef84129c4
Former-commit-id: 6358fcd88066c928d88642b03cca77b80dc49efc [formerly ac109d3e72]
Former-commit-id: c5130d8361
 2012-04-05 17:49:12 -05:00
Max Schenkelberg
4fbb7ea290 Issue #239 Added remote capability injection code through factory 
method. Cleaned up old/unmaintained 3D references

Former-commit-id: e525c9c35d [formerly 48ca9ca105] [formerly 54aaf05209] [formerly 16056d53c5 [formerly 54aaf05209 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]]
Former-commit-id: 16056d53c5
Former-commit-id: 265f2d1efade092dd1793dfa515ef1708447df02 [formerly b4b754c7cc]
Former-commit-id: 20ad9fe872
 2012-04-05 13:52:20 -05:00
Matt Nash
0d348a7133 Issue #429 alert of new messages when in background 
Former-commit-id: 7e6c9ae5b2 [formerly 5d0ae7ff9f] [formerly d62a660e52] [formerly f314b2475d [formerly d62a660e52 [formerly 8e8fbe73b41f6457c085ab11939fdbd1242d4383]]]
Former-commit-id: f314b2475d
Former-commit-id: 2d3eb9b2cc8eee90ec0b299c23462e14c6474380 [formerly 7edacef530]
Former-commit-id: 95f85cde78
 2012-04-05 12:38:35 -05:00
Matt Nash
c090e70e60 Issue #429 clear,undo,redo 
Former-commit-id: ca62e2ef7f [formerly 52c0508781] [formerly c53719be8a] [formerly 328d7e1287 [formerly c53719be8a [formerly 69fcd977767dec591f2132cc6b13f9e48a3180b0]]]
Former-commit-id: 328d7e1287
Former-commit-id: c69a919b5228950032736860af83f5f74049f499 [formerly 7dd1657774]
Former-commit-id: 27c3cf3f38
 2012-04-05 11:49:57 -05:00
Matt Nash
aa10e7b505 Issue #429 telestrator allows all users to draw 
Former-commit-id: 31f63e0cd0 [formerly 916b8428e4] [formerly f200e37a36] [formerly 09c022bda8 [formerly f200e37a36 [formerly ed59b0803da528f391db3c71aac1184581cc353d]]]
Former-commit-id: 09c022bda8
Former-commit-id: 229755d5b98679de40f3d5d0f5e10d09a00c8399 [formerly fd1b123912]
Former-commit-id: f985ddaa7e
 2012-04-05 10:27:10 -05:00
Roger Ferrel
8b5cc65466 Issue #439 added filter to prevent illegal characters in the session name. Also made changes to throw exceptions when creation fails. 
Change-Id: Ieb5fcbb433f8165d8cd711224dc095fe96e5162c

Former-commit-id: 85b6b8a196 [formerly d197ea6fd2] [formerly afc79a14f3] [formerly 72bf5460d7 [formerly afc79a14f3 [formerly 898e1a503af21abef70afc734924332e7de249ee]]]
Former-commit-id: 72bf5460d7
Former-commit-id: c32cf26a4426276e64d2389dd034f2f15ecb5f69 [formerly f9aa115a2b]
Former-commit-id: 98c83d5322
 2012-04-05 08:09:15 -05:00
Nate Jensen
aa0ab9a3ef Issue #427 fixed subject 
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70

Former-commit-id: 956c125095 [formerly d68efe319e] [formerly 8c140e089568e9a209541cdeb7ed2d7a770256cc [formerly b084156a30]] [formerly 4999e547a1 [formerly b084156a30 [formerly 8908b81e0e47cfe112ad132a82f2b2cb1a0dd55e]]]
Former-commit-id: 4999e547a1
Former-commit-id: 7eb6f6e7efab34a92a0b53d6fb26d16c6ce23123 [formerly 477d1bb013]
Former-commit-id: a20e542438
 2012-04-04 17:06:00 -05:00
Bradley Gonzales
7945fe90e6 Issue #440 more descriptive login failure message 
Former-commit-id: 9d44aabf06 [formerly 391f8e4d58] [formerly 6fc14461ee] [formerly 74ce6f2140 [formerly 6fc14461ee [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]]]
Former-commit-id: 74ce6f2140
Former-commit-id: 098005964c92d44ded39c3c5e5194fbf5527436a [formerly c345b2614e]
Former-commit-id: 2d7e2b456e
 2012-04-04 16:26:58 -05:00
Nate Jensen
63e389da6e Issue #427 instantiate collaboration resource 
Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20

Former-commit-id: bea3b8fb0c [formerly 9c4b29c3aa] [formerly 260c7c10eb] [formerly f06338bcd4 [formerly 260c7c10eb [formerly 5cd5a85bf836ade2da3b43b2797c2a65d61be461]]]
Former-commit-id: f06338bcd4
Former-commit-id: 805a0a7445263fe4b32c76b708b396734638f2b0 [formerly 0f5b0f7e9e]
Former-commit-id: a2d7bdb709
 2012-04-04 14:05:12 -05:00
James Korman
ae78c1b570 Issue #437 - Corrected venue command message loopback 
Former-commit-id: 47c16c8eda [formerly fad1fa7362] [formerly 23a2cd033a] [formerly e663a9e5dc [formerly 23a2cd033a [formerly c3ba8bd9416f18358f2a976ee2104e4e614321c3]]]
Former-commit-id: e663a9e5dc
Former-commit-id: e217bf264f1ab514e6d3916f5243a815bc38ff93 [formerly 44b07395fb]
Former-commit-id: 9c924ccb25
 2012-04-04 13:41:25 -05:00
Matt Nash
c010118826 Issue #429 working telestration collaboration capabilities 
Former-commit-id: cb909ce21f [formerly 86e2f1a7ad] [formerly 3c2fcc59d0] [formerly c27a3cf672 [formerly 3c2fcc59d0 [formerly f1c9552a757e7d194e31ed9786cb358c53e631b7]]]
Former-commit-id: c27a3cf672
Former-commit-id: 3c3dd55c6aa4fca138d9d2c15294dd9bfbddabdc [formerly 28df06150e]
Former-commit-id: a7544fadf9
 2012-04-04 11:23:34 -05:00
Roger Ferrel
c3b0f8dc27 Issue #244 Fix bug in handleInvitationEvent 
Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9

Former-commit-id: c2b5a62e38 [formerly 7aa926028e] [formerly a39475e04d] [formerly 46ddf008b8 [formerly a39475e04d [formerly 12e29dfb9e3a77e44b7b946f138c84e082e0990a]]]
Former-commit-id: 46ddf008b8
Former-commit-id: 17eff5c7bcf326f80da2ab7de13763602e79ffb9 [formerly 5145bb9e7e]
Former-commit-id: d1ce0844e3
 2012-04-03 17:28:27 -05:00
James Korman
7a848dae25 Issue #437 - Adding roster api message handling. 
Former-commit-id: ffa4d5377f [formerly dcdb98319d] [formerly 4c7f2465fc] [formerly afeea4d9d2 [formerly 4c7f2465fc [formerly 8c7b4a55e6fa10e3e120e12334ba2d04d2d40a32]]]
Former-commit-id: afeea4d9d2
Former-commit-id: 77b08819fd1463e43c942fb3612d79bd289af01e [formerly f496523681]
Former-commit-id: 2307245201
 2012-04-03 16:57:27 -05:00
Roger Ferrel
6ca13f94ef Issue #244 Change user status now send Presence update to the server. 
Change-Id: Id0a455633693db251d03a85343f526905a9c4364

Former-commit-id: 7cc492b43c [formerly 3d9fcb3273] [formerly 78502719e9] [formerly 46addc13cf [formerly 78502719e9 [formerly fd8a0cad3ded983308f1f0d983a9f9a42ade7f2b]]]
Former-commit-id: 46addc13cf
Former-commit-id: 806bc0fd135adc0a6dd1389dacfb8fdca37c8725 [formerly 7cf6e6166d]
Former-commit-id: 06b9147bd2
 2012-04-03 16:20:07 -05:00
Roger Ferrel
5c5f8799fb Merge branch 'new_devel' into 11-Collaboration 
Former-commit-id: ea093e60c2 [formerly 6ae33324f3] [formerly b8df9f46e4] [formerly 395ae5ae63 [formerly b8df9f46e4 [formerly a441dcd259dbf3ecd77464d1bd0cbe1f4cdb1cb6]]]
Former-commit-id: 395ae5ae63
Former-commit-id: f40e950bca5418b047772f8ab1a47e5d6a510551 [formerly 5b943096c5]
Former-commit-id: 4b49ba50a7
 2012-04-03 15:29:53 -05:00
Max Schenkelberg
275030f23b Issue #239 Start of remote target capabilities 
Former-commit-id: 6e94ff6098 [formerly ac1fc79f5b] [formerly 6c411ffb07] [formerly d2d03e2c64 [formerly 6c411ffb07 [formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]]]
Former-commit-id: d2d03e2c64
Former-commit-id: 320620d9bdec1aae5cb62ad9138b5b802bf7ddf7 [formerly 5d7e504e89]
Former-commit-id: 3b9699d896
 2012-04-03 15:11:20 -05:00
Roger Ferrel
ca1e1abaee Issue #244 Peer to Peer chat implemented. Change Passwor implemtned. 
Change-Id: I4949d5ff82a1046d344cd63e32842b2d67717681

Former-commit-id: ce37b8ff40 [formerly 1db237e408] [formerly 7d7ee81855] [formerly 9dd257f28a [formerly 7d7ee81855 [formerly dde6ebb7a4ce4cdee62b1d4e31d33694c331309e]]]
Former-commit-id: 9dd257f28a
Former-commit-id: 92524bcc01705c62843e81ef79fc9be0b92157cd [formerly 813e91d1cc]
Former-commit-id: 034540cb01
 2012-04-03 13:28:40 -05:00