mjames-upc
|
51d96088e2
|
ufpy->awips
Former-commit-id: 7cf8ba6f023a28b31012f523863fc374d91842ac
|
2016-06-27 17:02:26 -05:00 |
|
mjames-upc
|
cbda80f565
|
remove files large than 50M
Former-commit-id: e53afad3cc2e60d9845b5b6b4471ef138d1b24b0
|
2016-06-27 15:35:21 -05:00 |
|
Steve Harris
|
385401f9ae
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 445a3ae3da804f366c1162104640d8459ab650d0
|
2016-03-28 17:31:59 -05:00 |
|
Ron Anderson
|
f0f29fca0f
|
Omaha #5481 Fix alignment of fields in teh DataSourceTabComp
Change-Id: Ic652e6ed804464b8be341aac28948f6eba075fdc
Former-commit-id: 98deb13597a08d6ab6be5fe24eec76f8260aa47e
|
2016-03-22 17:15:44 -05:00 |
|
Steve Harris
|
1fcd56f80c
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafSiteInfoEditorDlg.java
Former-commit-id: 7f8a53245387ef9053f7847a5a163eb32ae3e72d
|
2016-03-16 15:28:46 -05:00 |
|
Ron Anderson
|
f9b7e8f525
|
Omaha #5481 Fix GUI sizing issues in AvnFPS dialogs
Change-Id: I70dbcfa75c3538b82e768fb8fd690c19c77dd3de
Former-commit-id: 10e78a72a7fabeda32f97ea1477fc02a1ce14a43
|
2016-03-16 08:43:52 -05:00 |
|
Steve Harris
|
cee8d3d87f
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Former-commit-id: b6c20007e2d4fc9e54085d1d0e7b0db003f2220a
|
2016-03-10 13:22:55 -06:00 |
|
Zhidong.Hao
|
4e0cdde46d
|
ASM #18664 AvnFPS: When TAF product consists of -RA BR weather elements, it flags as an error found and displays the incorrect bubble text
Change-Id: I67f5252ee49f3811849e96bb3c7ab40e1d2631fe
Former-commit-id: 1feb3a5398b76ba2c9e816597a00aa5064c2b8b1
|
2016-03-03 15:10:07 -05:00 |
|
Steve Harris
|
c2b471a870
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/TCVDictionary.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a7340c2bf23cbc3d27ca52fbf2ccd9c7d1cb09c2
|
2016-02-29 13:39:42 -06:00 |
|
Zhidong.Hao
|
52d5de6b03
|
ASM #18395 AvnFPS: When append new data from NCDC for multiple sites it only processes a single site.
Change-Id: I9612d2a93597fdd379712b3570e40bc14ff69696
Former-commit-id: fdc00cd9faa71ea507f31fa9992ff1b42dd71dd3
|
2016-02-25 13:58:27 -05:00 |
|
Steve Harris
|
4ba488bd0a
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Former-commit-id: 27f7e431d04f99ec48723c71413e9633c0d1996e
|
2016-02-15 10:15:20 -06:00 |
|
Nate Jensen
|
1bb89db5e1
|
Merge "Omaha #5242: Remove calls to deprecated Localization APIs from AvnFPS." into omaha_16.2.2
Former-commit-id: 320b6af8e417941cfc272a5ef98f8d8946406d32
|
2016-02-12 09:23:43 -06:00 |
|
David Gillingham
|
f7879e1114
|
Omaha #5242: Remove calls to deprecated Localization APIs from AvnFPS.
Change-Id: I48e64c52d29d0ff56920aa95bc3c2af657762011
Former-commit-id: cafbca5b171be325f40908079d100d193440e2f9
|
2016-02-11 16:30:12 -06:00 |
|
Nathan Bowler
|
063c473391
|
Omaha #5283 Remove support for discontinued NGM data
Change-Id: I9c3fcf3bff03ed78cf77a8fdcd8b95da4d470dae
Former-commit-id: 0867569ae733dee3632e31bc216a06d356530e24
|
2016-02-11 12:20:32 -05:00 |
|
Zhidong.Hao
|
da6473473a
|
ASM #18395 AvnFPS: When append new data from NCDC for multiple sites it only processes a single site.
Change-Id: I398e7b983624273ae857c5fd78db65ce1062ed58
Former-commit-id: 2fcd057860f9cf013b7a19ab0fb8da420ec2fb6e
|
2016-01-28 12:29:18 -05:00 |
|
Nate Jensen
|
b7628ba147
|
Omaha #5242 replace calls to deprecated LocalizationFile methods
Change-Id: Id3a47ee5b9f3b24690fe59d6a82cfd2e141e3c14
Former-commit-id: 421983feb387cb13c73ed288ddbbc607238e58e2
|
2016-01-21 10:59:54 -06:00 |
|
Steve Harris
|
11a5db155d
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
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/gis/GeospatialFactory.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java
Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
|
2016-01-20 15:23:43 -06:00 |
|
Shawn.Hooper
|
bd27f40c6d
|
Merge tag 'OB_16.1.2-9' into master_16.2.1
16.1.2-9
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c
Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
|
2016-01-12 15:10:02 -05:00 |
|
Steve Harris
|
8a07970ba6
|
Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java
Former-commit-id: d9745246c0f81ec088b3f4108b30e02c33f6a9ae
|
2016-01-06 11:55:00 -06:00 |
|
Zhidong.Hao
|
40c3cb9749
|
ASM #18342 AvnFPS: Climatology chart calculation is incorrect as compared to A1
Change-Id: I19568e71de43f3eeec8412431e437ea01b76d7bc
Former-commit-id: 35d85e0599f73b5da4c4cc287fa7d25493ef5cab
|
2015-12-22 14:29:14 -05:00 |
|
Zhidong.Hao
|
0e3ba5c5fc
|
ASM #18341 AvnFPS: HDF5 climate NCDC data type conversion issue
Change-Id: If728efeec48dd74917a271a2351bf4bd777d3445
Former-commit-id: 8c9911836586c6760b7c4f844b54b2453be3a998
|
2015-12-22 11:02:46 -05:00 |
|
Zhidong.Hao
|
7ffc8d278e
|
ASM #18341 AvnFPS: HDF5 climate NCDC data type conversion issue
Change-Id: Ic8093a7213bdae6a4931619ad176bd0ac4e8fb0a
Former-commit-id: 69de9d7a87dd525d835ddf2ab204e57129d2e1a6
|
2015-12-22 10:57:02 -05:00 |
|
Nate Jensen
|
3511de9e2b
|
Omaha #4834 remove more LocalizationOpFailedExceptions
Change-Id: I0b8717b72b051169360ce167e796b35a786ee1a1
Former-commit-id: 4605396f4a9d1f77df9566e02cca1bd3e9f56e26
|
2015-12-01 13:13:26 -06:00 |
|
Shawn.Hooper
|
e93839673c
|
Merge branch 'asm_16.2.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.2.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
Former-commit-id: 0d5c4caf82d74459f9412800955d6cb9da18f3fb
|
2015-11-25 14:31:20 -05:00 |
|
Nate Jensen
|
acc931788c
|
Omaha #4834 remove catch LocalizationOpFailedException
replace catching LocalizationOpFailedException with
LocalizationException
Change-Id: Ib5ed69539474d798d04363106a5a2aaf47ac6e58
Former-commit-id: c465340cf3d5215c10409354b380ed76bbbca270
|
2015-11-12 14:32:01 -06:00 |
|
Zhidong.Hao
|
671c0950fd
|
ASM #16907 AvnFPS: Climate download files from NCDC server changed in format
Change-Id: Ie4df72b2d5634fadfed762b26b75403661a80e9d
Former-commit-id: 104ffc7ec2028a4ed2f98d60e9f7d1789de89fd3
|
2015-11-04 14:22:02 -05:00 |
|
Zhidong.Hao
|
2edd4b719b
|
ASM #15464 AvnFPS: error occurs in generating guidance in certain case
Change-Id: I065aea4c91c8edbdf5450c323ca6ec41b32318bf
Former-commit-id: a4267039a0d1fae0dc7325747037de076d18c96d
|
2015-10-28 15:06:22 -04:00 |
|
David Gillingham
|
648bb0e367
|
Omaha #5003: Update A2 baseline code to utilize apache commons-lang version 3.
Change-Id: I2b23399b2cfd3d37a41f89cb3c3173ca628caecb
Former-commit-id: b9c41fe3354a90a03440e1ea67991e6ecd5885c0
|
2015-10-28 13:21:07 -05:00 |
|
Slav Korolev
|
0f49d915aa
|
Omaha #5017 - Fixed AvnFPS Syntax check for P6SM +SN errors.
Former-commit-id: f8b893a62b59d2de9fe33b361b6949569b59cbc3
|
2015-10-23 09:46:07 -04:00 |
|
Bryan Kowal
|
5295e7538b
|
Omaha #4897 - The Collection/Dissemination menu item is now optional.
Change-Id: I3be625b8e2d46babce7359a089c8c7d2ce59a987
Former-commit-id: d224f6c514c9ecc48b832c998ad86fd104ae2faf
|
2015-10-13 11:26:17 -05:00 |
|
Nate Jensen
|
8a0031aeec
|
Merge "Omaha #4880 remove unused A1 avnfps code" into omaha_16.2.1
Former-commit-id: 3b2982a4eed9d28a5920376a9de9249cdc533274
|
2015-09-16 12:14:11 -05:00 |
|
Nate Jensen
|
a6c2a05e75
|
Merge "Omaha #4880 remove dead avnfps java code" into omaha_16.2.1
Former-commit-id: 892b612e66d7ab98afec1784929fc67d0708a9e2
|
2015-09-15 18:06:43 -05:00 |
|
Steve Harris
|
fbdce3bede
|
Merge tag 'OB_16.1.1-11' into omaha_16.2.1
16.1.1-11
Conflicts:
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 3104ad23039ebe9333df058e004e3c9a6cdb1a11
|
2015-09-15 15:43:10 -05:00 |
|
Nate Jensen
|
97c8f777a1
|
Omaha #4880 remove dead avnfps java code
Change-Id: Iefdc821cdb21f7947ee8c2d97a346ff532a61fb3
Former-commit-id: 50136bba2d368b68d41ce76c0ce0a660ff5e73ce
|
2015-09-15 14:01:51 -05:00 |
|
Nate Jensen
|
aacefea3d5
|
Omaha #4880 remove unused A1 avnfps code
Change-Id: I2f4ec83a7298614405dcf5ae6205ccca356e421c
Former-commit-id: e8083f3740c74bd315a4e2b92d93d5abe79d852f
|
2015-09-15 09:25:51 -05:00 |
|
Zhidong.Hao
|
81b94c87c4
|
ASM #17540 AvnFPS: Unable to set TAF default issuance time
Change-Id: I70cf4675c19575320b1763aa0e5c35f6336bea3b
Former-commit-id: 5141a592712ec56b95d3e954507624b5f2081f37
|
2015-08-28 11:27:27 -04:00 |
|
Steve Harris
|
b95fd6e5a2
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: 8de0a0d42550690492c701c11c551f53aca5b02f
|
2015-08-11 19:47:53 -05:00 |
|
Steve Harris
|
f696d5731d
|
Merge tag 'OB_16.1.1-2' into omaha_16.2.1
16.1.1-2
Conflicts:
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.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJobPool.java
Former-commit-id: 8053621c46adc8813128ecfa81c0834f670db64f
|
2015-08-03 17:06:31 -05:00 |
|
Matthew Howard
|
3dd1dc8bc6
|
Merge "ASM #17540 AvnFPS: Unable to set TAF default issuance time" into asm_16.1.1
Former-commit-id: 1081501a23f7fd8717e8ec091bcea99d0ad8bed8
|
2015-08-03 10:11:57 -05:00 |
|
Zhidong.Hao
|
0205e50e16
|
ASM #17540 AvnFPS: Unable to set TAF default issuance time
Change-Id: I0722ce915e7f3d209875b173db6e6f8ff4af798b
Former-commit-id: 349591330b4804078afc46a92ca17576288ddc67
|
2015-08-03 10:09:01 -04: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 |
|
David Gillingham
|
e5d1de2aaa
|
Omaha #4544: Update AvnFPS to use new LAMP bufrmos lightning parameters.
Change-Id: I1c8e97e4bfd55082df3770b8321f34b0e4a1f208
Former-commit-id: e9f1505c8972f7ba362b64376421755f620e0201
|
2015-07-14 15:38:33 -05:00 |
|
Zhidong.Hao
|
3e12a5ecf4
|
ASM #16907 AvnFPS: Climate download files from NCDC server changed in format
Change-Id: Ifa6ee6b0fb64ce2a4fd9a9ac0f7976e855242d33
Former-commit-id: fc4a2bcfb918cce995444464aefe92a438ba995f
|
2015-07-10 15:13:44 -04:00 |
|
Zhidong.Hao
|
02599a6039
|
ASM #16907 AvnFPS: Climate download files from NCDC server changed in format
Change-Id: Ibfd5fa35b58ffd66eaf81945fb0b31f7ea632b65
Former-commit-id: 81c22bdd36a80a1f5deaf81926f8f07f24c929f9
|
2015-07-07 14:33:12 -04:00 |
|
Zhidong.Hao
|
4446a46179
|
ASM #16973 Drifting Snow abbrev (DRSN) not accepted in AvnFPS
Change-Id: I4547b9d761252725d911bbd4db50417c359db548
Former-commit-id: cb8a47032b697ef0caeb00f6b21e7857dc8e643b
|
2015-07-07 11:28:37 -04:00 |
|
Steve Harris
|
4de63454fc
|
Merge tag 'OB_15.1.1-16' into omaha_16.1.1
15.1.1-16
Conflicts:
cave/com.raytheon.viz.gfe/build.properties
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore)
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc
|
2015-06-05 15:38:00 -05:00 |
|
Steve Harris
|
7e7cdd1c7a
|
Merge tag 'OB_15.1.1-14' into omaha_16.1.1
15.1.1-14
Conflicts:
cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Former-commit-id: 92470a2ce7952ee72dbe2557ee16ee54d7ae901c
|
2015-06-04 11:08:19 -05:00 |
|
Matthew Howard
|
64fa93c1aa
|
Merge "ASM #17533 - get all rules in AvnFPS Monitoring Criteria window" into asm_15.1.1
Former-commit-id: 34eb6e4644918e798ede647752be99c60a5edbe0
|
2015-06-02 14:50:18 -05:00 |
|
Yun.Teng
|
871aaeab91
|
ASM #17533 - get all rules in AvnFPS Monitoring Criteria window
Change-Id: Icf1ffb6dd5849583e41ce3aab917df34006a4a22
Former-commit-id: 34987045d6e8df599d5f2ec0ca34c5ecabf5f4e8
|
2015-06-02 18:46:58 +01:00 |
|
Yun.Teng
|
f1b109a3fb
|
ASM #17417 - Display complete AvnFPS station list instead of one
Change-Id: I6de2526250d5c0df553c60668b690574bc4ba1f8
Former-commit-id: 4db44b41db3b13ac55f77752dca1e5ebf458b999
|
2015-05-28 17:08:25 -04:00 |
|