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

334 commits

Author SHA1 Message Date
Roger Ferrel
5ce1b1bdd6 Issue #244 Gett color coding on messages 
Change-Id: Ibe54e07c26336899198093b0a104f8796ebc0d47

Former-commit-id: 24affbfe73 [formerly 9bd5aa57b6] [formerly 24affbfe73 [formerly 9bd5aa57b6] [formerly d9ca310d94 [formerly 3fa0c543f02ccb556b5d1898e359f1e2b6e63819]]]
Former-commit-id: d9ca310d94
Former-commit-id: 7ebba67ec3 [formerly 30fe4140ba]
Former-commit-id: c2c3215e2d
 2012-03-29 16:52:11 -05:00
Nate Jensen
e3b025bcfc Merge "Issue #232 - Added support for session creation from invitation" into 11-Collaboration 
Former-commit-id: 97898c1a3c [formerly 7facfe9b7c] [formerly 97898c1a3c [formerly 7facfe9b7c] [formerly 0338159662 [formerly 459aa33b196c8c37897575636ae670505d959330]]]
Former-commit-id: 0338159662
Former-commit-id: 43f59bf791 [formerly 40839a5c6e]
Former-commit-id: 1d9caad6ba
 2012-03-29 16:32:15 -05:00
James Korman
d0faf1bfc4 Issue #232 - Added support for session creation from invitation 
Former-commit-id: 08db3b2920 [formerly d048f0f324] [formerly 08db3b2920 [formerly d048f0f324] [formerly 6381932f6e [formerly 7d17d39b73ff66275ba247bd21e28b468ae87892]]]
Former-commit-id: 6381932f6e
Former-commit-id: ea7a6ea10b [formerly 2eedb16808]
Former-commit-id: ec96f988c5
 2012-03-29 16:30:29 -05:00
Nate Jensen
48bf706df1 Issue #427 clean up 
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255

Former-commit-id: ddfab0e4e3 [formerly d60fcaa4f3] [formerly ddfab0e4e3 [formerly d60fcaa4f3] [formerly a85aa4595f [formerly 9eb405723f355343545b1f9d4fe3925d9d1a1f24]]]
Former-commit-id: a85aa4595f
Former-commit-id: d775bee7ae [formerly 14883dfa58]
Former-commit-id: ced9e83aec
 2012-03-29 15:45:16 -05:00
Nate Jensen
5169c34b03 Merge "Issue #429 added wrong cursor code" into 11-Collaboration 
Former-commit-id: 5f09f55f6b [formerly b7fda1f852] [formerly 5f09f55f6b [formerly b7fda1f852] [formerly 9ce74d9430 [formerly d99655bcb8042378594ef31ad52305120808ca7e]]]
Former-commit-id: 9ce74d9430
Former-commit-id: 2c4a626723 [formerly 25cf424a42]
Former-commit-id: 84caa31cb7
 2012-03-29 14:36:24 -05:00
Steve Harris
807547cb8d Issue #244 Roster groups now display and improved presents. 
Change-Id: I7965201692cab4472ce85d2525e39cf3823ab16f

Former-commit-id: b4aa83517d [formerly bf55bc0d86] [formerly b4aa83517d [formerly bf55bc0d86] [formerly c27ee0903c [formerly 7f4e485aae341b11beb4a55c895a86cd6ff13635]]]
Former-commit-id: c27ee0903c
Former-commit-id: 8bda505069 [formerly fbdf4d5c37]
Former-commit-id: 5a22143834
 2012-03-29 14:36:53 -05:00
Matt Nash
1c54506eed Issue #429 added wrong cursor code 
Former-commit-id: c1ee2d1718 [formerly 4e003f8723] [formerly c1ee2d1718 [formerly 4e003f8723] [formerly 3d81840532 [formerly 88143adba6d493b49f87da30773bdd205a6e7948]]]
Former-commit-id: 3d81840532
Former-commit-id: 3a890f0c68 [formerly acf376e126]
Former-commit-id: 219e197290
 2012-03-29 13:46:21 -05:00
Matt Nash
9f25ebc259 Issue #429 fix proxied handler error, added toolbar for drawing tool 
Former-commit-id: 057ffedb23 [formerly 89d401550a] [formerly 057ffedb23 [formerly 89d401550a] [formerly 9beef61917 [formerly 5728e687e79a54da8313b444a48db18c6671e79e]]]
Former-commit-id: 9beef61917
Former-commit-id: fdde739063 [formerly 18291c4101]
Former-commit-id: b07f565ab9
 2012-03-29 12:24:27 -05:00
