Roger Ferrel
|
36cba09ccb
|
Issue #244 Send and accept invites now works.
Change-Id: I8d2c5e04f0d7dab6eb81a7321130533e5cfd6148
Former-commit-id: 4e48f2c007 [formerly dc50eb06d7] [formerly 22fff3a4b8] [formerly 108ac66214 [formerly 22fff3a4b8 [formerly 6929e4f068cc397d253b3fabd712e093c4c16dbe]]]
Former-commit-id: 108ac66214
Former-commit-id: 737fe76ebc1e23495d7116a07b8528bef6de9d05 [formerly 1fd4aa5cf3]
Former-commit-id: d3a8343de0
|
2012-03-30 10:45:26 -05:00 |
|
Roger Ferrel
|
103827c7eb
|
Issue #244 Gett color coding on messages
Change-Id: Ibe54e07c26336899198093b0a104f8796ebc0d47
Former-commit-id: a3daafd560 [formerly 24affbfe73] [formerly 9bd5aa57b6] [formerly d9ca310d94 [formerly 9bd5aa57b6 [formerly 3fa0c543f02ccb556b5d1898e359f1e2b6e63819]]]
Former-commit-id: d9ca310d94
Former-commit-id: d5c8a8cdcdb8458628c53f51a75da196cc234d16 [formerly 30fe4140ba]
Former-commit-id: 7ebba67ec3
|
2012-03-29 16:52:11 -05:00 |
|
Nate Jensen
|
4c0398406e
|
Merge "Issue #232 - Added support for session creation from invitation" into 11-Collaboration
Former-commit-id: a2f8042f73 [formerly 97898c1a3c] [formerly 7facfe9b7c] [formerly 0338159662 [formerly 7facfe9b7c [formerly 459aa33b196c8c37897575636ae670505d959330]]]
Former-commit-id: 0338159662
Former-commit-id: 3124eb7bcf67afb0f9b3ceb6729a2ec7bf4e8522 [formerly 40839a5c6e]
Former-commit-id: 43f59bf791
|
2012-03-29 16:32:15 -05:00 |
|
James Korman
|
1ff41ef8d7
|
Issue #232 - Added support for session creation from invitation
Former-commit-id: f0580d9c1f [formerly 08db3b2920] [formerly d048f0f324] [formerly 6381932f6e [formerly d048f0f324 [formerly 7d17d39b73ff66275ba247bd21e28b468ae87892]]]
Former-commit-id: 6381932f6e
Former-commit-id: 8c5ebd3d5cf4e6660db94269c72ad7893d1de017 [formerly 2eedb16808]
Former-commit-id: ea7a6ea10b
|
2012-03-29 16:30:29 -05:00 |
|
Nate Jensen
|
cff197dce8
|
Issue #427 clean up
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255
Former-commit-id: 6ce796108f [formerly ddfab0e4e3] [formerly d60fcaa4f3] [formerly a85aa4595f [formerly d60fcaa4f3 [formerly 9eb405723f355343545b1f9d4fe3925d9d1a1f24]]]
Former-commit-id: a85aa4595f
Former-commit-id: ab19b6732644883121451944d78d207ba21f4faf [formerly 14883dfa58]
Former-commit-id: d775bee7ae
|
2012-03-29 15:45:16 -05:00 |
|
Nate Jensen
|
d0faddc33a
|
Merge "Issue #429 added wrong cursor code" into 11-Collaboration
Former-commit-id: 8da45f26b2 [formerly 5f09f55f6b] [formerly b7fda1f852] [formerly 9ce74d9430 [formerly b7fda1f852 [formerly d99655bcb8042378594ef31ad52305120808ca7e]]]
Former-commit-id: 9ce74d9430
Former-commit-id: 70699592bd222de1179b07bbb30d06b9f321ff7e [formerly 25cf424a42]
Former-commit-id: 2c4a626723
|
2012-03-29 14:36:24 -05:00 |
|
Steve Harris
|
082c9136eb
|
Issue #244 Roster groups now display and improved presents.
Change-Id: I7965201692cab4472ce85d2525e39cf3823ab16f
Former-commit-id: 13821eae48 [formerly b4aa83517d] [formerly bf55bc0d86] [formerly c27ee0903c [formerly bf55bc0d86 [formerly 7f4e485aae341b11beb4a55c895a86cd6ff13635]]]
Former-commit-id: c27ee0903c
Former-commit-id: 3a6fa3d350a3772089c61ec046b095783245f807 [formerly fbdf4d5c37]
Former-commit-id: 8bda505069
|
2012-03-29 14:36:53 -05:00 |
|
Matt Nash
|
4c44a6824b
|
Issue #429 added wrong cursor code
Former-commit-id: d18ed573eb [formerly c1ee2d1718] [formerly 4e003f8723] [formerly 3d81840532 [formerly 4e003f8723 [formerly 88143adba6d493b49f87da30773bdd205a6e7948]]]
Former-commit-id: 3d81840532
Former-commit-id: 84963db7a0c7cdc0da49dace56a590ffafba84c1 [formerly acf376e126]
Former-commit-id: 3a890f0c68
|
2012-03-29 13:46:21 -05:00 |
|
Matt Nash
|
910a9447a4
|
Issue #429 fix proxied handler error, added toolbar for drawing tool
Former-commit-id: 89b9d575ff [formerly 057ffedb23] [formerly 89d401550a] [formerly 9beef61917 [formerly 89d401550a [formerly 5728e687e79a54da8313b444a48db18c6671e79e]]]
Former-commit-id: 9beef61917
Former-commit-id: c1a428c83f39039d8711dd56a44b9155703dfd85 [formerly 18291c4101]
Former-commit-id: fdde739063
|
2012-03-29 12:24:27 -05:00 |
|
Nate Jensen
|
274e2df586
|
Issue #427 Right click on editor tab support
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987
Former-commit-id: a4965d6bf9 [formerly 202bd0adf8] [formerly d2d3a245b3] [formerly aa000b4b06 [formerly d2d3a245b3 [formerly 7597db5bbc0642072143e4c7ea0291108154eb40]]]
Former-commit-id: aa000b4b06
Former-commit-id: a6d73562ce75aff32ab9bfe5f1b0ddce7553fd0c [formerly 6aae45687a]
Former-commit-id: 9792be406a
|
2012-03-29 10:44:08 -05:00 |
|
James Korman
|
afa5959912
|
Issue #232 - Added message routing/corrected roster creation
Former-commit-id: 08704e35ea [formerly 8dde3a0798] [formerly b45ea1e0a7] [formerly 6149d30b13 [formerly b45ea1e0a7 [formerly b7040976e3c8fd029a0d821511f977cfd4b4888e]]]
Former-commit-id: 6149d30b13
Former-commit-id: da3c8be6247c3d87d4c725b5a9091556aed4e49b [formerly 7f12149d98]
Former-commit-id: 842b2c6f7d
|
2012-03-29 10:16:15 -05:00 |
|
Nate Jensen
|
418fa15cc7
|
Merge "Issue #429 telestrator merging" into 11-Collaboration
Former-commit-id: 5999d295f4 [formerly aaba32c4c1] [formerly cf880ddd0d] [formerly 676746126c [formerly cf880ddd0d [formerly eda16f8aa5a9aa88a8e947070d8e9df32c36c114]]]
Former-commit-id: 676746126c
Former-commit-id: 0db4f826ae255081ca710d80835f257db3c69ddc [formerly ec0896c28d]
Former-commit-id: 7d5d70bf55
|
2012-03-28 15:10:34 -05:00 |
|
Matt Nash
|
0717f545ca
|
Issue #429 telestrator merging
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028
Former-commit-id: f5eee3d7cc [formerly b86ee8584f] [formerly d55dab5c34] [formerly 39670f6755 [formerly d55dab5c34 [formerly b1a679a2e37bdd7a887fffe82a3d735cdb60f7f9]]]
Former-commit-id: 39670f6755
Former-commit-id: 61b25ce243bb8fbf9e6499922e3ab168af901387 [formerly aeb022880c]
Former-commit-id: 4871565ff0
|
2012-03-28 15:09:18 -05:00 |
|
Nate Jensen
|
4b4b9a03ce
|
Issue #427 initial input event code
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa
Former-commit-id: dc7c88c652 [formerly 40dd73ba4d] [formerly 5fdc253d77] [formerly bbf96992ee [formerly 5fdc253d77 [formerly 6297c04332bb349d8351b07e2ffd1c24c046ccd7]]]
Former-commit-id: bbf96992ee
Former-commit-id: 43d8d9028dd4a466a9034287dba2bdd45ddb912b [formerly a5d38a0968]
Former-commit-id: 8fbe658c89
|
2012-03-28 14:34:25 -05:00 |
|
Roger Ferrel
|
f1a9b8265c
|
Issue #244 Clean up and Link editor to chat now works.
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d
Former-commit-id: 2c61bc2a50 [formerly fae1527331] [formerly 5d95a69f39] [formerly dc2f3316e6 [formerly 5d95a69f39 [formerly 51e85606ad7d7462ce84bb14bd4df0c792997a59]]]
Former-commit-id: dc2f3316e6
Former-commit-id: 27bd3129b256af64b1bce9adcab5ca25bc1e9327 [formerly 9712ba2751]
Former-commit-id: d29d2a1c92
|
2012-03-28 11:23:51 -05:00 |
|
James Korman
|
f834bf7ca2
|
Issue #232 - Added addition peer-to-peer events
Former-commit-id: 9791cc693a [formerly fc99959e3c] [formerly e8b23e3687] [formerly ae6eddcd68 [formerly e8b23e3687 [formerly 34994534b7e9b80b96e5ca038afef1977ba02383]]]
Former-commit-id: ae6eddcd68
Former-commit-id: 653449fc2f2973859a684acad815bda3e8ddda5c [formerly 0ff25a5258]
Former-commit-id: 356892acd6
|
2012-03-27 16:31:26 -05:00 |
|
Nate Jensen
|
316ee943cd
|
Issue #427 minor fixes
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad
Former-commit-id: 1952d1fbfe [formerly ab63accc61] [formerly fa8b5b3400] [formerly 0f25c8ffa6 [formerly fa8b5b3400 [formerly 40e9906f41f0fa2ae4c87d3c2a2acb2406fd4e25]]]
Former-commit-id: 0f25c8ffa6
Former-commit-id: ae7a75e9886a4da3c8fde7c46fdf504fd79b25c1 [formerly a692caba1c]
Former-commit-id: f1c0104885
|
2012-03-27 09:56:46 -05:00 |
|
Nate Jensen
|
3320d18ed5
|
Issue #427 small improvements
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e
Former-commit-id: 2132a997ca [formerly 4180979cf4] [formerly 89d7f5ec7e] [formerly 80500eec9c [formerly 89d7f5ec7e [formerly 3a268a54417ee7ed6fcef6549b9c47b86fadfc82]]]
Former-commit-id: 80500eec9c
Former-commit-id: 9d8e2d15c09b14a4f1b60f41a2add68cea557677 [formerly 9602216cda]
Former-commit-id: 7d6bfd3a0b
|
2012-03-27 09:42:39 -05:00 |
|
Nate Jensen
|
95d02a28f3
|
Merge "Issue #244 Tied CollaboratonEditor to the view." into 11-Collaboration
Former-commit-id: 16d1762f6d [formerly fc5e53b1c2] [formerly c6e046f11e] [formerly b2655debe8 [formerly c6e046f11e [formerly f5ace8ee9561bb02311414ac82b0bbe93a5ff3b6]]]
Former-commit-id: b2655debe8
Former-commit-id: 923ca1bcfb8afff29f419a61aae88a15ffd4bf8e [formerly 43b58266c5]
Former-commit-id: 54469fd8b5
|
2012-03-27 08:36:25 -05:00 |
|
Nate Jensen
|
40a55a68e8
|
Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration
Former-commit-id: f74079fc42 [formerly 4d32c5e078] [formerly d40b15acc2] [formerly d09c8a9383 [formerly d40b15acc2 [formerly 9dc29b49a619cca5613e72858099029b4ffc724e]]]
Former-commit-id: d09c8a9383
Former-commit-id: 178e1688c450a9e861bb089ca84a1c5258705ee0 [formerly f95cba545b]
Former-commit-id: 4a2d3cd071
|
2012-03-27 08:36:15 -05:00 |
|
Nate Jensen
|
811c0bff6d
|
Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
Former-commit-id: f9aa0e1d4c [formerly 4073ba7e7d] [formerly 978b76066c] [formerly ed44b0d93f [formerly 978b76066c [formerly 096bb25790809f6f0919d518a29dca4f36bbd7f7]]]
Former-commit-id: ed44b0d93f
Former-commit-id: 54c68ee512f0450e40dde713319fad1e53eb4602 [formerly 8b06b02281]
Former-commit-id: d62fc78291
|
2012-03-27 08:32:19 -05:00 |
|
Roger Ferrel
|
9817fc2214
|
Issue #244 Tied CollaboratonEditor to the view.
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165
Former-commit-id: bd96e3040d [formerly 76f9c71d41] [formerly a270259553] [formerly d001287c94 [formerly a270259553 [formerly fd9eb8cbf048ce03bce27c4d1249596f5649d2a7]]]
Former-commit-id: d001287c94
Former-commit-id: a07ca5bee7be77863145825ee6241be901b91e09 [formerly 26122319db]
Former-commit-id: 8dae356572
|
2012-03-26 17:30:51 -05:00 |
|
Roger Ferrel
|
9d523d8366
|
Issue #244 Localization of login data and removal of messanger and participant listeners.
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662
Former-commit-id: 05c5b5339d [formerly df5a2662ba] [formerly b180f9b45e] [formerly 95d8d85fd0 [formerly b180f9b45e [formerly 4e4a705b98070d2e671133e6acc29dc72617505a]]]
Former-commit-id: 95d8d85fd0
Former-commit-id: 90b8c63352a86a05c76f20466c3ca0e3dd390d83 [formerly 8f75dd68de]
Former-commit-id: c132fbf641
|
2012-03-26 17:30:50 -05:00 |
|
James Korman
|
83190cb431
|
Issue #232 - Added JAXB serialization support
Former-commit-id: 56dd3e7c15 [formerly fc2bd8c666] [formerly 72e9c2eb52] [formerly 221a5a65b0 [formerly 72e9c2eb52 [formerly dd4502d4e7d38df28ebd93340d978653b32cd5f5]]]
Former-commit-id: 221a5a65b0
Former-commit-id: 47ece3d642df95a9db106bc8ce90b932a97a3afb [formerly 02bbe80c7c]
Former-commit-id: eff90a5c4b
|
2012-03-26 16:48:04 -05:00 |
|
Nate Jensen
|
e93c521327
|
Issue #427 event controllers use ISharedDisplaySession
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9
Former-commit-id: 1af05f177c [formerly ef03821455] [formerly f6226a89d9] [formerly cbf105015f [formerly f6226a89d9 [formerly bf6cf477825be1d19081965ca9e958ebf423c0af]]]
Former-commit-id: cbf105015f
Former-commit-id: 5385afe9ce1d1a6ded716c4d96c0ce04ff2b6cf7 [formerly e28fc62a56]
Former-commit-id: ff5fec3f09
|
2012-03-26 16:37:44 -05:00 |
|
Nate Jensen
|
e10704c2fa
|
Issue #427 fix xml serialization
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654
Former-commit-id: c43746bbf1 [formerly e24039ae5c] [formerly 7c6e0a41f7] [formerly 2a1e40b2d5 [formerly 7c6e0a41f7 [formerly eb39d19f3940ba57e1322a786d0dd535289b2a1e]]]
Former-commit-id: 2a1e40b2d5
Former-commit-id: 5a795729fff7ba187286a7ae5aaad4eeaa8b98a9 [formerly a1e2c3173d]
Former-commit-id: ecc3dc9a70
|
2012-03-26 15:47:34 -05:00 |
|
Nate Jensen
|
0e9194429e
|
Issue #427 initial role based event handling
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb
Former-commit-id: e76039c56e [formerly bac31f3613] [formerly 4d7a53c583] [formerly 619d19e24c [formerly 4d7a53c583 [formerly b752ced02d726771a6e11a9982967a892d2e55f3]]]
Former-commit-id: 619d19e24c
Former-commit-id: 4440838cbe883a84c237cc8d0f49c75f814df106 [formerly 62b16fef0d]
Former-commit-id: 998c9df260
|
2012-03-26 13:05:01 -05:00 |
|
James Korman
|
c442754471
|
Issue #232 : Large refactor - Add command interfaces
Former-commit-id: a32e1d4b85 [formerly 5bb4a7952b] [formerly e408ed1a28] [formerly d51a8521f8 [formerly e408ed1a28 [formerly e82a81cb465b07710b8b2cd6c99e87f97311d316]]]
Former-commit-id: d51a8521f8
Former-commit-id: 4daa44c17ead88be2b1a8e6a6f9f3b84f376b884 [formerly e83de7447b]
Former-commit-id: fb0614ad9e
|
2012-03-26 10:17:17 -05:00 |
|
Roger Ferrel
|
15245a25d6
|
Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters).
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102
Former-commit-id: 8d7cad314e [formerly cd66a9c29c] [formerly 04b5a92838] [formerly ce72b7b583 [formerly 04b5a92838 [formerly a264abfff059a9c5942ef1db91a6390fad12a110]]]
Former-commit-id: ce72b7b583
Former-commit-id: 3e15f252346e997b4631ee9819dc1ded143057fb [formerly 053c4ba597]
Former-commit-id: e649f9da42
|
2012-03-22 16:57:30 -05:00 |
|
Nate Jensen
|
2ba6735324
|
Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c
Former-commit-id: e9b2e70892 [formerly 37d4401747] [formerly 615962f5dd] [formerly 0e214bcd7c [formerly 615962f5dd [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]]]
Former-commit-id: 0e214bcd7c
Former-commit-id: 2f70306617907f26efb4f42d9c736b68c3f4f5a2 [formerly 2801c4fdfb]
Former-commit-id: 8d94771854
|
2012-03-22 09:39:59 -05:00 |
|
James Korman
|
ef3fdd7171
|
Issue #232 - Delete files from original locations
Former-commit-id: 9c17874f37 [formerly 4dabfd8c2a] [formerly 90b74b258a] [formerly 55f269100c [formerly 90b74b258a [formerly b34ddc7ead0853a152baa8b95c950f9c714a4ff7]]]
Former-commit-id: 55f269100c
Former-commit-id: 4d86c3e4eddb68e0dd4e867b58d0cb40e7d9c96c [formerly 9badd0fb07]
Former-commit-id: d0976e4703
|
2012-03-20 14:55:27 -05:00 |
|
James Korman
|
34eeb34b66
|
Issue #232 - Considerable refactoring/event processing
Former-commit-id: cbe20ea7ca [formerly 60ff4d139b] [formerly 4ba4ccb404] [formerly cc5cc2d409 [formerly 4ba4ccb404 [formerly 0b229e6992b40060d43ac560e0a3fa532635f5a1]]]
Former-commit-id: cc5cc2d409
Former-commit-id: 341fef17dc14e38a04e3f4f94ca5a333eca1128e [formerly c5e9df26c1]
Former-commit-id: 8be6351348
|
2012-03-20 13:59:55 -05:00 |
|
Roger Ferrel
|
e5a1786d4f
|
Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly.
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687
Former-commit-id: 3ea86c6609 [formerly ce3b5728c5] [formerly 1f4edd08e4] [formerly a7f1fc18b1 [formerly 1f4edd08e4 [formerly e92969cb1440f3f6477a7003b031faab6ed484fc]]]
Former-commit-id: a7f1fc18b1
Former-commit-id: f37ef7c801a95dba643b2270726b5d75cbb30f5d [formerly 9f6642d572]
Former-commit-id: 002e7eab3f
|
2012-03-20 10:42:57 -05:00 |
|
Nate Jensen
|
e142a16d66
|
Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration
Former-commit-id: d73d150241 [formerly feeb8cba7e] [formerly 8f8e690470] [formerly dc62171533 [formerly 8f8e690470 [formerly 62d92c57d9d004427a74fc0353e2ca94411bf488]]]
Former-commit-id: dc62171533
Former-commit-id: edbe99a40abf943e962f6ce713562626cac22991 [formerly 8d78571942]
Former-commit-id: 77a50a5e25
|
2012-03-14 11:23:55 -05:00 |
|
Matt Nash
|
503b172a11
|
Issue #244 icons and login changes
Former-commit-id: 0e68f12509 [formerly f5c9cfd285] [formerly e06101f9c3] [formerly 2fd6e28569 [formerly e06101f9c3 [formerly ef2993a8545265adbc325080765baef0ee939923]]]
Former-commit-id: 2fd6e28569
Former-commit-id: 9ec069a70a96b24f2d5167df34cd67f927eb2dda [formerly 5b949aeacf]
Former-commit-id: d6ef74a95b
|
2012-03-14 10:54:13 -05:00 |
|
James Korman
|
860d24bf25
|
Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: 4756721ef6 [formerly ee20250305] [formerly 095ab0eeab] [formerly d6003d1e71 [formerly 095ab0eeab [formerly 92a842f56632399d3b43d7d560dbc5d6bbbd5662]]]
Former-commit-id: d6003d1e71
Former-commit-id: 5d7c36a75d50d27fdad5a4fa6b944c79100578f6 [formerly b29c262362]
Former-commit-id: 578594cdfd
|
2012-03-14 10:24:17 -05:00 |
|
Roger Ferrel
|
56421e0e85
|
Issue #244 Close Session connction when view closed. Tighen up dialogs.
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5
Former-commit-id: bdc8744ea6 [formerly 186aac5b77] [formerly 97a3884017] [formerly c321d2aacf [formerly 97a3884017 [formerly 486b2186014a14a845e48dac222c293a7891e39e]]]
Former-commit-id: c321d2aacf
Former-commit-id: 0d5bd2eff5ad104e085cbcb075e99e36774a84b0 [formerly b21f1555e2]
Former-commit-id: a64f2e6070
|
2012-03-14 09:26:23 -05:00 |
|
Matt Nash
|
00e3ac6c24
|
Issue #244 new icons for collaboration
Former-commit-id: 8271eb002a [formerly 6398c01aec] [formerly 79f1cbec74] [formerly 39bce3d793 [formerly 79f1cbec74 [formerly da2177babfe9fa8b7efbad9bf9d938e4ecb4313b]]]
Former-commit-id: 39bce3d793
Former-commit-id: 464bc504c69009a8a5c6135d429a9919623a9dd1 [formerly 22eb44eb26]
Former-commit-id: c743c0c44b
|
2012-03-12 08:03:54 -05:00 |
|
Roger Ferrel
|
3fa7fe49be
|
Issue #244 Bug Fix.
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c
Former-commit-id: 118c5abe09 [formerly 1871be89e7] [formerly be9fe19d9a] [formerly d17ef23899 [formerly be9fe19d9a [formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]]]
Former-commit-id: d17ef23899
Former-commit-id: 2b16c0e3112c6a98ed1c1384c2103bb389942c83 [formerly 6c8db0d6a4]
Former-commit-id: e8887a6189
|
2012-03-08 17:16:48 -06:00 |
|
Roger Ferrel
|
21e9061d08
|
Issue #244 Added join and refresh actions.
Change-Id: I85b9c07f73319fc9c7ff3c61cda452e6990e7f20
Former-commit-id: c8b8a30875 [formerly 71a5524380] [formerly f492b082dc] [formerly f04f775a66 [formerly f492b082dc [formerly 4854c999ed0128c8b639f8b070ec4738591d9ff4]]]
Former-commit-id: f04f775a66
Former-commit-id: 6a269d0f74acd65b94c33c6edfce2cdfd2153abb [formerly 674cc116b2]
Former-commit-id: d6a4919b9a
|
2012-03-08 12:37:56 -06:00 |
|
Matt Nash
|
bf1a187e49
|
Issue #244 added work on the chat for presence notifications
Former-commit-id: b8cb02de4c [formerly c96c33169b] [formerly d264743199] [formerly 6f354374d6 [formerly d264743199 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]]]
Former-commit-id: 6f354374d6
Former-commit-id: 855d12bbe7f26f52a1fcdfe7ec7faffbaff0c8fb [formerly 4f35191a6b]
Former-commit-id: b4a5aaea11
|
2012-03-08 09:08:41 -06:00 |
|
Matt Nash
|
0ef60a57f3
|
Merge "Issue #244 update" into 11-Collaboration
Former-commit-id: b73877e9a5 [formerly 1e4472cd78] [formerly 04ae9b48ea] [formerly bbacd337b4 [formerly 04ae9b48ea [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]]]
Former-commit-id: bbacd337b4
Former-commit-id: b87a5a6e0ba1906d19de0e9c7ce07edc116f66e4 [formerly 7efd993e18]
Former-commit-id: dd57ff6b7f
|
2012-03-08 08:33:32 -06:00 |
|
Roger Ferrel
|
ab81628692
|
Issue #244 update
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105
Former-commit-id: b1a69aafff [formerly c22d5ef573] [formerly 4f4025ea23a0b60e1f1736431d8cdc6028c67caf [formerly c9459e2e8c]] [formerly 2114b95a0b [formerly c9459e2e8c [formerly 28969960d80066def0ef02930875e40d7693c234]]]
Former-commit-id: 2114b95a0b
Former-commit-id: 9c709d5af9cfb0e1e37a724c243c0fbbb12057a5 [formerly 1a2608a2fa]
Former-commit-id: 40b910c05e
|
2012-03-08 08:30:02 -06:00 |
|
James Korman
|
7a91f24e27
|
Issue #232 Initial collaboration framework plugin checkin
Former-commit-id: 373f5b4060 [formerly 4368616970] [formerly 526a2633ce] [formerly 5a91d71c12 [formerly 526a2633ce [formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]]]
Former-commit-id: 5a91d71c12
Former-commit-id: 30ad0a0f992968ee55254e2e103edff30614f710 [formerly 2fea86a591]
Former-commit-id: f242c1a430
|
2012-03-07 15:38:20 -06:00 |
|
Nate Jensen
|
1747d01347
|
Merge "Issue #244 Inital creation" into 11-Collaboration
Former-commit-id: a448a80004 [formerly 13228ab7cc] [formerly f950b30463] [formerly 412ceb9561 [formerly f950b30463 [formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]]]
Former-commit-id: 412ceb9561
Former-commit-id: 9ce5eb6c5b02138237e3f9860e90c4d32e19f1ee [formerly d0672cf2b6]
Former-commit-id: 39f89588a1
|
2012-03-06 14:27:15 -06:00 |
|
Roger Ferrel
|
f406bca886
|
Issue #244 Inital creation
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4
Former-commit-id: 5e63f5b576 [formerly c62418dcf3] [formerly c26e98376e] [formerly 3161380f4d [formerly c26e98376e [formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]]]
Former-commit-id: 3161380f4d
Former-commit-id: c93492e46d7634f4442b5821cc164ccf698b4647 [formerly ccfadae952]
Former-commit-id: 0cf600a16c
|
2012-03-06 14:08:39 -06:00 |
|
Steve Harris
|
13a3edd4f6
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]
Former-commit-id: b55a488ed8
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
139d42c594
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]
Former-commit-id: 9995d22e25
Former-commit-id: dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5]
Former-commit-id: 610fdf3f4e
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
43c3cfdd1a
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]
Former-commit-id: b137302802
Former-commit-id: eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]
Former-commit-id: 1ac6b36d1f
|
2012-02-17 10:55:02 -06:00 |
|
Nate Jensen
|
b0c285c305
|
Issue #181 fix ncep
Change-Id: If0e2947c33523ada50036212666867a7c5138c17
Former-commit-id: 6418e0edda [formerly f3875948e8] [formerly ca923b9475] [formerly 15e0a5e68d [formerly ca923b9475 [formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]]]
Former-commit-id: 15e0a5e68d
Former-commit-id: e0dbbff654bb803f9a78bd56c5fbd86943f2b93e [formerly 29be9b82bd]
Former-commit-id: 637a516ae5
|
2012-01-26 17:28:06 -06:00 |
|