Bryan Kowal
|
6706056477
|
Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
Former-commit-id: a6814ec7fb [formerly fa84e5df3e] [formerly 207bbd3087] [formerly a6814ec7fb [formerly fa84e5df3e] [formerly 207bbd3087] [formerly 25addabe64 [formerly 207bbd3087 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]]]
Former-commit-id: 25addabe64
Former-commit-id: f064abd37a [formerly 21a02e1510] [formerly 17ed68aef27593eee306fe2fb3bb631e5e2624fc [formerly 94e4af6d47]]
Former-commit-id: 26b9b80270ee9967c245bdeb19a771d7cfaad8d6 [formerly 85507d67dd]
Former-commit-id: b69b1e9509
|
2012-06-19 15:03:57 -05:00 |
|
Bryan Kowal
|
fff0ad3727
|
Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
Former-commit-id: 4d7c909f5d [formerly ec395ae134] [formerly 96f987631c] [formerly 4d7c909f5d [formerly ec395ae134] [formerly 96f987631c] [formerly 966c50ed06 [formerly 96f987631c [formerly 74c2228d9b0c924b83d99e92fb5da733ec6e8d28]]]]
Former-commit-id: 966c50ed06
Former-commit-id: 7ff1e3ec1e [formerly 07b8c70b1b] [formerly 9e66bcbf05fd841edc4760a6ff074c97a234fd5c [formerly ff0c86f857]]
Former-commit-id: 9eddd502462b27d3fe6c7131e4428d9987e86831 [formerly 6d4946e753]
Former-commit-id: 89ab662ecf
|
2012-06-18 11:51:47 -05:00 |
|
Bryan Kowal
|
14f81556c3
|
Merge branch '11-Collaboration' into development
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]]
Former-commit-id: f0e3b957e3
Former-commit-id: ac72941bf0 [formerly 21e8618852] [formerly a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71]]
Former-commit-id: 48ce0712d4d33976ae0cc1184df65a9ee61a5ba8 [formerly cbc8964e5b]
Former-commit-id: a6d1f97dec
|
2012-06-18 11:16:28 -05:00 |
|
Ben Steffensmeier
|
f80cab90bf
|
Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97
Former-commit-id: d0354ad4e4 [formerly 2da8a0df2f] [formerly aad1eb18b0] [formerly d0354ad4e4 [formerly 2da8a0df2f] [formerly aad1eb18b0] [formerly 9068e049cb [formerly aad1eb18b0 [formerly 901f061f9e19f39cf5096a394cbd238c5562d733]]]]
Former-commit-id: 9068e049cb
Former-commit-id: e1139e8bcc [formerly bded5dde2b] [formerly b1a38642bb839232d00e6dd72ecd1785344a38a9 [formerly dd496b3d90]]
Former-commit-id: 7d72e749d750c93e98bf6d01ef30660c39424b1b [formerly 541f1b74f3]
Former-commit-id: 1a3e1ba291
|
2012-06-14 16:44:19 -05:00 |
|
Ben Steffensmeier
|
533fc946f9
|
Issue #704 various core changes to make things work smoothly in kml
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16
Former-commit-id: 93fe267859 [formerly 2c27ec20b5] [formerly d187436589] [formerly 93fe267859 [formerly 2c27ec20b5] [formerly d187436589] [formerly 58356c49cb [formerly d187436589 [formerly faec1cb4e4e0ef6444da31971b937ad3ee79160a]]]]
Former-commit-id: 58356c49cb
Former-commit-id: a77d4b3564 [formerly 352648586a] [formerly 17d4d41f9a31f859cf44b9807748609d104b685d [formerly e604271c54]]
Former-commit-id: cd083b91aacf58b0d502f10fe82a3966ba4342cb [formerly 3e4b09847b]
Former-commit-id: 117c77bfe0
|
2012-06-14 16:41:05 -05:00 |
|
Max Schenkelberg
|
e0afa21cd5
|
Issue #697 fixed join issues with GFE
Change-Id: Idaaa9782865cd2299ba9fc8e18305df215f1d012
Former-commit-id: 7bf6b0bac0 [formerly 6b9d13211d] [formerly dac8374f52] [formerly 7bf6b0bac0 [formerly 6b9d13211d] [formerly dac8374f52] [formerly 576dbcf340 [formerly dac8374f52 [formerly e648206c2e8129b2d63b9309f67e1ce46a1edbf0]]]]
Former-commit-id: 576dbcf340
Former-commit-id: c6ff2d0c5e [formerly 86f4c94dc3] [formerly d8716c8f4c7b38d2bdbb1ad7ed4dcf4965bc6c61 [formerly 475623fe22]]
Former-commit-id: 540791039ae6f38e1fe37b9723b81caec412cdb6 [formerly 8a0626ec3f]
Former-commit-id: d915360713
|
2012-06-14 14:18:02 -05:00 |
|
Bryan Kowal
|
3d94c3e332
|
Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: 175cbf318d [formerly 5e80c45a03] [formerly dcc5675564] [formerly 175cbf318d [formerly 5e80c45a03] [formerly dcc5675564] [formerly c0aaac4a07 [formerly dcc5675564 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]]]
Former-commit-id: c0aaac4a07
Former-commit-id: 81fa46c01a [formerly a9c2cf4fae] [formerly 1adfac8f38f065227cc081b4143843fe19b3f856 [formerly c608fc959c]]
Former-commit-id: cd07c27f5f551d77046fbda54bdadaa0fe56e393 [formerly 720a152a45]
Former-commit-id: eca1d3d525
|
2012-06-14 11:35:15 -05:00 |
|
Nate Jensen
|
3cec25f904
|
Issue #716 better tooltip
Change-Id: I9db709540cb6ac25893756139b3269adf9d4551b
Former-commit-id: 9ecfadaf08 [formerly 00a23080d1] [formerly 6ecd868ddd] [formerly 9ecfadaf08 [formerly 00a23080d1] [formerly 6ecd868ddd] [formerly 475a9a76b5 [formerly 6ecd868ddd [formerly 4181cc97d769bfead6f5425ec4740ab90c8b57a5]]]]
Former-commit-id: 475a9a76b5
Former-commit-id: 5e307e8098 [formerly 432e384d48] [formerly 7f803973703943102ad3a3cb9638c47e5db55064 [formerly 161159172e]]
Former-commit-id: 8678427eca1d0c20ea0430afd74980fc65c52070 [formerly eadb96f7a6]
Former-commit-id: e3596980f5
|
2012-06-14 11:20:16 -05:00 |
|
Max Schenkelberg
|
d3d126e7c3
|
Issue #697 added drawing indicator for shared display for data provider, fixed shutdown issue
Change-Id: Iccfb92e3155e8be5c780e601fb8c31ef2c74f39f
Former-commit-id: e2ebf6d85e [formerly 4f391588ab] [formerly e92eb6366e] [formerly e2ebf6d85e [formerly 4f391588ab] [formerly e92eb6366e] [formerly 4c8b468854 [formerly e92eb6366e [formerly c00c45f5ba1ae3bb0a0a246d1435bd10b3a8aa51]]]]
Former-commit-id: 4c8b468854
Former-commit-id: 1cb7111c43 [formerly 01a075077f] [formerly 616a42f1ff97e99d9ace0ef92f663db0476f8010 [formerly c2d278d75b]]
Former-commit-id: c10f734687a27bfd52eb2e1a230f8d603ac8152b [formerly 35e332f89a]
Former-commit-id: a7a7819910
|
2012-06-14 11:16:11 -05:00 |
|
Max Schenkelberg
|
e773643f7a
|
Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: 816500d7c4 [formerly 51c2a41e68] [formerly dd99479eeb] [formerly 816500d7c4 [formerly 51c2a41e68] [formerly dd99479eeb] [formerly fceef3c5a1 [formerly dd99479eeb [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]]
Former-commit-id: fceef3c5a1
Former-commit-id: ea948bbb82 [formerly f0d2893e97] [formerly f94add25d0e7e6bf562b43f3ede6e45e7d953f95 [formerly e5e1a4de6a]]
Former-commit-id: 0763957c65637dd50362099f2ea1a0663adf6a1a [formerly f2e34fe03c]
Former-commit-id: 7bac48f643
|
2012-06-13 17:52:11 -05:00 |
|
Matt Nash
|
8d4c56a8fe
|
Issue #711 add roles and site capability
Former-commit-id: e6d34de494 [formerly 48bf29974c] [formerly a9d225066a] [formerly e6d34de494 [formerly 48bf29974c] [formerly a9d225066a] [formerly 032827aa1b [formerly a9d225066a [formerly a49eee36dac39f172d7c4fa723a297d7cf94d5db]]]]
Former-commit-id: 032827aa1b
Former-commit-id: cd82be177f [formerly 4cd558c1ca] [formerly 088352035d7c18e15170c346ce036e12429d923d [formerly 13a1fa879e]]
Former-commit-id: 2517511e613bba992f8b86185817595698a5b0bb [formerly 34f57345ac]
Former-commit-id: 4e1074e262
|
2012-06-13 12:58:11 -05:00 |
|
Matt Nash
|
3309b5109e
|
Issue #659 fix floating view issue when minimize happened
Former-commit-id: 7dc3044f26 [formerly 3689ed489e] [formerly 96bf8b356a] [formerly 7dc3044f26 [formerly 3689ed489e] [formerly 96bf8b356a] [formerly b65a0f124e [formerly 96bf8b356a [formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]]]]
Former-commit-id: b65a0f124e
Former-commit-id: 455ac1faf9 [formerly 9e81392638] [formerly d25734d06b93a1a330c627b9c997a28dbfb4665a [formerly 3bd1a43af2]]
Former-commit-id: 87796f659980b8c75e5089847bd5b3ce9c36af1d [formerly 8eac89d337]
Former-commit-id: 576e5c5310
|
2012-06-13 10:04:12 -05:00 |
|
Nate Jensen
|
5bd5e7e8ab
|
Issue #716 fix lots of minor issues, fix merge problem
Change-Id: I5a43ad089766b5f2a9a3ea6901d8f6761983b575
Former-commit-id: 653dca2e66 [formerly eedc68c32c] [formerly 619d3062c2] [formerly 653dca2e66 [formerly eedc68c32c] [formerly 619d3062c2] [formerly 47e8561dd0 [formerly 619d3062c2 [formerly ae131c0d05148e58ba445e5f144aa21c8c5c12c3]]]]
Former-commit-id: 47e8561dd0
Former-commit-id: f6e823019d [formerly 3b8b89fc84] [formerly 2308c40a943076535f277701e53e28c076040f00 [formerly 2cf220ff0c]]
Former-commit-id: 60141babfba9cd1cc99bd9241af68ac6ae22cb36 [formerly 1a8935e86d]
Former-commit-id: da2ab4d95b
|
2012-06-13 09:39:19 -05:00 |
|
Steve Harris
|
a45d1b99e1
|
Removed duplicate method created by merge
Former-commit-id: 787b82079e [formerly 282682ccc1] [formerly 5f66b0995a] [formerly 787b82079e [formerly 282682ccc1] [formerly 5f66b0995a] [formerly 308737bff8 [formerly 5f66b0995a [formerly 90fc678948690cc74488e6e1fd18cf8c72c5c0c9]]]]
Former-commit-id: 308737bff8
Former-commit-id: 1dfba0c41c [formerly 383f9d2d56] [formerly 193d13e25a301eced23e253c03817720893c41dc [formerly 55b4d7c5da]]
Former-commit-id: 17fcfe21c5a7a6a71cb9d46ffde283702dcb2baf [formerly 0de9e03c5a]
Former-commit-id: b3c2646e5e
|
2012-06-13 08:41:24 -05:00 |
|
Steve Harris
|
ec9204fa94
|
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e [formerly d7a4853091] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f]
Former-commit-id: 70a928d039
|
2012-06-12 14:37:12 -05:00 |
|
Nate Jensen
|
4562192f22
|
Issue #716 removing unnecessary file
Change-Id: I439f95ab54eb6fa3765438dcb77a94445dc2ebba
Former-commit-id: c33b8ac729 [formerly 4b54691479] [formerly 07d44ae528] [formerly c33b8ac729 [formerly 4b54691479] [formerly 07d44ae528] [formerly cd14177a84 [formerly 07d44ae528 [formerly 5ade0f2437308ab21429432746cf4e71afc33c93]]]]
Former-commit-id: cd14177a84
Former-commit-id: 0ea1d3d522 [formerly 37342dd500] [formerly 55fa3a0d6686e52246676ff642dd31616024215b [formerly 090bb2918b]]
Former-commit-id: ed74a356bf1ee9bbd35c69fc624517a8e3a2dbaf [formerly 38fcee07e8]
Former-commit-id: ed987231b5
|
2012-06-11 17:34:21 -05:00 |
|
Nate Jensen
|
b9936a5352
|
Issue #716 fix disabled toolbar
Change-Id: I464d0560cf7462b37d324db368411f3867e53602
Former-commit-id: 9df6b2b051 [formerly c3c4a8519a] [formerly d2bb1b6e0c] [formerly 9df6b2b051 [formerly c3c4a8519a] [formerly d2bb1b6e0c] [formerly 0c869f599e [formerly d2bb1b6e0c [formerly d32771cbbe72a32965c50aacd7ede3383a5fff23]]]]
Former-commit-id: 0c869f599e
Former-commit-id: df09de658a [formerly 38a3e93585] [formerly 4c1efdb14c6c9055c3df149ffd219afabd6b73a7 [formerly ea33fc82fe]]
Former-commit-id: 71537803326c931bf18fe6de065205a643fe013a [formerly 91b7225c2f]
Former-commit-id: ab30be436b
|
2012-06-11 17:33:48 -05:00 |
|
Steve Harris
|
883d66bc46
|
12.6.1-5 baseline
Former-commit-id: 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: d5c94ccef2 [formerly b69fa75919] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d]]
Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad]
Former-commit-id: 3b468d9f50
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
581546a5eb
|
12.6.1-3 baseline
Former-commit-id: bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 471fa3ac04 [formerly 32c0464d79] [formerly 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237]]
Former-commit-id: 47799c2c228b75794e62bf6b17a80d2d42cdf2cc [formerly ca8baf18a3]
Former-commit-id: 518fa79f7f
|
2012-06-11 16:23:47 -05:00 |
|
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 |
|
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 |
|