Steve Harris
|
61e2068af7
|
12.5.1-15 baseline
Former-commit-id: 244755b393 [formerly 0ca936807e ] [formerly d5c238de07 ] [formerly 244755b393 [formerly 0ca936807e ] [formerly d5c238de07 ] [formerly cee20d8656 [formerly d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]]]
Former-commit-id: cee20d8656
Former-commit-id: cd017cbb21 [formerly 31d7649939 ] [formerly 71d57ecda7503a310fc8294587521ac3d45da531 [formerly 7da9afe36a ]]
Former-commit-id: 6cb525b2e1f0b266e8a8aef21ae0d0c57440c151 [formerly ad91dc8a2e ]
Former-commit-id: ca0f3f5814
|
2012-06-11 16:02:30 -05:00 |
|
Matt Nash
|
f24e018c7e
|
issue #693 always allow to invite users after opening create session dialog
Former-commit-id: be806cfe61 [formerly 179f2d7ffe ] [formerly 9f2d97fa68 ] [formerly be806cfe61 [formerly 179f2d7ffe ] [formerly 9f2d97fa68 ] [formerly b78d86bf04 [formerly 9f2d97fa68 [formerly 204c35530bbe8c7e39749d70331ceb93c4d4a790]]]]
Former-commit-id: b78d86bf04
Former-commit-id: f632b29005 [formerly 4b5af450d1 ] [formerly 573ee429242ddd058ed5a3d6a8f2cfdb13e96669 [formerly 03ee9d8a90 ]]
Former-commit-id: e86d83eaf529b848bcf2ae0610014f8f775227c6 [formerly 3e54a2fd18 ]
Former-commit-id: c13ca2f81b
|
2012-06-11 15:34:49 -05:00 |
|
Steve Harris
|
b54ad5af66
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dc [formerly c7024992a3 ] [formerly 37793c86b1 ] [formerly 975053c3dc [formerly c7024992a3 ] [formerly 37793c86b1 ] [formerly d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]]
Former-commit-id: d325d496f5
Former-commit-id: 5e0e2d2c48 [formerly 23c34c469a ] [formerly 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213 ]]
Former-commit-id: bbdcec83196c1a64fd2e31c1e9abdcf46698ab0b [formerly 3dd5b84aa2 ]
Former-commit-id: c01b096242
|
2012-06-11 15:24:03 -05:00 |
|
Matt Nash
|
82bc8ed96f
|
Issue #693 add nws_collaborate view, and ability for default on startup or not
Former-commit-id: f3203fa469 [formerly c3b17038f9 ] [formerly 73da2b1fe8 ] [formerly f3203fa469 [formerly c3b17038f9 ] [formerly 73da2b1fe8 ] [formerly 022e982aae [formerly 73da2b1fe8 [formerly b50cfeb8633e2b9a0d2fc7bb848bbcf7d0404321]]]]
Former-commit-id: 022e982aae
Former-commit-id: c2612e2dde [formerly 945b47e29e ] [formerly 861d32c390a280d83c199cb720b2c6374e7bc9b5 [formerly d5e3c97d98 ]]
Former-commit-id: 0a56ab9472026604b58882f46ecf932176dc4bee [formerly 3a82f9690b ]
Former-commit-id: 3f528cbd85
|
2012-06-11 10:24:35 -05:00 |
|
Matt Nash
|
bc77d1a297
|
Issue #703 can change font size in sessions
Former-commit-id: 5ebc7109a7 [formerly 73ad806eb2 ] [formerly 9d187cc362 ] [formerly 5ebc7109a7 [formerly 73ad806eb2 ] [formerly 9d187cc362 ] [formerly 4b72bb3d8e [formerly 9d187cc362 [formerly 0e7af586cd96a21540263474f321bd224c45ad54]]]]
Former-commit-id: 4b72bb3d8e
Former-commit-id: aa8e09eece [formerly 11f07ec579 ] [formerly c2017b77c052809d1df4e0528806f872af4bbb29 [formerly 4453a06f31 ]]
Former-commit-id: 6afda7f78a4d01d12792cd817aa4e48730a4c6d6 [formerly 822bd01fd9 ]
Former-commit-id: 254b673be7
|
2012-06-11 10:23:45 -05:00 |
|
Matt Nash
|
52aafd94d3
|
Issue #659 make fixes to float/dock
Former-commit-id: 8acb6d3be2 [formerly 5accda84c9 ] [formerly cc5c172a77 ] [formerly 8acb6d3be2 [formerly 5accda84c9 ] [formerly cc5c172a77 ] [formerly 1f54c2d09d [formerly cc5c172a77 [formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]]]]
Former-commit-id: 1f54c2d09d
Former-commit-id: a45f167db2 [formerly b55c763a34 ] [formerly 89258ee3faab44a96efb6b9c4e30d16189f39336 [formerly ae53309d60 ]]
Former-commit-id: 1edc92caef4989e72b40b976f60a2350c9887a80 [formerly 94bc675780 ]
Former-commit-id: e1d1dbe568
|
2012-06-11 10:21:40 -05:00 |
|
Nate Jensen
|
90024af34e
|
Issue #427 fixed issues
Change-Id: I984b6ccefd84e90d0296e1b38b8dd30b241546f8
Former-commit-id: 0898ad6970 [formerly 1b03a14b23 ] [formerly db3027c0d6 ] [formerly 0898ad6970 [formerly 1b03a14b23 ] [formerly db3027c0d6 ] [formerly 14c2b1271e [formerly db3027c0d6 [formerly 64e3f77ac8ebc03c0e15c3d4ac513df78f05b00a]]]]
Former-commit-id: 14c2b1271e
Former-commit-id: 12349cb28c [formerly 00d6ab7011 ] [formerly 5ee879b8b797327bc67609b7ff31f3add788ec9a [formerly 680325f03c ]]
Former-commit-id: 551171498a9b3ed67a14e5cbc3bb9cb3b6b9a0ff [formerly 29d5237dd5 ]
Former-commit-id: 37af033b53
|
2012-06-08 16:10:57 -05:00 |
|
Nate Jensen
|
e5d058d826
|
Issue #427 remove login and event subscription code from CollaborationDataManager
Change-Id: I18a2c44a275f5180d828184001fd1c5173ea2f74
Former-commit-id: f23374c349 [formerly 8d741bc4a1 ] [formerly 05389dac56 ] [formerly f23374c349 [formerly 8d741bc4a1 ] [formerly 05389dac56 ] [formerly 28f779e7b9 [formerly 05389dac56 [formerly 2306edfd4e11b512a68320ae7dc4edbcfa474934]]]]
Former-commit-id: 28f779e7b9
Former-commit-id: 532dea1d07 [formerly d1f42605dd ] [formerly 6cae7cb8d33deb749c2a7e78231ac292ef8fc2fa [formerly 0271c9762d ]]
Former-commit-id: 160d53a81a4c9fde7867c9e162b4a74175424bed [formerly 1b76e1c855 ]
Former-commit-id: 413d929248
|
2012-06-08 15:15:03 -05:00 |
|
Steve Harris
|
46068c6716
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e ] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f ]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c ]
Former-commit-id: 39ff9954f8
|
2012-06-08 13:39:48 -05:00 |
|
Max Schenkelberg
|
8765371cc0
|
Issue #697 Made multiple editors display on single participant editor properly. Made participant editors more restrictive so they can not be attempted to be used by the perspective since they are perspective agnostic
Change-Id: I6605e82c428bda79162adaccea2808f197eba440
Former-commit-id: 8e6f278c38 [formerly b6a93f9d41 ] [formerly 49fa818762 ] [formerly 8e6f278c38 [formerly b6a93f9d41 ] [formerly 49fa818762 ] [formerly ef669a0297 [formerly 49fa818762 [formerly 20e6ddde20749721784a80a4bb78736de1140a40]]]]
Former-commit-id: ef669a0297
Former-commit-id: 1986b9d6a4 [formerly e01ed896d7 ] [formerly 8f1b1c169c1de0ff617c7d8862e91d6e58d12b04 [formerly 8a19179310 ]]
Former-commit-id: 149fc4b710ecbcf8e0b1099f1e82118fcf3645f6 [formerly 6582ca4f5a ]
Former-commit-id: edf6b8eafb
|
2012-06-07 18:22:01 -05:00 |
|
Max Schenkelberg
|
8e33a1bf07
|
Issue #697 Fixed recycling of grid vector resource, and made cursor change when drawing and only send clear_all if session leader
Change-Id: I78fbb17c7513e881ddf47d0bcd0ce8333e5740ff
Former-commit-id: 74b2579091 [formerly 9d96a272ec ] [formerly e10ece6081 ] [formerly 74b2579091 [formerly 9d96a272ec ] [formerly e10ece6081 ] [formerly 048484f689 [formerly e10ece6081 [formerly 08d8389ea3b23e7fe209d12ff45275f86d3c5883]]]]
Former-commit-id: 048484f689
Former-commit-id: 9a15a558d4 [formerly 6e55d73543 ] [formerly 59103a0ff7438a9a26c1fc5ba0937180579bbe64 [formerly 7df41dbc88 ]]
Former-commit-id: 068ef77e6f6605cd414a2045085159a84a960cce [formerly 8ef6ad5ad6 ]
Former-commit-id: c5d730e1b8
|
2012-06-07 10:25:03 -05:00 |
|
Max Schenkelberg
|
66f0444b0e
|
Issue #697 Fixed session closing issues and null pointer in gfe
Change-Id: Id12a3a15616299aaff4bc6fec72b615f1d79ef10
Former-commit-id: f7dfbc11f1 [formerly 0adccb8b12 ] [formerly 7d5d086fe1 ] [formerly f7dfbc11f1 [formerly 0adccb8b12 ] [formerly 7d5d086fe1 ] [formerly 6a0ed72e5e [formerly 7d5d086fe1 [formerly 695134c3139868d6e9ace9dca7757368e0bfa5ec]]]]
Former-commit-id: 6a0ed72e5e
Former-commit-id: e215aa65cb [formerly 57af7d8bdc ] [formerly 6f71405b33f53ae3c5d3ed12feb49683cc8698c2 [formerly 70461db99f ]]
Former-commit-id: d8dfcdcfbdea7b43157fd7c71b22db70e211e8f5 [formerly 0eb6e89fb3 ]
Former-commit-id: f3e91d1717
|
2012-06-07 09:44:40 -05:00 |
|
Max Schenkelberg
|
01f800dc74
|
Issue #697 Added support for procedure loading which magically made swapping appear to work too
Change-Id: I86c69781514709df4c6a23bdabfb63a2c103a9ed
Former-commit-id: 1c36bb0a04 [formerly 492adb92ae ] [formerly e0b7693686 ] [formerly 1c36bb0a04 [formerly 492adb92ae ] [formerly e0b7693686 ] [formerly 0776af95e7 [formerly e0b7693686 [formerly e1bf6a3b576da036478cd1415856a64ebc606640]]]]
Former-commit-id: 0776af95e7
Former-commit-id: 32fe5ad6ff [formerly e682032d0c ] [formerly efc77b17d107a2e211c557e51b3d4c280bb5087f [formerly d5fd024fd6 ]]
Former-commit-id: f58a1e85bfaa31537b9b561ece56674eb4acb118 [formerly 04ab6c7c4e ]
Former-commit-id: 6b5e48d697
|
2012-06-06 15:57:16 -05:00 |
|
Matt Nash
|
62a48e041d
|
Issue #659 fix GFE issue with mouse handlers
Former-commit-id: 45cb41faed [formerly 0e3b539ada ] [formerly c4d26f8b1b ] [formerly 45cb41faed [formerly 0e3b539ada ] [formerly c4d26f8b1b ] [formerly ed0b70501f [formerly c4d26f8b1b [formerly 43f277de57d148c2d742266d8346b9b93cbcb82f]]]]
Former-commit-id: ed0b70501f
Former-commit-id: c4db1d3d30 [formerly fef4b5d8af ] [formerly be9d7bfb290d8dd29973c5e43b3df9db459cc72a [formerly e99cd89281 ]]
Former-commit-id: 61ded76c1672a01b3af57a59569a51f7e230a4d7 [formerly 3d8f99e127 ]
Former-commit-id: 96372489d4
|
2012-06-06 14:13:55 -05:00 |
|
Max Schenkelberg
|
cddce41572
|
Issue #590 Fixed gfe edit area selection issue
Change-Id: I67029301f515583a7ca3eea408513d9310e3fd35
Former-commit-id: d1f1f5106c [formerly 2750c4ba08 ] [formerly b8bedd1247 ] [formerly d1f1f5106c [formerly 2750c4ba08 ] [formerly b8bedd1247 ] [formerly fbd269f4c7 [formerly b8bedd1247 [formerly 6588f58c80782f793c3621a2fd7ec81be2d1ead2]]]]
Former-commit-id: fbd269f4c7
Former-commit-id: a5ad37d88e [formerly 66f39cc77b ] [formerly 48f93d8d755b8432050fe2aca67e0fe5ae3bf206 [formerly 13bd18829f ]]
Former-commit-id: 0815beac2fd99ee771fd42e46ff1d4c6d3489bae [formerly c6ebaebf1a ]
Former-commit-id: 7296fc3a91
|
2012-06-06 12:05:47 -05:00 |
|
Bryan Kowal
|
a2edb47d13
|
Issue #691 - All scripts, directories that used to include wes2bridge in the name have been renamed to edex-environment. The edex wes2bridge rpm has been renamed to the awips2-edex-environment rpm.
Former-commit-id: 8366f5bffa [formerly 3478f30891 ] [formerly b8622629e3 ] [formerly 8366f5bffa [formerly 3478f30891 ] [formerly b8622629e3 ] [formerly c0db02e377 [formerly b8622629e3 [formerly 478e494673d498121cab732717f3fc399a0b0c03]]]]
Former-commit-id: c0db02e377
Former-commit-id: 1397ac4ae6 [formerly 733b34202f ] [formerly b02340a5b6e6f0e27447ad5a1f532ed0a3b37d18 [formerly d92eb0c227 ]]
Former-commit-id: a5cf683e790b615a5bad87dc4f842fa91d4710a1 [formerly 2b48d12f7c ]
Former-commit-id: 89a427c142
|
2012-06-05 16:55:52 -05:00 |
|
Max Schenkelberg
|
00ec4036a7
|
Issue #590 fixed GFE session creation bugs. Added refresh to tool items
on undo/redo from keyboard
Former-commit-id: 603726498f [formerly f0e2ef8c91 ] [formerly b5da470e0a ] [formerly 603726498f [formerly f0e2ef8c91 ] [formerly b5da470e0a ] [formerly 8b87b6a0a1 [formerly b5da470e0a [formerly 5c3d4a7fffe3873afbe8db60310afae2b3f0738b]]]]
Former-commit-id: 8b87b6a0a1
Former-commit-id: 4fe4709862 [formerly af72c6411a ] [formerly 1b3f753ea0cf2015ee33e8f1e26d5a3ddf66eec2 [formerly a6ca2ee4f6 ]]
Former-commit-id: b94f4e93217e51045854356a11935c614f1c67fc [formerly 55949aef25 ]
Former-commit-id: 4618dc9b94
|
2012-06-05 16:43:27 -05:00 |
|
Brad Gonzales
|
f86231b85c
|
Issue #639 fixed archive log view secondary id.
Former-commit-id: 49d56f5c0e [formerly 9c099c7931 ] [formerly 40a0e03b2d ] [formerly 49d56f5c0e [formerly 9c099c7931 ] [formerly 40a0e03b2d ] [formerly 67e225e341 [formerly 40a0e03b2d [formerly 69c774abf417049ffc343ff8ba5d2e44d05bb2e7]]]]
Former-commit-id: 67e225e341
Former-commit-id: 3e52d57e9b [formerly b8d677faf0 ] [formerly 5594404e690dce440a5b135f298b8663ebe62f57 [formerly 6be2a8435a ]]
Former-commit-id: 1851f2a05961d75f23d5785a56d64290c9c44f30 [formerly 14bd74c9fa ]
Former-commit-id: b2874a182e
|
2012-06-05 15:14:42 -05:00 |
|
Max Schenkelberg
|
3eeef7434c
|
Issue #664 Changed hydro legend resource to be system resource
Change-Id: I769463a967ee1ec76a9a3c09d48d27106caa0937
Former-commit-id: dc92eaa3f0 [formerly dbb8a6b93d ] [formerly 3cd4f75170 ] [formerly dc92eaa3f0 [formerly dbb8a6b93d ] [formerly 3cd4f75170 ] [formerly 85a7897b1e [formerly 3cd4f75170 [formerly 9a726e2686e7ed79c1a436156a16e98083608e14]]]]
Former-commit-id: 85a7897b1e
Former-commit-id: 74dd7173a0 [formerly a8e2e4c8c1 ] [formerly 14b5ed35874d5152f32ea760356e95afc51ea0f1 [formerly f5c8240c92 ]]
Former-commit-id: e11e7f8efa62b04eaa375d0fbd85008d42dfcce7 [formerly 69b203439e ]
Former-commit-id: 58c5d00acd
|
2012-06-05 13:44:48 -05:00 |
|
Matt Nash
|
5e7f692599
|
Issue #659 toolbar is in session view now
Former-commit-id: ca96492c0e [formerly 373db85359 ] [formerly 00f55c1d80 ] [formerly ca96492c0e [formerly 373db85359 ] [formerly 00f55c1d80 ] [formerly e43fee4483 [formerly 00f55c1d80 [formerly a516cc2073fa33c88f13678a55dda4bdbe3ed120]]]]
Former-commit-id: e43fee4483
Former-commit-id: 75ed94c837 [formerly f2d8da6b3d ] [formerly da5e2155fd0c122d5fa28bd9148319c145e52549 [formerly 304970e9a9 ]]
Former-commit-id: 5815b03d7aeb9b323b021b49931945dec8afc46f [formerly 637cbca41c ]
Former-commit-id: d47328be4a
|
2012-06-05 13:25:36 -05:00 |
|
Nate Jensen
|
6acea0f3d3
|
Issue #427 cleanup
Change-Id: Ieeb03e0f7457ee7dceb6241b61340e364b5aab48
Former-commit-id: db2ec4654a [formerly 9d713d849c ] [formerly 7f6bc2df93 ] [formerly db2ec4654a [formerly 9d713d849c ] [formerly 7f6bc2df93 ] [formerly 240dac19ba [formerly 7f6bc2df93 [formerly 49d468829654697d266a551452edf6a2de66edce]]]]
Former-commit-id: 240dac19ba
Former-commit-id: 6990dca585 [formerly dcfbaad52e ] [formerly daca464091d7f32b740299264679b52db6886081 [formerly 6557fe0688 ]]
Former-commit-id: 225f67d2ffac7d488eacd3d9dd9f92cddd00835a [formerly 03607065a5 ]
Former-commit-id: 590a40ac9f
|
2012-06-05 10:50:08 -05:00 |
|
Matt Nash
|
6719cb0b92
|
Issue #642 fixing merge mistake
Former-commit-id: 0e17f1ac3e [formerly e27578206e ] [formerly 77d150bf6c ] [formerly 0e17f1ac3e [formerly e27578206e ] [formerly 77d150bf6c ] [formerly 4cc721ebf5 [formerly 77d150bf6c [formerly 2e699d0cd90d2f61ff211b601300ab17cf9c5a40]]]]
Former-commit-id: 4cc721ebf5
Former-commit-id: a20d265fdb [formerly 414845eda9 ] [formerly 6e0940e296eb339f268b6cfe24ad0db3aacc0f55 [formerly 7915f5edf2 ]]
Former-commit-id: f819a52e655ffb0f446fed8fe7ede3fe8832b08e [formerly 4b139f6f81 ]
Former-commit-id: 35b35a0696
|
2012-06-04 09:25:13 -05:00 |
|
Matt Nash
|
d0a7b24dc4
|
Issue #642 removing update code
Former-commit-id: 8dc41a6113 [formerly 8f16eecde5 ] [formerly acc5d69e59 ] [formerly 8dc41a6113 [formerly 8f16eecde5 ] [formerly acc5d69e59 ] [formerly 2935d69e4f [formerly acc5d69e59 [formerly 510ca9d1234dba1b4e76f05536fb24c7fd693a76]]]]
Former-commit-id: 2935d69e4f
Former-commit-id: eaa81cca2a [formerly c3732cc601 ] [formerly d623d1048c42e0acf912eb320e867173ced61e5b [formerly 2a476c6ce8 ]]
Former-commit-id: 936ea6b7fa14c77560286c034bcb4f30ab723ad9 [formerly ca4c0baa6e ]
Former-commit-id: f94bff689f
|
2012-06-04 09:13:23 -05:00 |
|
Matt Nash
|
79dcb599c2
|
Issue #642 alert words now filter what directory is shown
Former-commit-id: 7bd08cc999 [formerly e8355a9a2b ] [formerly 82cad97932 ] [formerly 7bd08cc999 [formerly e8355a9a2b ] [formerly 82cad97932 ] [formerly c5509344e9 [formerly 82cad97932 [formerly df7971ed32994f6ac52ac10fcb03945d57eb5872]]]]
Former-commit-id: c5509344e9
Former-commit-id: b7c717e60b [formerly 925c06ed36 ] [formerly 3b35f9e8cdbc0d41118da9922d21f05d946a56ec [formerly b3a948cca6 ]]
Former-commit-id: 393c42f57f6bb5dcbd57108ebd7796f4bad0620d [formerly 3d3477a213 ]
Former-commit-id: 258e64971b
|
2012-06-04 07:33:30 -05:00 |
|
Brad Gonzales
|
92b9e6a19f
|
Issue #639 fixed the previouse and next selection listeners, and renamed an inner class in the SearchComposite.
Former-commit-id: 623186f036 [formerly 08ad661af4 ] [formerly 4135176198 ] [formerly 623186f036 [formerly 08ad661af4 ] [formerly 4135176198 ] [formerly b0794e5e55 [formerly 4135176198 [formerly 31b09e378571ce6f8b4a6bd99cfb49b3d8b51045]]]]
Former-commit-id: b0794e5e55
Former-commit-id: adb5d60788 [formerly 97602f8882 ] [formerly e111f61c472e5446d0b577b82b6c74cd62b64d5e [formerly 52ae0ebb1a ]]
Former-commit-id: 88a43b3b554c76df3a5e9e9e503414f3ae386f41 [formerly 0e0d82e3d0 ]
Former-commit-id: 0628482212
|
2012-06-03 10:53:31 -05:00 |
|
Brad Gonzales
|
fc8f70ab17
|
Issue #639 adding new files missed in last commit
Former-commit-id: d668776eac [formerly 00d014b2f2 ] [formerly 3795f90712 ] [formerly d668776eac [formerly 00d014b2f2 ] [formerly 3795f90712 ] [formerly 4e7ce90c42 [formerly 3795f90712 [formerly 26ada47164c9b004cff5e869735ee11655af6a40]]]]
Former-commit-id: 4e7ce90c42
Former-commit-id: 31bbb10f1f [formerly c4f46ca508 ] [formerly c550c28b269dfe2d3ee94db9f77d29835fff2e35 [formerly 48f639d9ac ]]
Former-commit-id: 8bad1cc6bc72cfefc5492722e42228d01cc1a2f8 [formerly c7db897586 ]
Former-commit-id: f106d74f0c
|
2012-06-01 18:20:24 -05:00 |
|
Brad Gonzales
|
54f6ad9785
|
Issue #639 added view for collaboration chat logs. added search control for logs, sessions, and chats
Former-commit-id: 4b92af0873 [formerly d8c4230045 ] [formerly 78e44746d6 ] [formerly 4b92af0873 [formerly d8c4230045 ] [formerly 78e44746d6 ] [formerly 60276e49e8 [formerly 78e44746d6 [formerly e72e6741925cff7821816daf208cf2a1da5229ce]]]]
Former-commit-id: 60276e49e8
Former-commit-id: bd3166956e [formerly 476aa27464 ] [formerly cc745f96beaef57be56ad7d90c157f71cc100639 [formerly 66040f56b4 ]]
Former-commit-id: 58bba0c9cbdcdec2a744394b23554b20aca63194 [formerly 2955e85a78 ]
Former-commit-id: 03171ddda2
|
2012-06-01 18:18:11 -05:00 |
|
Max Schenkelberg
|
245d15c4f2
|
Issue #664 fixed name vs id text for dam resource
Change-Id: I1fd50dde00cdf7fa35ba9eda93721d132a6dfbd5
Former-commit-id: d4a11987b2 [formerly 6bd5b967bf ] [formerly 5057c05529 ] [formerly d4a11987b2 [formerly 6bd5b967bf ] [formerly 5057c05529 ] [formerly 4dec649a97 [formerly 5057c05529 [formerly a0481db7ccee2f656362ba63424af3c4aa49277b]]]]
Former-commit-id: 4dec649a97
Former-commit-id: 9aeaa9e747 [formerly af62a3ef80 ] [formerly a7503690f1b4eb563beaab057b085fd5aebd0f2a [formerly 8480dbbd75 ]]
Former-commit-id: 93af68e410e97b9f2f705bfc3208bb9d5b28913e [formerly f5b7de2568 ]
Former-commit-id: 1ae1285e5c
|
2012-06-01 14:36:44 -05:00 |
|
Max Schenkelberg
|
343449b750
|
Issue #664 Made hydro dam resource work with collaboration
Change-Id: If6d422a937a549c9f68b8c523553179924ac2d7a
Former-commit-id: 2b2d629341 [formerly b5d8d071de ] [formerly b0f729ceb2 ] [formerly 2b2d629341 [formerly b5d8d071de ] [formerly b0f729ceb2 ] [formerly 7b95887a24 [formerly b0f729ceb2 [formerly a3bfc9f4014a417205c27bbd73fc07556df007bc]]]]
Former-commit-id: 7b95887a24
Former-commit-id: 1d189e46be [formerly cc74f57e1b ] [formerly 0d1c1dded3d77399e1810864ba8858e4d528e324 [formerly 9c3805b762 ]]
Former-commit-id: fccb60e1ebee61a9de1ed75535345c8286c7d185 [formerly 1e45b28479 ]
Former-commit-id: f6960e1738
|
2012-06-01 14:21:55 -05:00 |
|
Max Schenkelberg
|
b204fe5f11
|
Issue #664 Got Hydro MultiPointResource drawing efficiently and working in shared display
Change-Id: I940cfaab17edfdd84d6b09b5c93e30b8f075a822
Former-commit-id: 7ae9376eb0 [formerly 1d9ccb6bd3 ] [formerly fde1e68df6 ] [formerly 7ae9376eb0 [formerly 1d9ccb6bd3 ] [formerly fde1e68df6 ] [formerly 052cc81223 [formerly fde1e68df6 [formerly a375cddf31565d6584256d2ccbe4dbea5a5ec187]]]]
Former-commit-id: 052cc81223
Former-commit-id: 64e44d4a74 [formerly 86f03dfdc3 ] [formerly 9c9fd2fe958ad90f7350440a18275599b07f8a98 [formerly d4dcc0e12e ]]
Former-commit-id: d872a796d7cc0eaee9d104d2c0573a8afd609518 [formerly e2ebc0fb30 ]
Former-commit-id: 648b22f31b
|
2012-05-31 16:05:25 -05:00 |
|
Matt Nash
|
18d851a519
|
Issue #659 float button for cool detachable functionality
Former-commit-id: bfcfcba572 [formerly 2b1ce9e674 ] [formerly 855193aa77 ] [formerly bfcfcba572 [formerly 2b1ce9e674 ] [formerly 855193aa77 ] [formerly cab515cbfd [formerly 855193aa77 [formerly 9b1c62c4851f95ad270b58ceacf756a616f7c136]]]]
Former-commit-id: cab515cbfd
Former-commit-id: 0a225b2540 [formerly 945095e345 ] [formerly 8443892ca2884191c2aab260370223421cc04482 [formerly 633fd997e5 ]]
Former-commit-id: 66ad3ad98cf5e3de70cd7c9fd86b9687c9ce52e4 [formerly 22eb377b74 ]
Former-commit-id: 927b2967d7
|
2012-05-30 16:13:21 -05:00 |
|
Matt Nash
|
a265aa4056
|
Issue #440 fixes in group view
Former-commit-id: 934b5548e8 [formerly 414c552462 ] [formerly ad3f6cd8ad ] [formerly 934b5548e8 [formerly 414c552462 ] [formerly ad3f6cd8ad ] [formerly 7065ea8107 [formerly ad3f6cd8ad [formerly c4123b42e9078f2c5975da38d2aa6737348afa8a]]]]
Former-commit-id: 7065ea8107
Former-commit-id: 0935b78c81 [formerly dbcb9b7b87 ] [formerly a53bf12b6e9857192417b7b103e70c8c8a489e51 [formerly 2f7a2747aa ]]
Former-commit-id: 108cfe8c451d5853b48fa60cb43f7abe7c37c9f6 [formerly 77b210c155 ]
Former-commit-id: 02ab07f89a
|
2012-05-30 16:13:21 -05:00 |
|
Nate Jensen
|
c4665043ec
|
Merge "Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session"." into 11-Collaboration
Former-commit-id: 97f3b93b17 [formerly 06970f4d82 ] [formerly 8eb5665591 ] [formerly 97f3b93b17 [formerly 06970f4d82 ] [formerly 8eb5665591 ] [formerly ac95fde3e5 [formerly 8eb5665591 [formerly 34be3aaf6ea41ae8366d072723c3beb8151d1f84]]]]
Former-commit-id: ac95fde3e5
Former-commit-id: f158a33f6e [formerly 71d38a3598 ] [formerly fa4b356a7701d47af73e47d0df7aae4c3477a883 [formerly d4ba003ce0 ]]
Former-commit-id: 289a53cabcc7711fed4ecdea5ae55e3bda8cc0af [formerly e4e9a8b6ba ]
Former-commit-id: 3bbdc214e0
|
2012-05-29 17:23:56 -05:00 |
|
Max Schenkelberg
|
887f619d39
|
Issue #665 fixed bug with lat/lon vs pixel space for inspect
Change-Id: I038f9fec306e81725932ed5a17db885d251fed73
Former-commit-id: 5ecc2f0362 [formerly 71fe0a468a ] [formerly 1934bfa28c ] [formerly 5ecc2f0362 [formerly 71fe0a468a ] [formerly 1934bfa28c ] [formerly 76e99b4037 [formerly 1934bfa28c [formerly 2be9620b338140fa27efba037d0cc321558bec62]]]]
Former-commit-id: 76e99b4037
Former-commit-id: 5e035d82b0 [formerly 4c65ff8c20 ] [formerly 60d885f3aac6c4e8e800d995c806f7287cce1bd5 [formerly 8f377d3fb8 ]]
Former-commit-id: 8f7b1885710aa49225c4c3ef50755dc6be586fd9 [formerly 01a1c14349 ]
Former-commit-id: 6739195793
|
2012-05-29 15:15:05 -05:00 |
|
Max Schenkelberg
|
f38f42248a
|
Issue #665 Made MPEGageResource use bulk rendering for strings and points for faster shared display rendering
Change-Id: I7a734784895d406ba769f558d4b321dfe3b8dbf9
Former-commit-id: 729765ef7c [formerly fe9de50746 ] [formerly 34a71dbee8 ] [formerly 729765ef7c [formerly fe9de50746 ] [formerly 34a71dbee8 ] [formerly c28a586d84 [formerly 34a71dbee8 [formerly 18ca6f058d810781d93ea2d0bad9b2daa161fa3a]]]]
Former-commit-id: c28a586d84
Former-commit-id: 0deb0c8ad7 [formerly ddfb7e038a ] [formerly c5e0680df1ac06ccbd3c1d516375f8cc28eaa8e3 [formerly 2cde39bc63 ]]
Former-commit-id: 77520397e340b908efa2aafea23857cdeec383b0 [formerly e3ad085501 ]
Former-commit-id: 925845cff9
|
2012-05-29 15:00:42 -05:00 |
|
Bryan Kowal
|
12e7dd5cfc
|
Issue #595 - only the "Create Shared Display Session" checkbox will be disabled and unchecked until the httpd collaboration configuration information is received. Changed the checkbox description to read "Create Shared Display Session".
Change-Id: Ie7e419bc47a2451eef5a25456fa767fc0156cc27
Former-commit-id: c4855990d1 [formerly af04bfc6d8 ] [formerly 14386ad818 ] [formerly c4855990d1 [formerly af04bfc6d8 ] [formerly 14386ad818 ] [formerly 25b2361923 [formerly 14386ad818 [formerly 904a05e94386bd9d71a357e374ed3c757dc08016]]]]
Former-commit-id: 25b2361923
Former-commit-id: 128cdfd0e7 [formerly 961d5976d1 ] [formerly 551d648482741f13c7f568f5f2f17971e861b7c2 [formerly 0692230344 ]]
Former-commit-id: 60ca54d14c7a5e67527331683c219e18e5f8576f [formerly 27cd0fe325 ]
Former-commit-id: 584d3c0319
|
2012-05-29 13:06:36 -05:00 |
|
Max Schenkelberg
|
897163c659
|
Issue #663 Removed references from ISerializableObject file
Former-commit-id: 937d320dee [formerly d071f7ea11 ] [formerly 76db032da7 ] [formerly 937d320dee [formerly d071f7ea11 ] [formerly 76db032da7 ] [formerly fec288d4bd [formerly 76db032da7 [formerly 95da08aeabcc06f5ab46963cf4be4fb54457ff43]]]]
Former-commit-id: fec288d4bd
Former-commit-id: 1ead64f31d [formerly 643c262998 ] [formerly ab7adbd50e845f6abb7bab9d48313acb940d1a4e [formerly 5e8f886155 ]]
Former-commit-id: fd12b864974ae743a594da53f3385f32f9c578d4 [formerly fbc5c4cfda ]
Former-commit-id: efa296956a
|
2012-05-29 09:10:48 -05:00 |
|
Max Schenkelberg
|
8c2ef826f8
|
Issue #663 Fixed key binding issue, added cursor icon change when tool is selected
Change-Id: I9040da01355e64208ef54ccc6d8452ab57c9d3c5
Former-commit-id: 36e108140d [formerly 04c9f3a1c8 ] [formerly 8c9c33ef9f ] [formerly 36e108140d [formerly 04c9f3a1c8 ] [formerly 8c9c33ef9f ] [formerly 2058b7f0ea [formerly 8c9c33ef9f [formerly 5c240b5224ee93a36c5e05ddb15b373645222081]]]]
Former-commit-id: 2058b7f0ea
Former-commit-id: ff48e60e71 [formerly ea408d8f42 ] [formerly f9f5faca5e4cc74eac5d37b68930a1ee8dc9cbd2 [formerly 11cb7bafb0 ]]
Former-commit-id: 805ef94a86fc7e26b7ff4456d8b831a75f703b15 [formerly 0222587b96 ]
Former-commit-id: 761ea9a414
|
2012-05-25 16:28:53 -05:00 |
|
Max Schenkelberg
|
0d08899cfd
|
Issue #663 Commented out drawing tool loading from group view and removed transfer role code
Change-Id: Ie910b19d477a1281231486bc8f96083ea7598a0b
Former-commit-id: 3b97bf162d [formerly f7183f8212 ] [formerly 7bae56e8b5 ] [formerly 3b97bf162d [formerly f7183f8212 ] [formerly 7bae56e8b5 ] [formerly 854f41eb7f [formerly 7bae56e8b5 [formerly 209d658e61d7b595d4effbfb87f65b87a5f196a9]]]]
Former-commit-id: 854f41eb7f
Former-commit-id: e9635706b2 [formerly e4350ca0ae ] [formerly 68a5acf2c3b4dc3c78c038bc3a9aa7431b0ede69 [formerly d380895c56 ]]
Former-commit-id: 4af00f0f047bf73ff2daa4f9dcd9e5e6c46e71d1 [formerly 079a247ee5 ]
Former-commit-id: 6e5e2b500e
|
2012-05-25 15:24:18 -05:00 |
|
Max Schenkelberg
|
2776711360
|
Issue #663 Fixed clearing of display in D2D, resources can now be specified to be readded when unloaded during a session
Change-Id: I77b448ad4af60bf8d1afb3b50a5575ad82c4ae22
Former-commit-id: d0b1715059 [formerly 2838c08685 ] [formerly 8773dbdf62 ] [formerly d0b1715059 [formerly 2838c08685 ] [formerly 8773dbdf62 ] [formerly f6f2e1a4fb [formerly 8773dbdf62 [formerly d15821c57b49090863e9c22455d06c94da6fcaf9]]]]
Former-commit-id: f6f2e1a4fb
Former-commit-id: 77d88a48fd [formerly c2c035a2e0 ] [formerly 388e4b65631b714ebb63610982ae70dc006d8f39 [formerly dec7ce3551 ]]
Former-commit-id: c0dcb1e090c41a6c2ff98a4ee27164627865e7f4 [formerly 8fd526dcf3 ]
Former-commit-id: b12e6a3add
|
2012-05-25 14:37:25 -05:00 |
|
Bryan Kowal
|
344e7567ae
|
Issue #595 - openfire will now supply the httpd-collaboration port when a user successfully logs in. The port will be stored as part of the CAVE configuration. Change-Id: I76c8ce94ef140d8bb8b608dd07b59b89f1607d16
Change-Id: I5350ed2293b78a743fc0e5b4cd9bcd6f02eafbd1
Former-commit-id: 3149e73d76 [formerly 8ee68911fb ] [formerly a808bc245f ] [formerly 3149e73d76 [formerly 8ee68911fb ] [formerly a808bc245f ] [formerly 0f0bab6e54 [formerly a808bc245f [formerly f4ac8e99d3f2f98af4ea5f383630395705e6da96]]]]
Former-commit-id: 0f0bab6e54
Former-commit-id: 304ce341b8 [formerly b817484c67 ] [formerly 1d8ed9e871f8274a9db57fa6db67ccd77f68abfa [formerly 0211167d87 ]]
Former-commit-id: e6a8df53928cd8442f4e71b1f738aa3bf1de31b5 [formerly e7f2ec38b5 ]
Former-commit-id: e5fd40d59e
|
2012-05-24 16:51:35 -05:00 |
|
David Gillingham
|
b5707264ae
|
Issue #647: Ensure insert time is updated when processing backdated
redbook data, address peer review comment.
Change-Id: I38ac6fbeaac995fe359d1bfd3a76156d7180962e
Former-commit-id: 46fbfbfeb5 [formerly ff34c58b1b ] [formerly 09dcd35e4a ] [formerly 46fbfbfeb5 [formerly ff34c58b1b ] [formerly 09dcd35e4a ] [formerly db75f1860b [formerly 09dcd35e4a [formerly 66acc08555383a5888864e58fd5fe2d7625ee87c]]]]
Former-commit-id: db75f1860b
Former-commit-id: c4330c67df [formerly f1343b9a6e ] [formerly f7afd5d624653b95848fcb61d09be11d28dfd125 [formerly 6efe780ad6 ]]
Former-commit-id: 42f0bfbba80f23ad0b01bf6a3ddc91fdca285fc9 [formerly be3b7a994f ]
Former-commit-id: 7af4c62015
|
2012-05-24 14:54:17 -05:00 |
|
David Gillingham
|
4a34bc1de8
|
Issue #647: Ensure records with the same data URI get archived only
once, implement PerisistableDataObject.getIdentifier and setIdentifier
for StdTextProduct.
Former-commit-id: 343f42b325 [formerly 855745db06 ] [formerly 95e1582a22 ] [formerly 343f42b325 [formerly 855745db06 ] [formerly 95e1582a22 ] [formerly 34303477ac [formerly 95e1582a22 [formerly 0692f9923e450c9b7e62b044b122aad7323991ba]]]]
Former-commit-id: 34303477ac
Former-commit-id: 0f2ea852c0 [formerly 031558955d ] [formerly b60770ef8afdb543546f259cf39a697319e6bd73 [formerly 9dabcca4f8 ]]
Former-commit-id: c13024cc350d0e7bf29490ff88e0a740efb36c03 [formerly 1e4fd039ef ]
Former-commit-id: bba1f5d494
|
2012-05-23 15:49:49 -05:00 |
|
Max Schenkelberg
|
837e2ec68f
|
Issue #239 Got IColormapShadedShapeExtension implemented
Change-Id: Idb2b5a894530b739cd8b00f8f3b294f186d5143f
Former-commit-id: 08140e9b63 [formerly c98b6e28c7 ] [formerly ae8236aa21 ] [formerly 08140e9b63 [formerly c98b6e28c7 ] [formerly ae8236aa21 ] [formerly 1c11323103 [formerly ae8236aa21 [formerly 6ddfe51e93d62145678d87ed3db208e90d3146e3]]]]
Former-commit-id: 1c11323103
Former-commit-id: 9cb3b84ce3 [formerly d0d619b048 ] [formerly 4a28dfac37939215f47adb67f15bbc9eadc8a631 [formerly 696c2f4894 ]]
Former-commit-id: 4b11afb7f6df142dc0c5694ce99fc748e00197fb [formerly f2bd302796 ]
Former-commit-id: e80b6c8dce
|
2012-05-23 09:14:21 -05:00 |
|
Max Schenkelberg
|
cf35b993e2
|
Issue #239 Moved initialization code in GFE resources so recycle() works properly
Change-Id: I3a4e1f18a7246af504a6d1ce791bd94ab1f721d5
Former-commit-id: 2374bc2d88 [formerly 4c0a18894c ] [formerly e81a9ee935 ] [formerly 2374bc2d88 [formerly 4c0a18894c ] [formerly e81a9ee935 ] [formerly 52a78af98c [formerly e81a9ee935 [formerly 1f092691e6e43bd8f6d10c2b8fab0a68eca38992]]]]
Former-commit-id: 52a78af98c
Former-commit-id: 7c014c9fbe [formerly da46b6efc0 ] [formerly 2583d28f688819b8221f8f2dd83602f8e821e9da [formerly 7b7e708092 ]]
Former-commit-id: c4d37a6c123268080cd08ec3650c858729cfd260 [formerly 4e9971aac6 ]
Former-commit-id: 2d9ccfe9ce
|
2012-05-22 09:56:27 -05:00 |
|
Steve Harris
|
17403e71d1
|
12.5.1-9 baseline
Former-commit-id: 45773fbee0 [formerly b8de76b45e ] [formerly 8f3c9ebfb7 ] [formerly 45773fbee0 [formerly b8de76b45e ] [formerly 8f3c9ebfb7 ] [formerly 1f542697cb [formerly 8f3c9ebfb7 [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]]]
Former-commit-id: 1f542697cb
Former-commit-id: dbedcc229c [formerly d23b0e4d60 ] [formerly 7f45c65c47eed82c8ae433d59f2e859d5e1df5a0 [formerly ce0422a34a ]]
Former-commit-id: 6decc15480698e9232071e71afd1e40f6e166fd7 [formerly 399c00d295 ]
Former-commit-id: ee7b53c7c4
|
2012-05-21 17:48:55 -05:00 |
|
David Gillingham
|
3fdae10940
|
Issue #649: Make compression of archived Java objects optional.
Former-commit-id: 173f110759 [formerly 513d0e6280 ] [formerly 05a58dadf1 ] [formerly 173f110759 [formerly 513d0e6280 ] [formerly 05a58dadf1 ] [formerly 28bdf26f2e [formerly 05a58dadf1 [formerly 289955cec3396a6f7eae2b3d24dc91ec5beca46a]]]]
Former-commit-id: 28bdf26f2e
Former-commit-id: ecd4a38f1d [formerly f58f89dce7 ] [formerly 3c92cf8d75938c1b8f2275e81faa2c0c0ce0d249 [formerly f5fe7e6be7 ]]
Former-commit-id: 7a3cdda248cceb6507f948757eb9a940be42da69 [formerly 6fe5d0cdaf ]
Former-commit-id: 2326b069c7
|
2012-05-21 16:48:02 -05:00 |
|
Max Schenkelberg
|
b5b9c5b0d5
|
Issue #239 Cleaned up DispatchingWireframeShape code to send world coordinates separate from pixel coordinates
Change-Id: I1c7eb9b19ea8d816eb3e81901ecf5574877a5212
Former-commit-id: 73c1fab95f [formerly 950f857a5f ] [formerly 9c1f14a0a6 ] [formerly 73c1fab95f [formerly 950f857a5f ] [formerly 9c1f14a0a6 ] [formerly 2bc9a18957 [formerly 9c1f14a0a6 [formerly 0a3d69b5bb8ca31d8db8148225f7e1ef85778919]]]]
Former-commit-id: 2bc9a18957
Former-commit-id: 6b81141c34 [formerly 49f1572bc5 ] [formerly ec32c1b28845aedc93d98a5390d8d0eaa4ca093e [formerly 084511ab6a ]]
Former-commit-id: f3aae75ead1028e08eb993a33330fe0f7ae26f93 [formerly 7a65366028 ]
Former-commit-id: 501783794b
|
2012-05-21 14:57:37 -05:00 |
|
David Gillingham
|
13e96f02e1
|
Issue #646: Fix NullPointerException when decoding Level3 radar products
introduced by previous change.
Change-Id: I3689e003e367be2b69033f13f1744c381d597616
Former-commit-id: c11202e8a2 [formerly 32799c46d2 ] [formerly 94a4cbd107 ] [formerly c11202e8a2 [formerly 32799c46d2 ] [formerly 94a4cbd107 ] [formerly 7c84c67c67 [formerly 94a4cbd107 [formerly 979f8dc3c1fb72e0275607bd26a1ee492ea11ba4]]]]
Former-commit-id: 7c84c67c67
Former-commit-id: 40a1b95aae [formerly f3ac7a8090 ] [formerly 161e67d1bd498003c78fb1e4f4808adf3a46bb50 [formerly 8d877d7784 ]]
Former-commit-id: 0c99a5b20a91764c5aa9876e2624b5d61aa60728 [formerly e048d60ff7 ]
Former-commit-id: 99b80900e4
|
2012-05-21 13:10:10 -05:00 |
|
Matt Nash
|
95a6323db0
|
Issue #642 match longest keyword
Former-commit-id: 9f7eb7f108 [formerly 116ba7901f ] [formerly 94746c169e ] [formerly 9f7eb7f108 [formerly 116ba7901f ] [formerly 94746c169e ] [formerly eabc2032b4 [formerly 94746c169e [formerly 1dc9f3ad1f5c68dbe6a515eb990f23a8f20139d6]]]]
Former-commit-id: eabc2032b4
Former-commit-id: 14ba59c8f6 [formerly 1021c62d04 ] [formerly dc62b0b23199f6968c07416dc7ef849eef485113 [formerly b6134f482f ]]
Former-commit-id: c42309d6340dc75fb7bed6471dcd60542dc727aa [formerly 194e764541 ]
Former-commit-id: dfd6052201
|
2012-05-21 11:12:52 -05:00 |
|