Nate Jensen
|
315594cab4
|
Issue #716 fix feature location of smack and remove dead dir
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702
Former-commit-id: eabc44141aa681503d6076ebf779536ff27e62f2
|
2012-06-28 17:57:17 -05:00 |
|
Bryan Kowal
|
4acb1d8693
|
Issue #813 - fix merge issues; update the edex features; corrected a problem in edexOsgi/com.raytheon.uf.edex.tafqueue/build.properties
Former-commit-id: 403599d216e643dba2fcae0883f32987c7bade3f
|
2012-06-27 18:38:19 -05:00 |
|
Bryan Kowal
|
a33740e915
|
Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
edexOsgi/build.edex/deploy-install.xml
edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
rpms/awips2-rpm.db
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: af5a90e383c1c115b363a33d9e72f957ada697a4
|
2012-06-27 17:21:48 -05:00 |
|
Brad Gonzales
|
c00fb6f089
|
Issue #628 second attempt. add jaxen 1.1.4 jar to org.dom4j package. restore PgenPaletteWindow settings in plugin.xml
Former-commit-id: 063414b3e997718b74d59cb0155dc081fe91504c
|
2012-06-26 15:41:14 -05:00 |
|
Brad Gonzales
|
3799026523
|
Issue #628 added PgenResourceGhost to track the gl ghost draw objects.
Former-commit-id: 237309aab32cdb36703dbe62d2cfe102b3197863
|
2012-06-22 15:08:40 -05:00 |
|
Steve Harris
|
8dc4a774e2
|
12.6.1-10 baseline
Former-commit-id: dd65e6d99709e0117519a1f2a2f02a41c8938d0e
|
2012-06-21 08:58:00 -05:00 |
|
Steve Harris
|
b4b1f6975f
|
Revert "12.6.1-10 baseline"
This reverts commit ddde63eee0 [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1].
Former-commit-id: 8cdb21fda317373a0dc95e5048716d0e31412ab4
|
2012-06-21 08:51:08 -05:00 |
|
Steve Harris
|
ddde63eee0
|
12.6.1-10 baseline
Former-commit-id: 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1
|
2012-06-21 08:38:48 -05:00 |
|
Bryan Kowal
|
96f987631c
|
Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
Former-commit-id: 74c2228d9b0c924b83d99e92fb5da733ec6e8d28
|
2012-06-18 11:51:47 -05:00 |
|
Bryan Kowal
|
f528e10391
|
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: 9e117e495d669e310839bc9ff8e1e8207b03491b
|
2012-06-18 11:16:28 -05:00 |
|
Bryan Kowal
|
dcc5675564
|
Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc
|
2012-06-14 11:35:15 -05:00 |
|
Max Schenkelberg
|
dd99479eeb
|
Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a
|
2012-06-13 17:52:11 -05:00 |
|
Steve Harris
|
2f20a86a30
|
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: 9e83341a16b6e68f9bfe579dff60271553c3db82
|
2012-06-12 14:37:12 -05:00 |
|
Steve Harris
|
c99afab05f
|
12.6.1-5 baseline
Former-commit-id: 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
b13cbb7e00
|
12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
|
2012-06-08 13:39:48 -05:00 |
|
Bryan Kowal
|
a808bc245f
|
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: f4ac8e99d3f2f98af4ea5f383630395705e6da96
|
2012-05-24 16:51:35 -05:00 |
|
Steve Harris
|
24474489f9
|
12.5.1-6 baseline
Former-commit-id: a75af2f0de38d65dcbbd919e159c3b0a268fc245
|
2012-05-16 16:41:22 -05:00 |
|
Max Schenkelberg
|
78e1bd2c62
|
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 6c456c0bad00aaa1fea67f90a4633b3e14a78495
|
2012-05-09 15:02:30 -05:00 |
|
Steve Harris
|
27bc369818
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 8f71c807be1d604cea51ab522f04f8bbf8c11f83
|
2012-05-09 13:14:00 -05:00 |
|
Steve Harris
|
84d191e7b6
|
12.5.1-2 baseline
Former-commit-id: ff847bf86803a485212f08a098be13bc3d83b0b8
|
2012-05-03 19:17:13 -05:00 |
|
Steve Harris
|
9f8cb727a5
|
12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
67a5a68300
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
Bradley Gonzales
|
6fc14461ee
|
Issue #440 more descriptive login failure message
Former-commit-id: 909362d88423e3c5a39c73b5e5da2d2168f5ed91
|
2012-04-04 16:26:58 -05:00 |
|
Max Schenkelberg
|
23d65caf2e
|
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
Former-commit-id: e8402b080c7d2a712f4f385293aa9b5d1a18484e
|
2012-04-02 16:15:21 -05:00 |
|
James Korman
|
095ab0eeab
|
Issue #232 - Added guava lib project - Adding error checking/reporting - Added VenueInitationListener
Former-commit-id: 92a842f56632399d3b43d7d560dbc5d6bbbd5662
|
2012-03-14 10:24:17 -05:00 |
|
Steve Harris
|
f9baa1c98c
|
Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 2059372e90437312cf12f06de6c84d0824fb586c
|
2012-02-23 13:16:35 -06:00 |
|
Steve Harris
|
c502603907
|
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: cccea1aa13ad987a8c1f2b06c2dfcaa77967544d
|
2012-02-23 12:45:50 -06:00 |
|
Steve Harris
|
d0bbbfefcc
|
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
|
2012-02-23 10:06:18 -06:00 |
|
Roger Ferrel
|
7427aeaf29
|
Issue #181
Changes from January ncep_cave
Former-commit-id: 6a878c3c5f400c53d39d7920c0619362aaafb946
|
2012-01-26 09:26:07 -06:00 |
|
Bryan Kowal
|
5039d66b12
|
Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac
|
2012-01-23 13:25:11 -06:00 |
|
Bryan Kowal
|
2142afe3f1
|
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 296d2915b17f0086d93e200d4780663bff34edbb
|
2012-01-20 11:37:38 -06:00 |
|
Matt Nash
|
66be3bec40
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
9f19e3f712
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|