Steve Harris
9340618732
12.3.1-10 baseline
...
Former-commit-id: 760ead20470e4128712b4068f5295f760ead20470e4128712b4068f5295f22bd792cd94068f5295f22bd792cd911e448aa398bc60b1e32ce3b74c6052e0f4b241b293563cfe7
2012-03-30 08:38:33 -05:00
Roger Ferrel
30c8ea8b63
Issue #244 Gett color coding on messages
...
Change-Id: Ibe54e07c26336899198093b0a104f8796ebc0d47
Former-commit-id: a3daafd56024affbfe739bd5aa57b6a3daafd56024affbfe739bd5aa57b6d9ca310d949bd5aa57b6d9ca310d94103827c7eb7ebba67ec330fe4140bac2c3215e2d5ce1b1bdd6
2012-03-29 16:52:11 -05:00
Nate Jensen
5c6cd68df5
Merge "Issue #232 - Added support for session creation from invitation" into 11-Collaboration
...
Former-commit-id: a2f8042f7397898c1a3c7facfe9b7ca2f8042f7397898c1a3c7facfe9b7c03381596627facfe9b7c03381596624c0398406e43f59bf79140839a5c6e1d9caad6bae3b025bcfc
2012-03-29 16:32:15 -05:00
James Korman
39e0718e8a
Issue #232 - Added support for session creation from invitation
...
Former-commit-id: f0580d9c1f08db3b2920d048f0f324f0580d9c1f08db3b2920d048f0f3246381932f6ed048f0f3246381932f6e1ff41ef8d7ea7a6ea10b2eedb16808ec96f988c5d0faf1bfc4
2012-03-29 16:30:29 -05:00
Nate Jensen
d072f35123
Issue #427 clean up
...
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255
Former-commit-id: 6ce796108fddfab0e4e3d60fcaa4f36ce796108fddfab0e4e3d60fcaa4f3a85aa4595fd60fcaa4f3a85aa4595fcff197dce8d775bee7ae14883dfa58ced9e83aec48bf706df1
2012-03-29 15:45:16 -05:00
Nate Jensen
94bff98b9d
Merge "Issue #429 added wrong cursor code" into 11-Collaboration
...
Former-commit-id: 8da45f26b25f09f55f6bb7fda1f8528da45f26b25f09f55f6bb7fda1f8529ce74d9430b7fda1f8529ce74d9430d0faddc33a2c4a62672325cf424a4284caa31cb75169c34b03
2012-03-29 14:36:24 -05:00
Steve Harris
1d35018fa3
Issue #244 Roster groups now display and improved presents.
...
Change-Id: I7965201692cab4472ce85d2525e39cf3823ab16f
Former-commit-id: 13821eae48b4aa83517dbf55bc0d8613821eae48b4aa83517dbf55bc0d86c27ee0903cbf55bc0d86c27ee0903c082c9136eb8bda505069fbdf4d5c375a22143834807547cb8d
2012-03-29 14:36:53 -05:00
Matt Nash
ef49ce6d34
Issue #429 added wrong cursor code
...
Former-commit-id: d18ed573ebc1ee2d17184e003f8723d18ed573ebc1ee2d17184e003f87233d818405324e003f87233d818405324c44a6824b3a890f0c68acf376e126219e1972901c54506eed
2012-03-29 13:46:21 -05:00
Matt Nash
d895713084
Issue #429 fix proxied handler error, added toolbar for drawing tool
...
Former-commit-id: 89b9d575ff057ffedb2389d401550a89b9d575ff057ffedb2389d401550a9beef6191789d401550a9beef61917910a9447a4fdde73906318291c4101b07f565ab99f25ebc259
2012-03-29 12:24:27 -05:00
Nate Jensen
0fa5ab5052
Issue #427 Right click on editor tab support
...
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987
Former-commit-id: a4965d6bf9202bd0adf8d2d3a245b3a4965d6bf9202bd0adf8d2d3a245b3aa000b4b06d2d3a245b3aa000b4b06274e2df5869792be406a6aae45687aac8087a21aa0c6c92587
2012-03-29 10:44:08 -05:00
James Korman
c136659e2c
Issue #232 - Added message routing/corrected roster creation
...
Former-commit-id: 08704e35ea8dde3a0798b45ea1e0a708704e35ea8dde3a0798b45ea1e0a76149d30b13b45ea1e0a76149d30b13afa5959912842b2c6f7d7f12149d98acc37a06c54527f71129
2012-03-29 10:16:15 -05:00
Steve Harris
8850e44772
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: b05701d2d70665862abe70357d90bcb05701d2d70665862abe70357d90bca0abcf812070357d90bca0abcf8120239813406d65aa72fee768845207505a310acb180a7cb5fd7a
2012-03-29 10:03:05 -05:00
Steve Harris
7780277dc6
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
...
Former-commit-id: 770ccb152094e6323c0a132d68acc6770ccb152094e6323c0a132d68acc654a1d9cdbc132d68acc654a1d9cdbc1bc33e26e62c3f9271bf4b853c56c62f6a9ef2ac0a5780c005
2012-03-29 10:01:55 -05:00
Nate Jensen
7e20b0350c
Merge "Issue #429 telestrator merging" into 11-Collaboration
...
Former-commit-id: 5999d295f4aaba32c4c1cf880ddd0d5999d295f4aaba32c4c1cf880ddd0d676746126ccf880ddd0d676746126c418fa15cc77d5d70bf55ec0896c28df809bbcb0d80ea8cc05d
2012-03-28 15:10:34 -05:00
Matt Nash
454e4e94a3
Issue #429 telestrator merging
...
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028
Former-commit-id: f5eee3d7ccb86ee8584fd55dab5c34f5eee3d7ccb86ee8584fd55dab5c3439670f6755d55dab5c3439670f67550717f545ca4871565ff0aeb022880c6ec5f3b2eaf58c0816fe
2012-03-28 15:09:18 -05:00
Nate Jensen
1b3258cdff
Issue #427 initial input event code
...
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa
Former-commit-id: dc7c88c65240dd73ba4d5fdc253d77dc7c88c65240dd73ba4d5fdc253d77bbf96992ee5fdc253d77bbf96992ee4b4b9a03ce8fbe658c89a5d38a0968454e8a72f86018238348
2012-03-28 14:34:25 -05:00
Max Schenkelberg
e6fcc458e5
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: 86d3763df066eaffb9ee15a924559286d3763df066eaffb9ee15a9245592f10f1a531915a9245592f10f1a53195fc757226ebbab188fb9ac11dd0c182f3b9f0067e73e40dc78
2012-03-28 13:32:04 -05:00
Roger Ferrel
08c8cd1244
Issue #244 Clean up and Link editor to chat now works.
...
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d
Former-commit-id: 2c61bc2a50fae15273315d95a69f392c61bc2a50fae15273315d95a69f39dc2f3316e65d95a69f39dc2f3316e6f1a9b8265cd29d2a1c929712ba2751a5b05aeebddbb7bdf9a8
2012-03-28 11:23:51 -05:00
James Korman
efff6a8028
Issue #232 - Added addition peer-to-peer events
...
Former-commit-id: 9791cc693afc99959e3ce8b23e36879791cc693afc99959e3ce8b23e3687ae6eddcd68e8b23e3687ae6eddcd68f834bf7ca2356892acd60ff25a525864be5deba5979397b7be
2012-03-27 16:31:26 -05:00
Nate Jensen
2d15b6b34b
Issue #427 minor fixes
...
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad
Former-commit-id: 1952d1fbfeab63accc61fa8b5b34001952d1fbfeab63accc61fa8b5b34000f25c8ffa6fa8b5b34000f25c8ffa6316ee943cdf1c0104885a692caba1cefe77c354230740b4e48
2012-03-27 09:56:46 -05:00
Nate Jensen
01e2a8c6ed
Issue #427 small improvements
...
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e
Former-commit-id: 2132a997ca4180979cf489d7f5ec7e2132a997ca4180979cf489d7f5ec7e80500eec9c89d7f5ec7e80500eec9c3320d18ed57d6bfd3a0b9602216cda92a9726d83e2e9fb87dc
2012-03-27 09:42:39 -05:00
Nate Jensen
8abc0aa1f6
Merge "Issue #244 Tied CollaboratonEditor to the view." into 11-Collaboration
...
Former-commit-id: 16d1762f6dfc5e53b1c2c6e046f11e16d1762f6dfc5e53b1c2c6e046f11eb2655debe8c6e046f11eb2655debe895d02a28f354469fd8b543b58266c5cc6b5250b3272563edbf
2012-03-27 08:36:25 -05:00
Nate Jensen
db3fd4abdc
Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration
...
Former-commit-id: f74079fc424d32c5e078d40b15acc2f74079fc424d32c5e078d40b15acc2d09c8a9383d40b15acc2d09c8a938340a55a68e84a2d3cd071f95cba545b4653f3dd4fe839afd355
2012-03-27 08:36:15 -05:00
Nate Jensen
df50b19661
Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
...
Former-commit-id: f9aa0e1d4c4073ba7e7d978b76066cf9aa0e1d4c4073ba7e7d978b76066ced44b0d93f978b76066ced44b0d93f811c0bff6dd62fc782918b06b022810805c13d39009ae65184
2012-03-27 08:32:19 -05:00
Roger Ferrel
f38ac43930
Issue #244 Tied CollaboratonEditor to the view.
...
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165
Former-commit-id: bd96e3040d76f9c71d41a270259553bd96e3040d76f9c71d41a270259553d001287c94a270259553d001287c949817fc22148dae35657226122319dbebbf625538027e4f4254
2012-03-26 17:30:51 -05:00
Roger Ferrel
d9b1d1715c
Issue #244 Localization of login data and removal of messanger and participant listeners.
...
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662
Former-commit-id: 05c5b5339ddf5a2662bab180f9b45e05c5b5339ddf5a2662bab180f9b45e95d8d85fd0b180f9b45e95d8d85fd09d523d8366c132fbf6418f75dd68dec06762598ecca7866880
2012-03-26 17:30:50 -05:00
James Korman
be149070fb
Issue #232 - Added JAXB serialization support
...
Former-commit-id: 56dd3e7c15fc2bd8c66672e9c2eb5256dd3e7c15fc2bd8c66672e9c2eb52221a5a65b072e9c2eb52221a5a65b083190cb431eff90a5c4b02bbe80c7c745f2565900d10f43adb
2012-03-26 16:48:04 -05:00
Nate Jensen
e1e8d6c091
Issue #427 event controllers use ISharedDisplaySession
...
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9
Former-commit-id: 1af05f177cef03821455f6226a89d91af05f177cef03821455f6226a89d9cbf105015ff6226a89d9cbf105015fe93c521327ff5fec3f09e28fc62a56b6be43d0e5e9f2d75d95
2012-03-26 16:37:44 -05:00
Nate Jensen
422f7ea302
Issue #427 fix xml serialization
...
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654
Former-commit-id: c43746bbf1e24039ae5c7c6e0a41f7c43746bbf1e24039ae5c7c6e0a41f72a1e40b2d57c6e0a41f72a1e40b2d5e10704c2faecc3dc9a70a1e2c3173dc8b94860a04605f1b00a
2012-03-26 15:47:34 -05:00
Nate Jensen
b134fa347e
Issue #427 initial role based event handling
...
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb
Former-commit-id: e76039c56ebac31f36134d7a53c583e76039c56ebac31f36134d7a53c583619d19e24c4d7a53c583619d19e24c0e9194429e998c9df26062b16fef0d2e4e0007206580f92e65
2012-03-26 13:05:01 -05:00
James Korman
79af426295
Issue #232 : Large refactor - Add command interfaces
...
Former-commit-id: a32e1d4b855bb4a7952be408ed1a28a32e1d4b855bb4a7952be408ed1a28d51a8521f8e408ed1a28d51a8521f8c442754471fb0614ad9ee83de7447b61f8b804cb551d38bee3
2012-03-26 10:17:17 -05:00
Roger Ferrel
869cbb9156
Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters).
...
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102
Former-commit-id: 8d7cad314ecd66a9c29c04b5a928388d7cad314ecd66a9c29c04b5a92838ce72b7b58304b5a92838ce72b7b58315245a25d6e649f9da42053c4ba5973f08de49fdff4822d3ef
2012-03-22 16:57:30 -05:00
Nate Jensen
b54807f36a
Issue #427 Share maps and editor
...
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c
Former-commit-id: e9b2e7089237d4401747615962f5dde9b2e7089237d4401747615962f5dd0e214bcd7c615962f5dd0e214bcd7c2ba67353248d947718542801c4fdfb98fb91164b28931de3c6
2012-03-22 09:39:59 -05:00
Bryan Kowal
db90c1809d
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
...
Former-commit-id: 69e6f682955ba68624c58a4c883e0b69e6f682955ba68624c58a4c883e0b31f989ecb48a4c883e0b31f989ecb45009de761ae27502effd81a360d139339d963f90c52c131e5c
2012-03-21 16:49:38 -05:00
James Korman
266eef93fa
Issue #232 - Delete files from original locations
...
Former-commit-id: 9c17874f374dabfd8c2a90b74b258a9c17874f374dabfd8c2a90b74b258a55f269100c90b74b258a55f269100cef3fdd7171d0976e47039badd0fb07f3f6778df25702fc837c
2012-03-20 14:55:27 -05:00
James Korman
01711bd11f
Issue #232 - Considerable refactoring/event processing
...
Former-commit-id: cbe20ea7ca60ff4d139b4ba4ccb404cbe20ea7ca60ff4d139b4ba4ccb404cc5cc2d4094ba4ccb404cc5cc2d40934eeb34b668be6351348c5e9df26c17f895ac63d9d51b9c893
2012-03-20 13:59:55 -05:00
Roger Ferrel
6730ac0a98
Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly.
...
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687
Former-commit-id: 3ea86c6609ce3b5728c51f4edd08e43ea86c6609ce3b5728c51f4edd08e4a7f1fc18b11f4edd08e4a7f1fc18b1e5a1786d4f002e7eab3f9f6642d572f58fa980f23d8af5815a
2012-03-20 10:42:57 -05:00
Greg Armendariz
399103daef
Merge "Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case." into 9-Wes2Bridge
...
Former-commit-id: f49e1f5e039a0f313c2365b8521ccbf49e1f5e039a0f313c2365b8521ccbd45249fb2f65b8521ccbd45249fb2f5a0a8b242ebf867f91d3f5c96c4af21929f1df8e249304a035
2012-03-17 10:35:17 -05:00
Bryan Kowal
1fe1eeccc6
Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case.
...
Former-commit-id: dd9c96494397cb8ab51c55a759fb8add9c96494397cb8ab51c55a759fb8a64cdd27f6255a759fb8a64cdd27f625eaec7c5eb3914878a65117306c734a01d2a17f9d7f5da6110
2012-03-16 12:16:48 -05:00
Max Schenkelberg
5706cf4610
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
...
case of "NO DATA"
Former-commit-id: a0663a2791468c812ddecd6ebd80d4a0663a2791468c812ddecd6ebd80d4b9085db25dcd6ebd80d4b9085db25d13f08a98a981bc45f071954073b38c645900727c8878a9732d
2012-03-16 10:13:31 -05:00
Max Schenkelberg
893bc3d143
Issue #358 Fixed sampling issue with mosaic resource with best
...
res resources
Former-commit-id: 1b8beb3f8d97edff9f7ccc111ab9ac1b8beb3f8d97edff9f7ccc111ab9ac258d57e825cc111ab9ac258d57e825712815ee184e81d2432c1e5c074e3ba3bda1957ce220ddf515
2012-03-16 09:03:50 -05:00
Max Schenkelberg
6b7a3c0976
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: 732c2ddb5c10b720381b719f87c261732c2ddb5c10b720381b719f87c261556a270a09719f87c261556a270a09f51a9e5571a4b859ae54ba8af4dcc1682aca1ddad585d19f48
2012-03-14 18:03:44 -05:00
David Gillingham
cc50d252a1
Issue #20 : Don't throw an exception if overriding a lower-localization
...
level's configuration (like overriding BASE's default plugin
configuration).
Former-commit-id: a1ac93704be33083c11a13af9170b1a1ac93704be33083c11a13af9170b1ed74b9058913af9170b1ed74b90589d1bf70a7be558c69401d5dac19bde90658b4049c21a13f6340
2012-03-14 15:07:59 -05:00
Nate Jensen
78a6e2b3d0
Merge "Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener" into 11-Collaboration
...
Former-commit-id: d73d150241feeb8cba7e8f8e690470d73d150241feeb8cba7e8f8e690470dc621715338f8e690470dc62171533e142a16d6677a50a5e258d785719427f88a562328e796d06de
2012-03-14 11:23:55 -05:00
Matt Nash
72bbfde15b
Issue #244 icons and login changes
...
Former-commit-id: 0e68f12509f5c9cfd285e06101f9c30e68f12509f5c9cfd285e06101f9c32fd6e28569e06101f9c32fd6e28569503b172a11d6ef74a95b5b949aeacfab5e4cb2de1236a90d7e
2012-03-14 10:54:13 -05:00
James Korman
f58209af03
Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
...
Former-commit-id: 4756721ef6ee20250305095ab0eeab4756721ef6ee20250305095ab0eeabd6003d1e71095ab0eeabd6003d1e71860d24bf25578594cdfdb29c262362072c79a5820d4ccaf2e6
2012-03-14 10:24:17 -05:00
Max Schenkelberg
42696fd296
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: 5a61f3ae238fb7eccb736e5964df9d5a61f3ae238fb7eccb736e5964df9d50765e8a346e5964df9d50765e8a34458f5970aa8f08fab0a7cf440b38846378e8c4ee9366a5f308
2012-03-14 09:49:32 -05:00
Roger Ferrel
45ae943d31
Issue #244 Close Session connction when view closed. Tighen up dialogs.
...
Change-Id: I874058fde36f521cfd4bbbf602798896b6887be5
Former-commit-id: bdc8744ea6186aac5b7797a3884017bdc8744ea6186aac5b7797a3884017c321d2aacf97a3884017c321d2aacf56421e0e85a64f2e6070b21f1555e2847456172469552760cd
2012-03-14 09:26:23 -05:00
David Gillingham
13b2df8c41
Issue #417 : Refactor HPEDhrSrv to work from a 2-stage queueing process.
...
Former-commit-id: edde99f0b87e5ec12276e13850a2b6edde99f0b87e5ec12276e13850a2b6d433b7d4d6e13850a2b6d433b7d4d69cc2c09ae53c4e90e0bf2b5588bd1e2d82185a1d69adfe2e40
2012-03-13 12:31:38 -05:00
Steve Harris
31c739aec3
Issue #16 - Recovering mpduff 9-Wes2Bridge code that fell out of a rebase while fixing a review set
...
Former-commit-id: 229fa2944d6d2af585b15bbf80a384229fa2944d6d2af585b15bbf80a38410dc1407475bbf80a38410dc1407474d58cdca1b7fc8cf3d947bdde9f690a97a9f80c9749ee2f4f4
2012-03-12 13:10:34 -05:00
