Max Schenkelberg
|
379ca48057
|
Issue #590 Fixed GFE colorbar when changing parms after setting up collaboration session. Needed to move adding of listeners to initInternal and not the constructor so recycling readds them after dispose removes them
Change-Id: Ieb5fc7786682b5b442deccf4a5292374a4a7de47
Former-commit-id: 81b6158c40 [formerly ab871d218b] [formerly 81b6158c40 [formerly ab871d218b] [formerly 61e0ea0516 [formerly c0d7f68bed2b141240d2e2a695c8439f7a4ffa67]]]
Former-commit-id: 61e0ea0516
Former-commit-id: 460a1179af [formerly 66a60a7b7b]
Former-commit-id: 77aef2db41
|
2012-06-20 15:32:27 -05:00 |
|
Bryan Kowal
|
48d821f5f8
|
Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
Former-commit-id: ad13e81ea6 [formerly d20417a793] [formerly ad13e81ea6 [formerly d20417a793] [formerly a828d869a0 [formerly 982e97b44967376b7e08138c4997a87ec1c98b44]]]
Former-commit-id: a828d869a0
Former-commit-id: 7ac868e3c7 [formerly 916ce42ff8]
Former-commit-id: 424121af9d
|
2012-06-20 14:47:19 -05:00 |
|
Ben Steffensmeier
|
19ce6f7e77
|
Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
Former-commit-id: c2191c83dc [formerly d317777ee6] [formerly c2191c83dc [formerly d317777ee6] [formerly 0c69731e18 [formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]]]
Former-commit-id: 0c69731e18
Former-commit-id: 8b107023d1 [formerly b55a4f026c]
Former-commit-id: 63b55f454f
|
2012-06-20 14:13:37 -05:00 |
|
Bryan Kowal
|
66028f4fe2
|
Issue #708 - it is now possible to build edex rpms in the new baseline repository.
Former-commit-id: 11a1c4f35f [formerly 973ceff9a7] [formerly 11a1c4f35f [formerly 973ceff9a7] [formerly f79134499e [formerly 0932e1173258d916a6a1caae5c943903d830c2af]]]
Former-commit-id: f79134499e
Former-commit-id: 872a3a5f60 [formerly 1acbc16759]
Former-commit-id: 720c2063f0
|
2012-06-20 11:22:58 -05:00 |
|
Steve Harris
|
e25bed485a
|
Issue #708 - removed extraneous files
Former-commit-id: 004e4c5134 [formerly ba7bd0c711] [formerly 004e4c5134 [formerly ba7bd0c711] [formerly c0b5f3f892 [formerly 134264091ddd0567f4789c852f8ee7b41b3dc9bf]]]
Former-commit-id: c0b5f3f892
Former-commit-id: 1a6525004b [formerly 764a9d2a13]
Former-commit-id: 1d040ee464
|
2012-06-20 08:24:45 -05:00 |
|
Steve Harris
|
52251f3595
|
Issue #708 - removed extraneous files
Former-commit-id: d2e6687295 [formerly 1a67fdba3f] [formerly d2e6687295 [formerly 1a67fdba3f] [formerly fbe7e50417 [formerly 389c544088260bd6d6d107f51dc36426e9af3229]]]
Former-commit-id: fbe7e50417
Former-commit-id: 026a14fc2c [formerly eca93e924c]
Former-commit-id: 6325fcc6f1
|
2012-06-20 08:15:55 -05:00 |
|
Nate Jensen
|
1c7afc3784
|
Merge "Issue #440 made PathManager not request data if there are no contexts to request for" into development
Former-commit-id: bc63d08489 [formerly f74233956e] [formerly bc63d08489 [formerly f74233956e] [formerly a8af268ca1 [formerly dd1f52c8e5d36cccab98821018cb77f544529933]]]
Former-commit-id: a8af268ca1
Former-commit-id: 6b9344db87 [formerly 7376a1d4ff]
Former-commit-id: 0aca1f1c83
|
2012-06-19 16:47:34 -05:00 |
|
Bryan Kowal
|
b69b1e9509
|
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: fa84e5df3e [formerly 207bbd3087] [formerly fa84e5df3e [formerly 207bbd3087] [formerly 25addabe64 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]]
Former-commit-id: 25addabe64
Former-commit-id: 21a02e1510 [formerly 94e4af6d47]
Former-commit-id: 85507d67dd
|
2012-06-19 15:03:57 -05:00 |
|
Bryan Kowal
|
e9ab580a49
|
Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository.
Former-commit-id: 944a1ce201 [formerly 5aabc3bba1] [formerly 944a1ce201 [formerly 5aabc3bba1] [formerly dff89c83e4 [formerly 03e09af0cae74d0510a86ff07a31bbffbe3c4aac]]]
Former-commit-id: dff89c83e4
Former-commit-id: 11ea72acf0 [formerly 5435963041]
Former-commit-id: cb8969eb0f
|
2012-06-19 13:33:01 -05:00 |
|
Bryan Kowal
|
9d984deb1f
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: a1ba6c10be [formerly e32406ca8a] [formerly a1ba6c10be [formerly e32406ca8a] [formerly a4c6095b76 [formerly 1290be4ea8aab292b6f8d2ce1f1beda5fa15395d]]]
Former-commit-id: a4c6095b76
Former-commit-id: 76afa5d4b6 [formerly 3b2d570834]
Former-commit-id: f4346e7e01
|
2012-06-19 13:17:17 -05:00 |
|
Bryan Kowal
|
96e82f60e5
|
Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
Former-commit-id: cb16805e7e [formerly 95a5887b06] [formerly cb16805e7e [formerly 95a5887b06] [formerly 25e20ad89c [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]]
Former-commit-id: 25e20ad89c
Former-commit-id: 5db24885ba [formerly fd8be91fed]
Former-commit-id: f390151c0b
|
2012-06-19 13:15:53 -05:00 |
|
Max Schenkelberg
|
ecd2068cf0
|
Issue #440 made PathManager not request data if there are no contexts to request for
Former-commit-id: 1e8e9db9eb [formerly e856cfedf4] [formerly 1e8e9db9eb [formerly e856cfedf4] [formerly db57eeee16 [formerly d5ad7950c520e8b8d384b6dad73f0da6e84935d0]]]
Former-commit-id: db57eeee16
Former-commit-id: 15c59d6621 [formerly 1f10cddfa2]
Former-commit-id: 9e296ec8b9
|
2012-06-19 13:00:44 -05:00 |
|
Richard Peter
|
3749ef4534
|
Merge "Issue #765 fix so data can be retrieved with or without hdfFileId" into development
Former-commit-id: 918185f564 [formerly aa6c81a2c7] [formerly 918185f564 [formerly aa6c81a2c7] [formerly cee183e89c [formerly 29f61577c289229802f89b96b53735782986366b]]]
Former-commit-id: cee183e89c
Former-commit-id: ba9aa5df02 [formerly 80faa5abf8]
Former-commit-id: 19798acee1
|
2012-06-19 09:21:24 -05:00 |
|
Bryan Kowal
|
4ddb8dcce1
|
Issue #708 - the wes2bridge utility product will no longer expect a src folder.
Former-commit-id: 360916143e [formerly 8149b629d4] [formerly 360916143e [formerly 8149b629d4] [formerly 51d7d8ccdc [formerly 0bdaa8c9344e62d1fc9594d38dfa80ae2c18d3d4]]]
Former-commit-id: 51d7d8ccdc
Former-commit-id: 51309941cc [formerly b03596a173]
Former-commit-id: cc6f3354b7
|
2012-06-18 18:20:40 -05:00 |
|
Nate Jensen
|
05a77b1536
|
Issue #765 fix so data can be retrieved with or without hdfFileId
Former-commit-id: 619b70f7fc [formerly ae384ddf24] [formerly 619b70f7fc [formerly ae384ddf24] [formerly bb1ea105d2 [formerly 2931a63a74885e4594eb6f3b1539336e6b4bd4c9]]]
Former-commit-id: bb1ea105d2
Former-commit-id: d7841cef54 [formerly 244ca1b88b]
Former-commit-id: 31160b8485
|
2012-06-18 17:20:48 -05:00 |
|
Bryan Kowal
|
2a43ab83cb
|
Issue #762 - removing extra com.raytheon.uf.viz.ncep.displays.feature added by collaboration.
Former-commit-id: 66a412e16c [formerly 8735d101d5] [formerly 66a412e16c [formerly 8735d101d5] [formerly f522cf8a4f [formerly 339adb4a6795d059cc4af29b1d38d8385c5f9afb]]]
Former-commit-id: f522cf8a4f
Former-commit-id: dd07c2ac13 [formerly a045e729f7]
Former-commit-id: 5f59af1e01
|
2012-06-18 13:32:31 -05:00 |
|
Bryan Kowal
|
89ab662ecf
|
Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
Former-commit-id: ec395ae134 [formerly 96f987631c] [formerly ec395ae134 [formerly 96f987631c] [formerly 966c50ed06 [formerly 74c2228d9b0c924b83d99e92fb5da733ec6e8d28]]]
Former-commit-id: 966c50ed06
Former-commit-id: 07b8c70b1b [formerly ff0c86f857]
Former-commit-id: 6d4946e753
|
2012-06-18 11:51:47 -05:00 |
|
Bryan Kowal
|
a6d1f97dec
|
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: 9361f3eb94 [formerly f528e10391] [formerly 9361f3eb94 [formerly f528e10391] [formerly f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]
Former-commit-id: f0e3b957e3
Former-commit-id: 21e8618852 [formerly 1ee59eac71]
Former-commit-id: cbc8964e5b
|
2012-06-18 11:16:28 -05:00 |
|
Ben Steffensmeier
|
1a3e1ba291
|
Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97
Former-commit-id: 2da8a0df2f [formerly aad1eb18b0] [formerly 2da8a0df2f [formerly aad1eb18b0] [formerly 9068e049cb [formerly 901f061f9e19f39cf5096a394cbd238c5562d733]]]
Former-commit-id: 9068e049cb
Former-commit-id: bded5dde2b [formerly dd496b3d90]
Former-commit-id: 541f1b74f3
|
2012-06-14 16:44:19 -05:00 |
|
Ben Steffensmeier
|
117c77bfe0
|
Issue #704 various core changes to make things work smoothly in kml
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16
Former-commit-id: 2c27ec20b5 [formerly d187436589] [formerly 2c27ec20b5 [formerly d187436589] [formerly 58356c49cb [formerly faec1cb4e4e0ef6444da31971b937ad3ee79160a]]]
Former-commit-id: 58356c49cb
Former-commit-id: 352648586a [formerly e604271c54]
Former-commit-id: 3e4b09847b
|
2012-06-14 16:41:05 -05:00 |
|
Ben Steffensmeier
|
968a6fa7df
|
Issue #704 create a radial bin and azimuth range map projection so radar data can use standard api.
Change-Id: If5bba07e679881188b190363cc234ba145ce9f23
Former-commit-id: e629fcb15b [formerly f63d2bc7c2] [formerly e629fcb15b [formerly f63d2bc7c2] [formerly dd353747d0 [formerly f99f9b49b0682fccf17f6d03d5cbde7f80cf7b39]]]
Former-commit-id: dd353747d0
Former-commit-id: 6e66b88dd5 [formerly af82c0a52a]
Former-commit-id: 0bf066fc5e
|
2012-06-14 16:30:34 -05:00 |
|
Max Schenkelberg
|
d915360713
|
Issue #697 fixed join issues with GFE
Change-Id: Idaaa9782865cd2299ba9fc8e18305df215f1d012
Former-commit-id: 6b9d13211d [formerly dac8374f52] [formerly 6b9d13211d [formerly dac8374f52] [formerly 576dbcf340 [formerly e648206c2e8129b2d63b9309f67e1ce46a1edbf0]]]
Former-commit-id: 576dbcf340
Former-commit-id: 86f4c94dc3 [formerly 475623fe22]
Former-commit-id: 8a0626ec3f
|
2012-06-14 14:18:02 -05:00 |
|
Bryan Kowal
|
19f8cca72c
|
Issue #708 - support deploying from a separate work assignment repository - initial implementation.
Former-commit-id: 24627d52f2 [formerly 1c8b752063] [formerly 24627d52f2 [formerly 1c8b752063] [formerly 14c912f215 [formerly 0feb8374a85d09d8712f4bc421b5a24acb8d27c2]]]
Former-commit-id: 14c912f215
Former-commit-id: 4a631c01ee [formerly c1b57d1de1]
Former-commit-id: b730eced02
|
2012-06-14 12:43:34 -05:00 |
|
Bryan Kowal
|
eca1d3d525
|
Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: 5e80c45a03 [formerly dcc5675564] [formerly 5e80c45a03 [formerly dcc5675564] [formerly c0aaac4a07 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]]
Former-commit-id: c0aaac4a07
Former-commit-id: a9c2cf4fae [formerly c608fc959c]
Former-commit-id: 720a152a45
|
2012-06-14 11:35:15 -05:00 |
|
Nate Jensen
|
e3596980f5
|
Issue #716 better tooltip
Change-Id: I9db709540cb6ac25893756139b3269adf9d4551b
Former-commit-id: 00a23080d1 [formerly 6ecd868ddd] [formerly 00a23080d1 [formerly 6ecd868ddd] [formerly 475a9a76b5 [formerly 4181cc97d769bfead6f5425ec4740ab90c8b57a5]]]
Former-commit-id: 475a9a76b5
Former-commit-id: 432e384d48 [formerly 161159172e]
Former-commit-id: eadb96f7a6
|
2012-06-14 11:20:16 -05:00 |
|
Max Schenkelberg
|
a7a7819910
|
Issue #697 added drawing indicator for shared display for data provider, fixed shutdown issue
Change-Id: Iccfb92e3155e8be5c780e601fb8c31ef2c74f39f
Former-commit-id: 4f391588ab [formerly e92eb6366e] [formerly 4f391588ab [formerly e92eb6366e] [formerly 4c8b468854 [formerly c00c45f5ba1ae3bb0a0a246d1435bd10b3a8aa51]]]
Former-commit-id: 4c8b468854
Former-commit-id: 01a075077f [formerly c2d278d75b]
Former-commit-id: 35e332f89a
|
2012-06-14 11:16:11 -05:00 |
|
Ron Anderson
|
89d19595b4
|
Removed activetable plugin dependencies on gfe
Former-commit-id: 6720a0aa77 [formerly be525f1c49] [formerly 6720a0aa77 [formerly be525f1c49] [formerly a8d2c6b961 [formerly 1b923c335dd69dfa5a95972f1aa749cf5497bcee]]]
Former-commit-id: a8d2c6b961
Former-commit-id: 89b8a935c4 [formerly c241585248]
Former-commit-id: 40689a68e9
|
2012-06-14 10:09:22 -05:00 |
|
Max Schenkelberg
|
7bac48f643
|
Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: 51c2a41e68 [formerly dd99479eeb] [formerly 51c2a41e68 [formerly dd99479eeb] [formerly fceef3c5a1 [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]
Former-commit-id: fceef3c5a1
Former-commit-id: f0d2893e97 [formerly e5e1a4de6a]
Former-commit-id: f2e34fe03c
|
2012-06-13 17:52:11 -05:00 |
|
Bryan Kowal
|
b5731d85b8
|
Merge branch '9-Wes2Bridge' into development
Former-commit-id: 5f2fac5ca5 [formerly 522a35f61b] [formerly 5f2fac5ca5 [formerly 522a35f61b] [formerly e1addfad12 [formerly 732d7b77d80e7647bc79de5df072f37a2449b0cf]]]
Former-commit-id: e1addfad12
Former-commit-id: 507bca23e6 [formerly cb8b3f37b1]
Former-commit-id: 1cd279f681
|
2012-06-13 15:29:38 -05:00 |
|
Steve Harris
|
d1b2c73b81
|
Merge branch 'master' into ss_sync
Former-commit-id: 5a5db8dc6a [formerly d507f3b71d] [formerly 5a5db8dc6a [formerly d507f3b71d] [formerly 645359deaf [formerly 3b20277effa5ff76e68610d2d85afc950aae3387]]]
Former-commit-id: 645359deaf
Former-commit-id: 0c29bee8e1 [formerly c778c97bd6]
Former-commit-id: a6fd9689d5
|
2012-06-13 14:56:52 -05:00 |
|
Matt Nash
|
4e1074e262
|
Issue #711 add roles and site capability
Former-commit-id: 48bf29974c [formerly a9d225066a] [formerly 48bf29974c [formerly a9d225066a] [formerly 032827aa1b [formerly a49eee36dac39f172d7c4fa723a297d7cf94d5db]]]
Former-commit-id: 032827aa1b
Former-commit-id: 4cd558c1ca [formerly 13a1fa879e]
Former-commit-id: 34f57345ac
|
2012-06-13 12:58:11 -05:00 |
|
Matt Nash
|
576e5c5310
|
Issue #659 fix floating view issue when minimize happened
Former-commit-id: 3689ed489e [formerly 96bf8b356a] [formerly 3689ed489e [formerly 96bf8b356a] [formerly b65a0f124e [formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]]]
Former-commit-id: b65a0f124e
Former-commit-id: 9e81392638 [formerly 3bd1a43af2]
Former-commit-id: 8eac89d337
|
2012-06-13 10:04:12 -05:00 |
|
Nate Jensen
|
da2ab4d95b
|
Issue #716 fix lots of minor issues, fix merge problem
Change-Id: I5a43ad089766b5f2a9a3ea6901d8f6761983b575
Former-commit-id: eedc68c32c [formerly 619d3062c2] [formerly eedc68c32c [formerly 619d3062c2] [formerly 47e8561dd0 [formerly ae131c0d05148e58ba445e5f144aa21c8c5c12c3]]]
Former-commit-id: 47e8561dd0
Former-commit-id: 3b8b89fc84 [formerly 2cf220ff0c]
Former-commit-id: 1a8935e86d
|
2012-06-13 09:39:19 -05:00 |
|
Steve Harris
|
b3c2646e5e
|
Removed duplicate method created by merge
Former-commit-id: 282682ccc1 [formerly 5f66b0995a] [formerly 282682ccc1 [formerly 5f66b0995a] [formerly 308737bff8 [formerly 90fc678948690cc74488e6e1fd18cf8c72c5c0c9]]]
Former-commit-id: 308737bff8
Former-commit-id: 383f9d2d56 [formerly 55b4d7c5da]
Former-commit-id: 0de9e03c5a
|
2012-06-13 08:41:24 -05:00 |
|
Steve Harris
|
70a928d039
|
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: af6c0529ad [formerly 2f20a86a30] [formerly af6c0529ad [formerly 2f20a86a30] [formerly 48860df690 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]
Former-commit-id: 48860df690
Former-commit-id: d7a4853091 [formerly 27b50c57bd]
Former-commit-id: 2838ca117f
|
2012-06-12 14:37:12 -05:00 |
|
Nate Jensen
|
ed987231b5
|
Issue #716 removing unnecessary file
Change-Id: I439f95ab54eb6fa3765438dcb77a94445dc2ebba
Former-commit-id: 4b54691479 [formerly 07d44ae528] [formerly 4b54691479 [formerly 07d44ae528] [formerly cd14177a84 [formerly 5ade0f2437308ab21429432746cf4e71afc33c93]]]
Former-commit-id: cd14177a84
Former-commit-id: 37342dd500 [formerly 090bb2918b]
Former-commit-id: 38fcee07e8
|
2012-06-11 17:34:21 -05:00 |
|
Nate Jensen
|
ab30be436b
|
Issue #716 fix disabled toolbar
Change-Id: I464d0560cf7462b37d324db368411f3867e53602
Former-commit-id: c3c4a8519a [formerly d2bb1b6e0c] [formerly c3c4a8519a [formerly d2bb1b6e0c] [formerly 0c869f599e [formerly d32771cbbe72a32965c50aacd7ede3383a5fff23]]]
Former-commit-id: 0c869f599e
Former-commit-id: 38a3e93585 [formerly ea33fc82fe]
Former-commit-id: 91b7225c2f
|
2012-06-11 17:33:48 -05:00 |
|
Steve Harris
|
3b468d9f50
|
12.6.1-5 baseline
Former-commit-id: 09f73b0601 [formerly c99afab05f] [formerly 09f73b0601 [formerly c99afab05f] [formerly 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]
Former-commit-id: 8947efbc7f
Former-commit-id: b69fa75919 [formerly a945ed8e6d]
Former-commit-id: 91e65230ad
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
518fa79f7f
|
12.6.1-3 baseline
Former-commit-id: 7c5306b795 [formerly 42f3513175] [formerly 7c5306b795 [formerly 42f3513175] [formerly d57eb02b9e [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 32c0464d79 [formerly 1fdc0aa237]
Former-commit-id: ca8baf18a3
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
0787d9ee94
|
12.5.1-15 baseline
Former-commit-id: e573d25da7 [formerly e8a0d40b73] [formerly e573d25da7 [formerly e8a0d40b73] [formerly 8d5e739a61 [formerly a5f61b51742cf97f02253e5e6ca988e7ffa9b26d]]]
Former-commit-id: 8d5e739a61
Former-commit-id: f79edb6135 [formerly 6db76e884c]
Former-commit-id: a8393146b1
|
2012-06-11 16:23:11 -05:00 |
|
Steve Harris
|
6dd6f0070a
|
Removed extra files from 12.5.1-15
Former-commit-id: 9b993d3152 [formerly 288233a06c] [formerly 9b993d3152 [formerly 288233a06c] [formerly 9612d7e90c [formerly 3c367f4c3b2b2f5bc64b8eb43ed5eb66deda129f]]]
Former-commit-id: 9612d7e90c
Former-commit-id: d6a864c7b6 [formerly 76e3f566f4]
Former-commit-id: bfce1b5084
|
2012-06-11 16:18:26 -05:00 |
|
Steve Harris
|
ca0f3f5814
|
12.5.1-15 baseline
Former-commit-id: 0ca936807e [formerly d5c238de07] [formerly 0ca936807e [formerly d5c238de07] [formerly cee20d8656 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]]
Former-commit-id: cee20d8656
Former-commit-id: 31d7649939 [formerly 7da9afe36a]
Former-commit-id: ad91dc8a2e
|
2012-06-11 16:02:30 -05:00 |
|
Matt Nash
|
c13ca2f81b
|
issue #693 always allow to invite users after opening create session dialog
Former-commit-id: 179f2d7ffe [formerly 9f2d97fa68] [formerly 179f2d7ffe [formerly 9f2d97fa68] [formerly b78d86bf04 [formerly 204c35530bbe8c7e39749d70331ceb93c4d4a790]]]
Former-commit-id: b78d86bf04
Former-commit-id: 4b5af450d1 [formerly 03ee9d8a90]
Former-commit-id: 3e54a2fd18
|
2012-06-11 15:34:49 -05:00 |
|
Steve Harris
|
c01b096242
|
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: c7024992a3 [formerly 37793c86b1] [formerly c7024992a3 [formerly 37793c86b1] [formerly d325d496f5 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]
Former-commit-id: d325d496f5
Former-commit-id: 23c34c469a [formerly cf3c768213]
Former-commit-id: 3dd5b84aa2
|
2012-06-11 15:24:03 -05:00 |
|
Matt Nash
|
3f528cbd85
|
Issue #693 add nws_collaborate view, and ability for default on startup or not
Former-commit-id: c3b17038f9 [formerly 73da2b1fe8] [formerly c3b17038f9 [formerly 73da2b1fe8] [formerly 022e982aae [formerly b50cfeb8633e2b9a0d2fc7bb848bbcf7d0404321]]]
Former-commit-id: 022e982aae
Former-commit-id: 945b47e29e [formerly d5e3c97d98]
Former-commit-id: 3a82f9690b
|
2012-06-11 10:24:35 -05:00 |
|
Matt Nash
|
254b673be7
|
Issue #703 can change font size in sessions
Former-commit-id: 73ad806eb2 [formerly 9d187cc362] [formerly 73ad806eb2 [formerly 9d187cc362] [formerly 4b72bb3d8e [formerly 0e7af586cd96a21540263474f321bd224c45ad54]]]
Former-commit-id: 4b72bb3d8e
Former-commit-id: 11f07ec579 [formerly 4453a06f31]
Former-commit-id: 822bd01fd9
|
2012-06-11 10:23:45 -05:00 |
|
Matt Nash
|
e1d1dbe568
|
Issue #659 make fixes to float/dock
Former-commit-id: 5accda84c9 [formerly cc5c172a77] [formerly 5accda84c9 [formerly cc5c172a77] [formerly 1f54c2d09d [formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]]]
Former-commit-id: 1f54c2d09d
Former-commit-id: b55c763a34 [formerly ae53309d60]
Former-commit-id: 94bc675780
|
2012-06-11 10:21:40 -05:00 |
|
Nate Jensen
|
37af033b53
|
Issue #427 fixed issues
Change-Id: I984b6ccefd84e90d0296e1b38b8dd30b241546f8
Former-commit-id: 1b03a14b23 [formerly db3027c0d6] [formerly 1b03a14b23 [formerly db3027c0d6] [formerly 14c2b1271e [formerly 64e3f77ac8ebc03c0e15c3d4ac513df78f05b00a]]]
Former-commit-id: 14c2b1271e
Former-commit-id: 00d6ab7011 [formerly 680325f03c]
Former-commit-id: 29d5237dd5
|
2012-06-08 16:10:57 -05:00 |
|
Nate Jensen
|
413d929248
|
Issue #427 remove login and event subscription code from CollaborationDataManager
Change-Id: I18a2c44a275f5180d828184001fd1c5173ea2f74
Former-commit-id: 8d741bc4a1 [formerly 05389dac56] [formerly 8d741bc4a1 [formerly 05389dac56] [formerly 28f779e7b9 [formerly 2306edfd4e11b512a68320ae7dc4edbcfa474934]]]
Former-commit-id: 28f779e7b9
Former-commit-id: d1f42605dd [formerly 0271c9762d]
Former-commit-id: 1b76e1c855
|
2012-06-08 15:15:03 -05:00 |
|
Steve Harris
|
39ff9954f8
|
12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f]
Former-commit-id: 9054c5ab6c
|
2012-06-08 13:39:48 -05:00 |
|