Nate Jensen
a0c6c92587 Issue #427 Right click on editor tab support 
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987

Former-commit-id: 202bd0adf8 [formerly d2d3a245b3] [formerly 202bd0adf8 [formerly d2d3a245b3] [formerly aa000b4b06 [formerly 7597db5bbc0642072143e4c7ea0291108154eb40]]]
Former-commit-id: aa000b4b06
Former-commit-id: 9792be406a [formerly 6aae45687a]
Former-commit-id: ac8087a21a
 2012-03-29 10:44:08 -05:00
James Korman
4527f71129 Issue #232 - Added message routing/corrected roster creation 
Former-commit-id: 8dde3a0798 [formerly b45ea1e0a7] [formerly 8dde3a0798 [formerly b45ea1e0a7] [formerly 6149d30b13 [formerly b7040976e3c8fd029a0d821511f977cfd4b4888e]]]
Former-commit-id: 6149d30b13
Former-commit-id: 842b2c6f7d [formerly 7f12149d98]
Former-commit-id: acc37a06c5
 2012-03-29 10:16:15 -05:00
Steve Harris
0a7cb5fd7a Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: 0665862abe [formerly 70357d90bc] [formerly 0665862abe [formerly 70357d90bc] [formerly a0abcf8120 [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]
Former-commit-id: a0abcf8120
Former-commit-id: 65aa72fee7 [formerly 6884520750]
Former-commit-id: 5a310acb18
 2012-03-29 10:03:05 -05:00
Nate Jensen
80ea8cc05d Merge "Issue #429 telestrator merging" into 11-Collaboration 
Former-commit-id: aaba32c4c1 [formerly cf880ddd0d] [formerly aaba32c4c1 [formerly cf880ddd0d] [formerly 676746126c [formerly eda16f8aa5a9aa88a8e947070d8e9df32c36c114]]]
Former-commit-id: 676746126c
Former-commit-id: 7d5d70bf55 [formerly ec0896c28d]
Former-commit-id: f809bbcb0d
 2012-03-28 15:10:34 -05:00
Matt Nash
f58c0816fe Issue #429 telestrator merging 
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028

Former-commit-id: b86ee8584f [formerly d55dab5c34] [formerly b86ee8584f [formerly d55dab5c34] [formerly 39670f6755 [formerly b1a679a2e37bdd7a887fffe82a3d735cdb60f7f9]]]
Former-commit-id: 39670f6755
Former-commit-id: 4871565ff0 [formerly aeb022880c]
Former-commit-id: 6ec5f3b2ea
 2012-03-28 15:09:18 -05:00
Nate Jensen
6018238348 Issue #427 initial input event code 
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa

Former-commit-id: 40dd73ba4d [formerly 5fdc253d77] [formerly 40dd73ba4d [formerly 5fdc253d77] [formerly bbf96992ee [formerly 6297c04332bb349d8351b07e2ffd1c24c046ccd7]]]
Former-commit-id: bbf96992ee
Former-commit-id: 8fbe658c89 [formerly a5d38a0968]
Former-commit-id: 454e8a72f8
 2012-03-28 14:34:25 -05:00
Max Schenkelberg
e73e40dc78 Issue #358 Made wireframe shapes rely more on the grid geoemtry of the 
descriptor than the actual descriptor as the descriptor is used purely
for convenience 

Former-commit-id: 66eaffb9ee [formerly 15a9245592] [formerly 66eaffb9ee [formerly 15a9245592] [formerly f10f1a5319 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]
Former-commit-id: f10f1a5319
Former-commit-id: bbab188fb9 [formerly ac11dd0c18]
Former-commit-id: 2f3b9f0067
 2012-03-28 13:32:04 -05:00
Roger Ferrel
dbb7bdf9a8 Issue #244 Clean up and Link editor to chat now works. 
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d

Former-commit-id: fae1527331 [formerly 5d95a69f39] [formerly fae1527331 [formerly 5d95a69f39] [formerly dc2f3316e6 [formerly 51e85606ad7d7462ce84bb14bd4df0c792997a59]]]
Former-commit-id: dc2f3316e6
Former-commit-id: d29d2a1c92 [formerly 9712ba2751]
Former-commit-id: a5b05aeebd
 2012-03-28 11:23:51 -05:00
James Korman
979397b7be Issue #232 - Added addition peer-to-peer events 
Former-commit-id: fc99959e3c [formerly e8b23e3687] [formerly fc99959e3c [formerly e8b23e3687] [formerly ae6eddcd68 [formerly 34994534b7e9b80b96e5ca038afef1977ba02383]]]
Former-commit-id: ae6eddcd68
Former-commit-id: 356892acd6 [formerly 0ff25a5258]
Former-commit-id: 64be5deba5
 2012-03-27 16:31:26 -05:00
Nate Jensen
30740b4e48 Issue #427 minor fixes 
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad

Former-commit-id: ab63accc61 [formerly fa8b5b3400] [formerly ab63accc61 [formerly fa8b5b3400] [formerly 0f25c8ffa6 [formerly 40e9906f41f0fa2ae4c87d3c2a2acb2406fd4e25]]]
Former-commit-id: 0f25c8ffa6
Former-commit-id: f1c0104885 [formerly a692caba1c]
Former-commit-id: efe77c3542
 2012-03-27 09:56:46 -05:00
Nate Jensen
e2e9fb87dc Issue #427 small improvements 
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e

Former-commit-id: 4180979cf4 [formerly 89d7f5ec7e] [formerly 4180979cf4 [formerly 89d7f5ec7e] [formerly 80500eec9c [formerly 3a268a54417ee7ed6fcef6549b9c47b86fadfc82]]]
Former-commit-id: 80500eec9c
Former-commit-id: 7d6bfd3a0b [formerly 9602216cda]
Former-commit-id: 92a9726d83
 2012-03-27 09:42:39 -05:00
Nate Jensen
272563edbf Merge "Issue #244 Tied CollaboratonEditor to the view." into 11-Collaboration 
Former-commit-id: fc5e53b1c2 [formerly c6e046f11e] [formerly fc5e53b1c2 [formerly c6e046f11e] [formerly b2655debe8 [formerly f5ace8ee9561bb02311414ac82b0bbe93a5ff3b6]]]
Former-commit-id: b2655debe8
Former-commit-id: 54469fd8b5 [formerly 43b58266c5]
Former-commit-id: cc6b5250b3
 2012-03-27 08:36:25 -05:00
Nate Jensen
e839afd355 Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration 
Former-commit-id: 4d32c5e078 [formerly d40b15acc2] [formerly 4d32c5e078 [formerly d40b15acc2] [formerly d09c8a9383 [formerly 9dc29b49a619cca5613e72858099029b4ffc724e]]]
Former-commit-id: d09c8a9383
Former-commit-id: 4a2d3cd071 [formerly f95cba545b]
Former-commit-id: 4653f3dd4f
 2012-03-27 08:36:15 -05:00
Nate Jensen
009ae65184 Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration 
Former-commit-id: 4073ba7e7d [formerly 978b76066c] [formerly 4073ba7e7d [formerly 978b76066c] [formerly ed44b0d93f [formerly 096bb25790809f6f0919d518a29dca4f36bbd7f7]]]
Former-commit-id: ed44b0d93f
Former-commit-id: d62fc78291 [formerly 8b06b02281]
Former-commit-id: 0805c13d39
 2012-03-27 08:32:19 -05:00
Roger Ferrel
027e4f4254 Issue #244 Tied CollaboratonEditor to the view. 
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165

Former-commit-id: 76f9c71d41 [formerly a270259553] [formerly 76f9c71d41 [formerly a270259553] [formerly d001287c94 [formerly fd9eb8cbf048ce03bce27c4d1249596f5649d2a7]]]
Former-commit-id: d001287c94
Former-commit-id: 8dae356572 [formerly 26122319db]
Former-commit-id: ebbf625538
 2012-03-26 17:30:51 -05:00
Roger Ferrel
cca7866880 Issue #244 Localization of login data and removal of messanger and participant listeners. 
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662

Former-commit-id: df5a2662ba [formerly b180f9b45e] [formerly df5a2662ba [formerly b180f9b45e] [formerly 95d8d85fd0 [formerly 4e4a705b98070d2e671133e6acc29dc72617505a]]]
Former-commit-id: 95d8d85fd0
Former-commit-id: c132fbf641 [formerly 8f75dd68de]
Former-commit-id: c06762598e
 2012-03-26 17:30:50 -05:00
James Korman
0d10f43adb Issue #232 - Added JAXB serialization support 
Former-commit-id: fc2bd8c666 [formerly 72e9c2eb52] [formerly fc2bd8c666 [formerly 72e9c2eb52] [formerly 221a5a65b0 [formerly dd4502d4e7d38df28ebd93340d978653b32cd5f5]]]
Former-commit-id: 221a5a65b0
Former-commit-id: eff90a5c4b [formerly 02bbe80c7c]
Former-commit-id: 745f256590
 2012-03-26 16:48:04 -05:00
Nate Jensen
e9f2d75d95 Issue #427 event controllers use ISharedDisplaySession 
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9

Former-commit-id: ef03821455 [formerly f6226a89d9] [formerly ef03821455 [formerly f6226a89d9] [formerly cbf105015f [formerly bf6cf477825be1d19081965ca9e958ebf423c0af]]]
Former-commit-id: cbf105015f
Former-commit-id: ff5fec3f09 [formerly e28fc62a56]
Former-commit-id: b6be43d0e5
 2012-03-26 16:37:44 -05:00
Nate Jensen
4605f1b00a Issue #427 fix xml serialization 
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654

Former-commit-id: e24039ae5c [formerly 7c6e0a41f7] [formerly e24039ae5c [formerly 7c6e0a41f7] [formerly 2a1e40b2d5 [formerly eb39d19f3940ba57e1322a786d0dd535289b2a1e]]]
Former-commit-id: 2a1e40b2d5
Former-commit-id: ecc3dc9a70 [formerly a1e2c3173d]
Former-commit-id: c8b94860a0
 2012-03-26 15:47:34 -05:00
Nate Jensen
6580f92e65 Issue #427 initial role based event handling 
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb

Former-commit-id: bac31f3613 [formerly 4d7a53c583] [formerly bac31f3613 [formerly 4d7a53c583] [formerly 619d19e24c [formerly b752ced02d726771a6e11a9982967a892d2e55f3]]]
Former-commit-id: 619d19e24c
Former-commit-id: 998c9df260 [formerly 62b16fef0d]
Former-commit-id: 2e4e000720
 2012-03-26 13:05:01 -05:00
James Korman
551d38bee3 Issue #232 : Large refactor - Add command interfaces 
Former-commit-id: 5bb4a7952b [formerly e408ed1a28] [formerly 5bb4a7952b [formerly e408ed1a28] [formerly d51a8521f8 [formerly e82a81cb465b07710b8b2cd6c99e87f97311d316]]]
Former-commit-id: d51a8521f8
Former-commit-id: fb0614ad9e [formerly e83de7447b]
Former-commit-id: 61f8b804cb
 2012-03-26 10:17:17 -05:00
Roger Ferrel
ff4822d3ef Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters). 
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102

Former-commit-id: cd66a9c29c [formerly 04b5a92838] [formerly cd66a9c29c [formerly 04b5a92838] [formerly ce72b7b583 [formerly a264abfff059a9c5942ef1db91a6390fad12a110]]]
Former-commit-id: ce72b7b583
Former-commit-id: e649f9da42 [formerly 053c4ba597]
Former-commit-id: 3f08de49fd
 2012-03-22 16:57:30 -05:00
Nate Jensen
28931de3c6 Issue #427 Share maps and editor 
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: 37d4401747 [formerly 615962f5dd] [formerly 37d4401747 [formerly 615962f5dd] [formerly 0e214bcd7c [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]]]
Former-commit-id: 0e214bcd7c
Former-commit-id: 8d94771854 [formerly 2801c4fdfb]
Former-commit-id: 98fb91164b
 2012-03-22 09:39:59 -05:00
James Korman
5702fc837c Issue #232 - Delete files from original locations 
Former-commit-id: 4dabfd8c2a [formerly 90b74b258a] [formerly 4dabfd8c2a [formerly 90b74b258a] [formerly 55f269100c [formerly b34ddc7ead0853a152baa8b95c950f9c714a4ff7]]]
Former-commit-id: 55f269100c
Former-commit-id: d0976e4703 [formerly 9badd0fb07]
Former-commit-id: f3f6778df2
 2012-03-20 14:55:27 -05:00
James Korman
9d51b9c893 Issue #232 - Considerable refactoring/event processing 
Former-commit-id: 60ff4d139b [formerly 4ba4ccb404] [formerly 60ff4d139b [formerly 4ba4ccb404] [formerly cc5cc2d409 [formerly 0b229e6992b40060d43ac560e0a3fa532635f5a1]]]
Former-commit-id: cc5cc2d409
Former-commit-id: 8be6351348 [formerly c5e9df26c1]
Former-commit-id: 7f895ac63d
 2012-03-20 13:59:55 -05:00
Roger Ferrel
3d8af5815a Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly. 
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687

Former-commit-id: ce3b5728c5 [formerly 1f4edd08e4] [formerly ce3b5728c5 [formerly 1f4edd08e4] [formerly a7f1fc18b1 [formerly e92969cb1440f3f6477a7003b031faab6ed484fc]]]
Former-commit-id: a7f1fc18b1
Former-commit-id: 002e7eab3f [formerly 9f6642d572]
Former-commit-id: f58fa980f2
 2012-03-20 10:42:57 -05:00
Max Schenkelberg
8878a9732d Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in 
case of "NO DATA"

Former-commit-id: 468c812dde [formerly cd6ebd80d4] [formerly 468c812dde [formerly cd6ebd80d4] [formerly b9085db25d [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]
Former-commit-id: b9085db25d
Former-commit-id: 81bc45f071 [formerly 954073b38c]
Former-commit-id: 645900727c
 2012-03-16 10:13:31 -05:00
Max Schenkelberg
e220ddf515 Issue #358 Fixed sampling issue with mosaic resource with best 
res resources

Former-commit-id: 97edff9f7c [formerly cc111ab9ac] [formerly 97edff9f7c [formerly cc111ab9ac] [formerly 258d57e825 [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]
Former-commit-id: 258d57e825
Former-commit-id: 4e81d2432c [formerly 1e5c074e3b]
Former-commit-id: a3bda1957c
 2012-03-16 09:03:50 -05:00
Max Schenkelberg
d585d19f48 Issue #358 Fixed painting and sampling regression in radar mosaic due to 
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements

Former-commit-id: 10b720381b [formerly 719f87c261] [formerly 10b720381b [formerly 719f87c261] [formerly 556a270a09 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]
Former-commit-id: 556a270a09
Former-commit-id: a4b859ae54 [formerly ba8af4dcc1]
Former-commit-id: 682aca1dda
 2012-03-14 18:03:44 -05:00
Nate Jensen
8e796d06de Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration 
Former-commit-id: feeb8cba7e [formerly 8f8e690470] [formerly feeb8cba7e [formerly 8f8e690470] [formerly dc62171533 [formerly 62d92c57d9d004427a74fc0353e2ca94411bf488]]]
Former-commit-id: dc62171533
Former-commit-id: 77a50a5e25 [formerly 8d78571942]
Former-commit-id: 7f88a56232
 2012-03-14 11:23:55 -05:00
Matt Nash
1236a90d7e Issue #244 icons and login changes 
Former-commit-id: f5c9cfd285 [formerly e06101f9c3] [formerly f5c9cfd285 [formerly e06101f9c3] [formerly 2fd6e28569 [formerly ef2993a8545265adbc325080765baef0ee939923]]]
Former-commit-id: 2fd6e28569
Former-commit-id: d6ef74a95b [formerly 5b949aeacf]
Former-commit-id: ab5e4cb2de
 2012-03-14 10:54:13 -05:00
James Korman
0d4ccaf2e6 Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener 
Former-commit-id: ee20250305 [formerly 095ab0eeab] [formerly ee20250305 [formerly 095ab0eeab] [formerly d6003d1e71 [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]]]
Former-commit-id: d6003d1e71
Former-commit-id: 578594cdfd [formerly b29c262362]
Former-commit-id: 072c79a582
 2012-03-14 10:24:17 -05:00
Max Schenkelberg
9366a5f308 Issue #358 Cleaned up mesh extension and API to use geotools for 
defining a mesh.  This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.

Former-commit-id: 8fb7eccb73 [formerly 6e5964df9d] [formerly 8fb7eccb73 [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]
Former-commit-id: 50765e8a34
Former-commit-id: 8f08fab0a7 [formerly cf440b3884]
Former-commit-id: 6378e8c4ee
 2012-03-14 09:49:32 -05:00
Roger Ferrel
69552760cd Issue #244 Close Session connction when view closed. Tighen up dialogs. 
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5

Former-commit-id: 186aac5b77 [formerly 97a3884017] [formerly 186aac5b77 [formerly 97a3884017] [formerly c321d2aacf [formerly 486b2186014a14a845e48dac222c293a7891e39e]]]
Former-commit-id: c321d2aacf
Former-commit-id: a64f2e6070 [formerly b21f1555e2]
Former-commit-id: 8474561724
 2012-03-14 09:26:23 -05:00
Matt Nash
164c1d3715 Issue #244 new icons for collaboration 
Former-commit-id: 6398c01aec [formerly 79f1cbec74] [formerly 6398c01aec [formerly 79f1cbec74] [formerly 39bce3d793 [formerly da2177babfe9fa8b7efbad9bf9d938e4ecb4313b]]]
Former-commit-id: 39bce3d793
Former-commit-id: c743c0c44b [formerly 22eb44eb26]
Former-commit-id: cd16dd73a4
 2012-03-12 08:03:54 -05:00
Max Schenkelberg
0f005d3521 Issue #358 Merging core drawing API improvements from Collaboration 
Former-commit-id: 18805c68f7 [formerly d43b0456d8] [formerly 18805c68f7 [formerly d43b0456d8] [formerly 89f603f448 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]
Former-commit-id: 89f603f448
Former-commit-id: f78b932abb [formerly 4662ece060]
Former-commit-id: 1303289d12
 2012-03-09 12:31:50 -06:00
Roger Ferrel
c828bfb110 Issue #244 Bug Fix. 
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c

Former-commit-id: 1871be89e7 [formerly be9fe19d9a] [formerly 1871be89e7 [formerly be9fe19d9a] [formerly d17ef23899 [formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]]]
Former-commit-id: d17ef23899
Former-commit-id: e8887a6189 [formerly 6c8db0d6a4]
Former-commit-id: c692a2da94
 2012-03-08 17:16:48 -06:00
Roger Ferrel
59c235974b Issue #244 Added join and refresh actions. 
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20

Former-commit-id: 71a5524380 [formerly f492b082dc] [formerly 71a5524380 [formerly f492b082dc] [formerly f04f775a66 [formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]]]
Former-commit-id: f04f775a66
Former-commit-id: d6a4919b9a [formerly 674cc116b2]
Former-commit-id: 31c8dddd6c
 2012-03-08 12:37:56 -06:00
Matt Nash
f060c674d7 Issue #244 added work on the chat for presence notifications 
Former-commit-id: c96c33169b [formerly d264743199] [formerly c96c33169b [formerly d264743199] [formerly 6f354374d6 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]]]
Former-commit-id: 6f354374d6
Former-commit-id: b4a5aaea11 [formerly 4f35191a6b]
Former-commit-id: 825570f37c
 2012-03-08 09:08:41 -06:00
Matt Nash
347a36704a Merge "Issue #244 update" into 11-Collaboration 
Former-commit-id: 1e4472cd78 [formerly 04ae9b48ea] [formerly 1e4472cd78 [formerly 04ae9b48ea] [formerly bbacd337b4 [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]]]
Former-commit-id: bbacd337b4
Former-commit-id: dd57ff6b7f [formerly 7efd993e18]
Former-commit-id: 9ec70444da
 2012-03-08 08:33:32 -06:00
Roger Ferrel
12df2e3f0b Issue #244 update 
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105

Former-commit-id: c22d5ef573 [formerly c9459e2e8c] [formerly c22d5ef573 [formerly c9459e2e8c] [formerly 2114b95a0b [formerly 28969960d80066def0ef02930875e40d7693c234]]]
Former-commit-id: 2114b95a0b
Former-commit-id: 40b910c05e [formerly 1a2608a2fa]
Former-commit-id: 890f2bffb9
 2012-03-08 08:30:02 -06:00
James Korman
fe7db93589 Issue #232 Initial collaboration framework plugin checkin 
Former-commit-id: 4368616970 [formerly 526a2633ce] [formerly 4368616970 [formerly 526a2633ce] [formerly 5a91d71c12 [formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]]]
Former-commit-id: 5a91d71c12
Former-commit-id: f242c1a430 [formerly 2fea86a591]
Former-commit-id: e40ee702aa
 2012-03-07 15:38:20 -06:00