Nate Jensen
63b925e17e
Omaha #3133 remove unused dependencies
...
Change-Id: I9a0ac7d0b15f266ea8818ac0db82067887e59ec6
Former-commit-id: 1ae82b82db3db92e6c0b
2014-05-15 13:57:55 -05:00
Nate Jensen
7ed74b7242
Merge "Omaha #3061 added better checks for when to send invite/session payloads" into omaha_14.4.1
...
Former-commit-id: 2cd5c8cca9198a63cef8
2014-05-15 08:36:51 -05:00
Steve Harris
5e6b9943f1
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Former-commit-id: c83753b4d31a06d18686
2014-05-15 08:31:27 -05:00
Brian Clements
ee51a84f50
Omaha #3061 added better checks for when to send invite/session payloads
...
Former-commit-id: 01269cd989a698d81571
2014-05-14 17:00:09 -05:00
Richard Peter
02d94c61fb
Merge "Omaha #2536 moved WMO Header into new common plugin" into omaha_14.4.1
...
Former-commit-id: f6d1e1012e7ae2b1299f
2014-05-14 16:25:16 -05:00
Brian.Dyke
f38d0138e6
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
...
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: d3fa10028c627541512d
2014-05-14 16:08:16 -04:00
Qinglu.Lin
b7d276d00f
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
...
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: c5097660c275c4b15e8e
2014-05-14 15:30:16 -04:00
Ben Steffensmeier
270e8805cc
Omaha #2697 Collaboration will no longer use local maps.
...
Former-commit-id: 1db137a21e3e23857dcc
2014-05-14 13:53:29 -05:00
Brian Clements
437d9bb781
Omaha #2536 moved WMO Header into new common plugin
...
moved WMO time parsing code from TimeTools to WMOTimeParser
Former-commit-id: 6bd43f79ff2b1c7eaa37
2014-05-14 13:45:09 -05:00
Nate Jensen
bab916f2be
Omaha #3133 remove unused uf.common.cache from alertviz feature
...
Change-Id: Ib4a36a727e8b26a708f247e6263518786cc60832
Former-commit-id: 5eaa5d7b0e68c8238275
2014-05-13 17:52:12 -05:00
Bryan Kowal
a352aadc90
Issue #3159 - rebuild with newer gridslice source
...
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: 8d5326cc1b3535340136
2014-05-13 14:43:04 -05:00
Nate Jensen
e464500dfc
Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt
...
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851
Former-commit-id: 174fae77d107426ce408
2014-05-13 13:12:54 -05:00
Brian.Dyke
5a2e0c7e1b
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
...
Former-commit-id: fb4c7e55b3e95bc87a19
2014-05-13 11:23:55 -04:00
Matthew Howard
7b087f422d
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
...
Former-commit-id: 576a2d63ec5a20085f32
2014-05-13 07:49:18 -05:00
Nate Jensen
88535c69f5
Omaha #3133 remove edex dependencies from common.monitor plugin
...
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3
Former-commit-id: b05630b171cc86f19bad
2014-05-12 16:46:06 -05:00
Steve Harris
848519177d
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: fc2bf6b45ccf62cf4a6e
2014-05-12 16:13:19 -05:00
Steve Harris
b3bc71c8a4
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/SliceSample.py
edexOsgi/com.raytheon.uf.edex.auth/resources/thriftService.properties
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
Former-commit-id: 6964df0664652fb19bc4
2014-05-12 15:05:43 -05:00
Zhidong.Hao
30b42030dd
ASM #509 GFE: Product editor still auto-wraps when the option is turned off
...
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4
Former-commit-id: 030b767299d6cae51207
2014-05-12 15:16:38 -04:00
Juliya Dynina
43b45e9f53
Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
...
Former-commit-id: e33a27684c107b64a544
2014-05-12 14:01:40 -05:00
Juliya Dynina
6713e83ae6
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
...
Former-commit-id: 4f7fa8a8ded7bea845fe
2014-05-12 14:01:07 -05:00
Ana Rivera
7e74e047a0
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
...
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: 81a9d4fa4491715e7a3f
2014-05-12 18:55:06 +00:00
Matthew Howard
e64f60ba98
Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
...
Former-commit-id: 0dc1db0072b807c877f4
2014-05-12 13:52:12 -05:00
Loubna.Bousaidi
e634d0cdcf
ASM #527 update revision and shef_qual_code
...
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: d3be6d0476ec5bd7a2bb
2014-05-12 18:42:12 +00:00
Zhidong.Hao
29e7d7e888
ASM #537 AvnFPS: Syntax failed to flag format error
...
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 074713bb4a8d560036b1
2014-05-12 14:33:25 -04:00
Brian.Dyke
3aa2f7974b
CM-MERGE:OB13.5.5-5 into 14.1.2
...
Former-commit-id: 41ba5fc348386ec058e1
2014-05-12 14:07:11 -04:00
Matthew Howard
f1dfdd2878
Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
...
Former-commit-id: 42cce01396d40d9931db
2014-05-12 13:00:55 -05:00
Rici.Yu
34069a96be
ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
...
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127
Former-commit-id: 96d15550122ea1c1fa60
2014-05-12 13:38:04 -04:00
Nate Jensen
650edc41f3
Merge "Omaha #3075 updates for pydev 3.4.1" into omaha_14.4.1
...
Former-commit-id: ab064743f4eff5a8e32f
2014-05-12 11:56:34 -05:00
Bryan Kowal
8f16f25cd7
Issue #3026 - remove unnecessary hpe ffmp dependency
...
Former-commit-id: faa6b09ac96e6a6a73ee
2014-05-12 11:46:35 -05:00
Michael Gamazaychikov
65353b595e
ASM #526 - Duration menu disabled after creating text for a COR SVS.
...
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c
Former-commit-id: 8a9c7ecb114f541a5460
2014-05-12 13:33:58 +01:00
Nate Jensen
5fcc126e57
Omaha #3075 updates for pydev 3.4.1
...
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1
Former-commit-id: bb32858c04e6569b4a7d
2014-05-09 16:45:39 -05:00
Brian Clements
26d206f780
Omaha #3107 added timeout handling logic for leader transfer verification
...
Former-commit-id: 7b7bc5be9708a406ff18
2014-05-09 15:43:46 -05:00
Lee Venable
cd5956d21a
Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
...
Former-commit-id: e3c6407be3364f0d877a
2014-05-09 11:14:51 -05:00
Juliya Dynina
448dfef9e7
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
...
Former-commit-id: 963a58ebbadd13f453e6
2014-05-09 11:08:12 -05:00
Mike Duff
158fb46b9f
Issue #3145 - Fix Scan threat labels, dispose font
...
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d
Former-commit-id: a81569849b03356dd554
2014-05-09 10:32:04 -05:00
Nate Jensen
d0d20849b6
Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
...
Former-commit-id: e8c4279d10575360192a
2014-05-09 09:53:25 -05:00
Roger Ferrel
6bfacf85ab
Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.
...
Change-Id: Ibcd4c5389ba081b19a3134989c507b88b2d882b8
Former-commit-id: c226ef3596039f4826ea
2014-05-09 09:34:49 -05:00
Mike Duff
7e996909d1
Issue #3026 - feature.xml fix
...
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794
Former-commit-id: 038b2b750078f2a26903
2014-05-09 09:27:10 -05:00
Ben Steffensmeier
60479824d1
Issue #2920 Fix default color of BOXED text.
...
Former-commit-id: 9d4c33ba9187ea43cf0d
2014-05-08 18:18:08 -05:00
Ana Rivera
e7fbea035f
VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
...
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b
Former-commit-id: 1b4450ec5faac45623bc
2014-05-08 20:10:24 +00:00
Mike Duff
a6e0ed67d1
Issue #3026 - NullPointer fix, test classpath fix
...
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: 335c02d2c6b23473ee8a
2014-05-08 15:02:54 -05:00
Lee Venable
319073a795
Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
...
Former-commit-id: 1496955e4492517d3ca2
2014-05-08 14:47:03 -05:00
Mike Duff
0456fd0597
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
...
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 6a67638a948498235fd8
2014-05-08 14:36:54 -05:00
Nate Jensen
84f9cd1dc8
Issue #2060 fix auto-update errors with grids in non-map displays
...
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de
Former-commit-id: ecc5c5849f3e3035b6f1
2014-05-08 14:08:06 -05:00
Kiran.Shrestha
c1d2c93db3
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
...
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b
Former-commit-id: f1a707cf64f013b49282
2014-05-08 15:07:42 -04:00
Steve Harris
a804a071c0
Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
...
Former-commit-id: ff4a6b8122ce2b030743
2014-05-08 09:50:34 -05:00
Michael Gamazaychikov
4a7d050dd4
ASM #526 - Duration menu disabled after creating text for a COR SVS.
...
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf
Former-commit-id: 588cfd0608e7341afe4d
2014-05-08 14:02:21 +01:00
Steve Harris
ddd6e35478
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
Former-commit-id: b7a1bda98ce37e40ed19
2014-05-07 16:01:53 -05:00
Juliya Dynina
2f3f953823
Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1
...
Former-commit-id: 92202928c9d6a796c476
2014-05-07 14:18:01 -05:00
Ben Steffensmeier
a19a5bf986
Issue #3119 Optimize plot rendering.
...
Former-commit-id: 7274d01d64d7cb05fd92
2014-05-07 13:27:48 -05:00
