Steve Harris
|
6ef3b9f1e5
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: c782956ef32875130bd97a0bdbffdf005e1940e3
|
2014-05-05 08:21:02 -05:00 |
|
Brian.Dyke
|
a19f01c620
|
Merged 13.5.5 -2 and -3 into 1412
Former-commit-id: 4e921dbeab89e61635144b441ae0015155376c59
|
2014-04-24 13:01:50 -04:00 |
|
Richard Peter
|
95eba8dcf6
|
Merge branch 'master_14.1.2' into master_14.2.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/textUtilities/regular/VectorRelatedPhrases.py
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/ThinClientDataUpdateTree.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
edexOsgi/build.edex/esb/conf/log4j.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/textproducts/templates/utility/SAF_Site_MultiPil_Definition.py
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
Former-commit-id: 3c8cf44cc2573c17e20c93fd5153c5ed54df12c2
|
2014-04-09 16:00:54 -05:00 |
|
Brian.Dyke
|
6a28fcb156
|
Merged 1354 -5 and -6 into 1412 based on 1411-25
Former-commit-id: 407b42b0eff676a95483e219d6be899e45effd6c
|
2014-04-04 12:57:32 -04:00 |
|
Steve Harris
|
3328e2dd1d
|
14.1.1-7 baseline
Former-commit-id: 8add3b227e88c3943ea605fdc4e2f2b3c7dcf998
|
2013-11-06 14:16:14 -05:00 |
|
Nate Jensen
|
6c2ff04b69
|
Issue #2361 remove XML annotations and IDecoderGettable from a variety of plugins
Change-Id: Ib9b09659bbcca9b47c3e185e895d0deb1ba23739
Former-commit-id: 065be6691bf102699dc7ece3424f6972792c4d6f
|
2013-10-15 10:08:15 -05:00 |
|
Nate Jensen
|
0cff122d9c
|
Issue #2361 remove ISerializableObject for some pointdata and user roles classes
Change-Id: I8a4a53dd1139a376aaa001bb7fef38444d8db005
Former-commit-id: 3fa7b3de6733842c240959030023e84c844ef760
|
2013-10-09 18:03:11 -05:00 |
|
Richard Peter
|
592218edb8
|
Issue #2298: Make getPluginName abstract
Change-Id: Ieefc9ab24dee34ed5c653d035db2a2e1f0e6f9ae
Former-commit-id: 54356ea774bfab26b85aff317fc759de41e259d1
|
2013-09-03 11:51:27 -05:00 |
|
Richard Peter
|
359ee5d1af
|
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
|
998961612c
|
13.5.1-1 baseline
Former-commit-id: 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3
|
2013-06-10 15:17:17 -04:00 |
|
Ben Steffensmeier
|
c0d8dad8ae
|
Issue #1869 Remove DataURI column from qc.
Former-commit-id: e54b02e75b3534f829f0cc4be2639ae5ed26663e
|
2013-05-16 17:48:37 -05:00 |
|
Ben Steffensmeier
|
4209e014d8
|
Issue #1869 Remove dataURI column from PluginDataObject.
Change-Id: I3450130d8e68c065683794ba941a83897fe36745
Former-commit-id: 7fd2829cd730562a549a2f3c423ac5ead15872e7
|
2013-05-08 18:39:25 -05:00 |
|
Steve Harris
|
d33e5861aa
|
13.4.1-4 baseline
Former-commit-id: 4477bad886dc7ae0418409e3bc5ebce7965b6146
|
2013-05-02 10:00:38 -05:00 |
|
Brad Gonzales
|
dc37712fda
|
Issue #1857 Added sequence generator annotation to PluginDataObject concrete classes.
Amend: comment updates from peer review.
added sequence delta script.
Change-Id: Id8685fa0790926564d5d575e43a3da24db27dcf1
Former-commit-id: 562c9fa0341d0fb351adb8e57c14f1ce0bc59c95
|
2013-04-16 14:44:06 -05:00 |
|
Steve Harris
|
9be238bcc4
|
13.3.1-19 baseline
Former-commit-id: ce855032b2b7235b2aea8dc66aff89ca7c54854a
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
61f269f54c
|
12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
67a5a68300
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
root
|
9f19e3f712
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|