Steve Harris
|
89e25dd014
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/PrintDialog.java
cave/com.raytheon.viz.hydro/META-INF/MANIFEST.MF
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 30e9ffce1a90bd85f5b310944b309188447439ce
|
2016-05-19 22:07:52 -05:00 |
|
Bryan Kowal
|
c7c4ef3f31
|
Omaha #5483 - fix Hydro GUI sizing issues.
Change-Id: Ibe0ead7fa2b24b80724b4dcb38ab8b0bc25decd6
Former-commit-id: 9c4bcf5d9896c5e3334ccd419ee929f56c06b0ec
|
2016-05-16 14:49:04 -05:00 |
|
Shawn.Hooper
|
5a1d490a64
|
Merge remote-tracking branch 'vlab/ohd_16.2.2' into master_16.2.2
Former-commit-id: 4a246ec324380e39c5006e74912fe005f76726e1
|
2016-04-13 13:26:00 -04:00 |
|
Penghai Wang
|
1ff00e7088
|
Merge branch 'master_16.2.2' into asdt_16.2.2
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
Former-commit-id: 51bcd1df67c24bce021a89b8708e48306dd0691e
|
2016-04-12 16:45:34 +00:00 |
|
Paul Tilles
|
746cbde5ac
|
VLab Issue #17691 - DCS 18497; fixes #17691
Change-Id: I172493bee4577954c30576fe95ee1b508457f75c
Former-commit-id: 14fb17f5fc2a6783f43d07c6e56e89bc75edf6b4
|
2016-04-11 19:05:15 +00:00 |
|
Paul Tilles
|
ffa0d20265
|
VLab Issue #15736 - DCS 18497; fixes #15736
Change-Id: I4dfdde945edad826b8d32e12d98364d723723793
Former-commit-id: f7f0c14b64ab8ae423f33e3e591e3e7409b7b2e8
|
2016-02-17 19:00:11 +00:00 |
|
Andrew Moore
|
4daeed6be2
|
VLab Issue #13015 - DCS 14232, change locarea table's area column to 500 characters. Java changes; fixes #13015
Change-Id: I6006354d63828c2b7753b4cbb854eecc473d180c
VLab Issue #13015 - DCS 14232, change locarea table's area column to 500 characters. SQL change; fixes #13015
Change-Id: I620701d51c14359726d4c1d0229e2c536dc67bc5
Former-commit-id: 5df7cdcf86c8216b0df2b5ae824f2a70487e82f1
|
2016-02-08 17:23:42 +00:00 |
|
Andrew Moore
|
ec32901f77
|
VLab Issue #10021 - Add new timezones for Guam and Samoa;
Small reorg of static variable;
Remove useless if-block;
fixes #10021
Change-Id: I9d3b9f7aea25144f919e93139d1dba1602ea35b2
Former-commit-id: 87e1202202892ed61e3abbce46206c837742dbe5
|
2015-09-04 12:41:19 +00:00 |
|
David Friedman
|
4bdfeb8da8
|
Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
cave/build/static/linux/alertviz/alertviz.sh
cave/build/static/linux/cave/cave.sh
cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration
Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226
Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
|
2015-07-30 20:53:19 +00:00 |
|
Loubna.Bousaidi
|
8356ee4357
|
ASM #14104 resize gsno column in riverstat table
Change-Id: Iacd6107c095f12ac4331e3f698c76ff24ce1edf1
Former-commit-id: 8fb2f6eca3b8ac68270fb4f6e537c1ea37c76696
|
2015-07-06 20:19:39 +00:00 |
|
Slav Korolev
|
497fe6e160
|
Omaha #4380 - Added new hydro forecast issuance stage and flow
Former-commit-id: 544d831ab3467af567ced94f97fe479b667d915c
|
2015-05-21 08:57:22 -04:00 |
|
Nate Jensen
|
8dbe6abbe4
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
|
2014-12-03 15:47:10 -06:00 |
|
Nate Jensen
|
9b72a1399d
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 48536dd79d933508ac54b3b6e9bbd166fd218330
|
2014-08-14 10:22:37 -05:00 |
|
Brian.Dyke
|
3f1e12effc
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: 9d7a819489480e119b65cb5643520818adeb1ebf
|
2014-05-30 10:46:25 -04:00 |
|
Steve Harris
|
fc2bf6b45c
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: a830db2a282e6a29d119fc0d3357c2223c48d175
|
2014-05-12 16:13:19 -05:00 |
|
Brian.Dyke
|
41ba5fc348
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3
|
2014-05-12 14:07:11 -04:00 |
|
Chip Gobs
|
e42bef2a33
|
VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada
Former-commit-id: 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734
|
2014-05-06 10:48:35 -04:00 |
|
Nate Jensen
|
ded2e8a852
|
Issue #2361 remove XML annotations from IHFS table classes
Change-Id: I10c3fb7aeec4ec96a17d54ee388c4b0770e9e939
Former-commit-id: 137b91fdad93d661243ecfbb60e28dc0c77b5b76
|
2013-10-07 13:06:05 -05:00 |
|
Max Schenkelberg
|
d79cfe8ad1
|
Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f
Former-commit-id: 5c707a35dcaedf5ae37119e56503aa8af59631fc
|
2013-08-09 14:24:49 -05:00 |
|
Richard Peter
|
8ba840f1d9
|
Issue #2170: Initial plugin rename for notification framework
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13
Former-commit-id: 8a8eff74685abb8a709480fa33f2c56dd7923ab9
|
2013-07-26 14:36:46 -05:00 |
|
Steve Harris
|
2a216f333c
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
c83e5ff474
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
06a8b51d6d
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|