Richard Peter
|
29a58d9c6a
|
Merge "Omaha #2536 moved WMO Header into new common plugin" into omaha_14.4.1
Former-commit-id: 02d94c61fb [formerly 7ae2b1299f] [formerly 02d94c61fb [formerly 7ae2b1299f] [formerly f6d1e1012e [formerly 1844df3fb769bccb3e5b19722e2fdeaec9c6bbe0]]]
Former-commit-id: f6d1e1012e
Former-commit-id: 72200f0892 [formerly 56d0cd836f]
Former-commit-id: e7bc7051df
|
2014-05-14 16:25:16 -05:00 |
|
Brian.Dyke
|
1d53f6d304
|
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: f38d0138e6 [formerly 627541512d] [formerly f38d0138e6 [formerly 627541512d] [formerly d3fa10028c [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]]
Former-commit-id: d3fa10028c
Former-commit-id: b0837b4905 [formerly 68f3a0169e]
Former-commit-id: f87775928f
|
2014-05-14 16:08:16 -04:00 |
|
Qinglu.Lin
|
603c6a1843
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: b7d276d00f [formerly 75c4b15e8e] [formerly b7d276d00f [formerly 75c4b15e8e] [formerly c5097660c2 [formerly 763641d787f7f8c79bf28456314dcc16786702ed]]]
Former-commit-id: c5097660c2
Former-commit-id: bdae3cdfdf [formerly 89fa05128e]
Former-commit-id: 42c5ce2aff
|
2014-05-14 15:30:16 -04:00 |
|
Ben Steffensmeier
|
1ac0aeacc5
|
Omaha #2697 Collaboration will no longer use local maps.
Former-commit-id: 270e8805cc [formerly 3e23857dcc] [formerly 270e8805cc [formerly 3e23857dcc] [formerly 1db137a21e [formerly 7e10b6d308a3bb17692abaefd9a8e84cc5016621]]]
Former-commit-id: 1db137a21e
Former-commit-id: fc54a7f697 [formerly 759b1460d4]
Former-commit-id: e8813c2f24
|
2014-05-14 13:53:29 -05:00 |
|
Brian Clements
|
7473191ba6
|
Omaha #2536 moved WMO Header into new common plugin
moved WMO time parsing code from TimeTools to WMOTimeParser
Former-commit-id: 437d9bb781 [formerly 2b1c7eaa37] [formerly 437d9bb781 [formerly 2b1c7eaa37] [formerly 6bd43f79ff [formerly c2e57be98850284cb01ba921b9dddcadbe66b311]]]
Former-commit-id: 6bd43f79ff
Former-commit-id: abd29bf492 [formerly ee9757ea39]
Former-commit-id: e9ee0bcbde
|
2014-05-14 13:45:09 -05:00 |
|
Nate Jensen
|
5da8849cf5
|
Omaha #3133 remove unused uf.common.cache from alertviz feature
Change-Id: Ib4a36a727e8b26a708f247e6263518786cc60832
Former-commit-id: bab916f2be [formerly 68c8238275] [formerly bab916f2be [formerly 68c8238275] [formerly 5eaa5d7b0e [formerly e659b393f23e5e999c2b03ddad648f2748ee97e9]]]
Former-commit-id: 5eaa5d7b0e
Former-commit-id: e8661182d0 [formerly 2a6d25cf41]
Former-commit-id: 437d400966
|
2014-05-13 17:52:12 -05:00 |
|
Bryan Kowal
|
ddf6cc758d
|
Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: a352aadc90 [formerly 3535340136] [formerly a352aadc90 [formerly 3535340136] [formerly 8d5326cc1b [formerly 2b13221d7c644147f6eda1acb8b126667be00926]]]
Former-commit-id: 8d5326cc1b
Former-commit-id: 1c64a47950 [formerly 43eddea171]
Former-commit-id: 4e3afb78fc
|
2014-05-13 14:43:04 -05:00 |
|
Nate Jensen
|
824c2f805d
|
Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851
Former-commit-id: e464500dfc [formerly 07426ce408] [formerly e464500dfc [formerly 07426ce408] [formerly 174fae77d1 [formerly b842a78cdfb945767aecf7da3ad55b71c9d09bfb]]]
Former-commit-id: 174fae77d1
Former-commit-id: c31080d705 [formerly ea7b123eef]
Former-commit-id: 4a18f1e24b
|
2014-05-13 13:12:54 -05:00 |
|
Brian.Dyke
|
4cedfadd77
|
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: 5a2e0c7e1b [formerly e95bc87a19] [formerly 5a2e0c7e1b [formerly e95bc87a19] [formerly fb4c7e55b3 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]]
Former-commit-id: fb4c7e55b3
Former-commit-id: f9474b087e [formerly 0311366ffb]
Former-commit-id: 3b7a2f1645
|
2014-05-13 11:23:55 -04:00 |
|
Matthew Howard
|
26c357a549
|
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
Former-commit-id: 7b087f422d [formerly 5a20085f32] [formerly 7b087f422d [formerly 5a20085f32] [formerly 576a2d63ec [formerly 2052df4ca5f68165b477994b21357c245ff73546]]]
Former-commit-id: 576a2d63ec
Former-commit-id: c919d3503a [formerly 1026f04671]
Former-commit-id: 56778b394b
|
2014-05-13 07:49:18 -05:00 |
|
Nate Jensen
|
dc2ac6e07b
|
Omaha #3133 remove edex dependencies from common.monitor plugin
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3
Former-commit-id: 88535c69f5 [formerly cc86f19bad] [formerly 88535c69f5 [formerly cc86f19bad] [formerly b05630b171 [formerly d25e1bee210a084e17d4ee781eddb42c14735140]]]
Former-commit-id: b05630b171
Former-commit-id: 5d099a3b4b [formerly 3aff81313f]
Former-commit-id: 363b019ceb
|
2014-05-12 16:46:06 -05:00 |
|
Steve Harris
|
82045e2409
|
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: 848519177d [formerly cf62cf4a6e] [formerly 848519177d [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: 32f255cada [formerly 233922471a]
Former-commit-id: 74a325ce74
|
2014-05-12 16:13:19 -05:00 |
|
Steve Harris
|
ae3bc184ce
|
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: b3bc71c8a4 [formerly 652fb19bc4] [formerly b3bc71c8a4 [formerly 652fb19bc4] [formerly 6964df0664 [formerly a20833879f1a0434c562a22a874b1e1722278954]]]
Former-commit-id: 6964df0664
Former-commit-id: 77b2da7a4f [formerly 661eceea83]
Former-commit-id: d33fbe7c31
|
2014-05-12 15:05:43 -05:00 |
|
Zhidong.Hao
|
af44604e04
|
ASM #509 GFE: Product editor still auto-wraps when the option is turned off
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4
Former-commit-id: 30b42030dd [formerly d6cae51207] [formerly 30b42030dd [formerly d6cae51207] [formerly 030b767299 [formerly a48b81894fed165aba58a0097359bbd0f1931be5]]]
Former-commit-id: 030b767299
Former-commit-id: 31678eb223 [formerly 88c5e2d94c]
Former-commit-id: 6dd1289c31
|
2014-05-12 15:16:38 -04:00 |
|
Juliya Dynina
|
00bab1367a
|
Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
Former-commit-id: 43b45e9f53 [formerly 107b64a544] [formerly 43b45e9f53 [formerly 107b64a544] [formerly e33a27684c [formerly 0c54c56efa1306d781d64621ccf7f62b3bf70997]]]
Former-commit-id: e33a27684c
Former-commit-id: ed4e911992 [formerly a0b2051e7e]
Former-commit-id: ce9120be90
|
2014-05-12 14:01:40 -05:00 |
|
Juliya Dynina
|
2e191584e6
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 6713e83ae6 [formerly d7bea845fe] [formerly 6713e83ae6 [formerly d7bea845fe] [formerly 4f7fa8a8de [formerly 350448988d24fd2eb58812128b062e3a0f44b956]]]
Former-commit-id: 4f7fa8a8de
Former-commit-id: cd1f437163 [formerly 190bf23ba8]
Former-commit-id: b65a50fd3e
|
2014-05-12 14:01:07 -05:00 |
|
Ana Rivera
|
94ceb3698f
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: 7e74e047a0 [formerly 91715e7a3f] [formerly 7e74e047a0 [formerly 91715e7a3f] [formerly 81a9d4fa44 [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]]]
Former-commit-id: 81a9d4fa44
Former-commit-id: e33c6e2d69 [formerly 88520fc206]
Former-commit-id: 8cb1bfc3b8
|
2014-05-12 18:55:06 +00:00 |
|
Matthew Howard
|
edb7266206
|
Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: e64f60ba98 [formerly b807c877f4] [formerly e64f60ba98 [formerly b807c877f4] [formerly 0dc1db0072 [formerly 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f]]]
Former-commit-id: 0dc1db0072
Former-commit-id: 9593ff9ed5 [formerly da9b3dd158]
Former-commit-id: db59b081af
|
2014-05-12 13:52:12 -05:00 |
|
Loubna.Bousaidi
|
6e8a4ec60d
|
ASM #527 update revision and shef_qual_code
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: e634d0cdcf [formerly ec5bd7a2bb] [formerly e634d0cdcf [formerly ec5bd7a2bb] [formerly d3be6d0476 [formerly 860ea4b3644a526ac10b4366f158824fe6cbdcb0]]]
Former-commit-id: d3be6d0476
Former-commit-id: ebd5400a4f [formerly 6f335c71fe]
Former-commit-id: c9d2ccb5ff
|
2014-05-12 18:42:12 +00:00 |
|
Zhidong.Hao
|
f06165d783
|
ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 29e7d7e888 [formerly 8d560036b1] [formerly 29e7d7e888 [formerly 8d560036b1] [formerly 074713bb4a [formerly 62f8c0ab0e046fd4365bd37394f93e8bca4e642d]]]
Former-commit-id: 074713bb4a
Former-commit-id: f03c0c46d5 [formerly 51680a6d04]
Former-commit-id: b1c20f92c1
|
2014-05-12 14:33:25 -04:00 |
|
Brian.Dyke
|
464cc1a479
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3aa2f7974b [formerly 386ec058e1] [formerly 3aa2f7974b [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]
Former-commit-id: 41ba5fc348
Former-commit-id: dc5bc1d2a4 [formerly 2f704c898d]
Former-commit-id: 82663c0ab6
|
2014-05-12 14:07:11 -04:00 |
|
Matthew Howard
|
6a44f74885
|
Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
Former-commit-id: f1dfdd2878 [formerly d40d9931db] [formerly f1dfdd2878 [formerly d40d9931db] [formerly 42cce01396 [formerly 59fb75bdc025a3b2feb95d20d263060b55e87b28]]]
Former-commit-id: 42cce01396
Former-commit-id: 6106a76640 [formerly a4827323e6]
Former-commit-id: aeef207dff
|
2014-05-12 13:00:55 -05:00 |
|
Rici.Yu
|
120a23223b
|
ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127
Former-commit-id: 34069a96be [formerly 2ea1c1fa60] [formerly 34069a96be [formerly 2ea1c1fa60] [formerly 96d1555012 [formerly df46f9fc541a47e5f31210663ef69c4c5863fa28]]]
Former-commit-id: 96d1555012
Former-commit-id: 0ba9da16b0 [formerly 473496b99a]
Former-commit-id: be10c8d49c
|
2014-05-12 13:38:04 -04:00 |
|
Nate Jensen
|
8b8cb81410
|
Merge "Omaha #3075 updates for pydev 3.4.1" into omaha_14.4.1
Former-commit-id: 650edc41f3 [formerly eff5a8e32f] [formerly 650edc41f3 [formerly eff5a8e32f] [formerly ab064743f4 [formerly a213a01ac89bf84a6a0d4dfea44073cb0b2a7fce]]]
Former-commit-id: ab064743f4
Former-commit-id: c57623dc52 [formerly 7afd18662d]
Former-commit-id: 25216d1a2f
|
2014-05-12 11:56:34 -05:00 |
|
Bryan Kowal
|
1578a42992
|
Issue #3026 - remove unnecessary hpe ffmp dependency
Former-commit-id: 8f16f25cd7 [formerly 6e6a6a73ee] [formerly 8f16f25cd7 [formerly 6e6a6a73ee] [formerly faa6b09ac9 [formerly c94c973ef6a663f93a6b1a6301f5553d4e88ac73]]]
Former-commit-id: faa6b09ac9
Former-commit-id: 9153d61b90 [formerly 5f5987f57b]
Former-commit-id: 31d2290415
|
2014-05-12 11:46:35 -05:00 |
|
Michael Gamazaychikov
|
ce40c60dd3
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c
Former-commit-id: 65353b595e [formerly 4f541a5460] [formerly 65353b595e [formerly 4f541a5460] [formerly 8a9c7ecb11 [formerly 988d5f26d3bd3e42397f62288a8c9b10e341495b]]]
Former-commit-id: 8a9c7ecb11
Former-commit-id: eb159fb31f [formerly 447eca7802]
Former-commit-id: 14440818e7
|
2014-05-12 13:33:58 +01:00 |
|
Nate Jensen
|
064894fe59
|
Omaha #3075 updates for pydev 3.4.1
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1
Former-commit-id: 5fcc126e57 [formerly e6569b4a7d] [formerly 5fcc126e57 [formerly e6569b4a7d] [formerly bb32858c04 [formerly a038aea9bb25e31b29b054e8899c0b51bc183fef]]]
Former-commit-id: bb32858c04
Former-commit-id: 651ce74777 [formerly 5d08184312]
Former-commit-id: 9713ae6bf1
|
2014-05-09 16:45:39 -05:00 |
|
Brian Clements
|
415ff47d51
|
Omaha #3107 added timeout handling logic for leader transfer verification
Former-commit-id: 26d206f780 [formerly 08a406ff18] [formerly 26d206f780 [formerly 08a406ff18] [formerly 7b7bc5be97 [formerly 294a489ba547bf90df9d6b6a5107c8993c5b8333]]]
Former-commit-id: 7b7bc5be97
Former-commit-id: 98e74677fd [formerly 3d3d7f04bb]
Former-commit-id: 5e739b598c
|
2014-05-09 15:43:46 -05:00 |
|
Lee Venable
|
fb58021364
|
Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
Former-commit-id: cd5956d21a [formerly 364f0d877a] [formerly cd5956d21a [formerly 364f0d877a] [formerly e3c6407be3 [formerly 06b3cb4dd8f07600e6513a15a2495b485b0812b6]]]
Former-commit-id: e3c6407be3
Former-commit-id: a46987ef36 [formerly b06e8e6e3e]
Former-commit-id: d23ba206c9
|
2014-05-09 11:14:51 -05:00 |
|
Juliya Dynina
|
f31ab03907
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 448dfef9e7 [formerly dd13f453e6] [formerly 448dfef9e7 [formerly dd13f453e6] [formerly 963a58ebba [formerly 789fffccf3389143a1660a477301cfcb43a82890]]]
Former-commit-id: 963a58ebba
Former-commit-id: ad2be95671 [formerly 267244d378]
Former-commit-id: 8c0412111a
|
2014-05-09 11:08:12 -05:00 |
|
Mike Duff
|
e4e8e0fe8e
|
Issue #3145 - Fix Scan threat labels, dispose font
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d
Former-commit-id: 158fb46b9f [formerly 03356dd554] [formerly 158fb46b9f [formerly 03356dd554] [formerly a81569849b [formerly 84bd0800b2652b31c06015fa49f816f1402f461d]]]
Former-commit-id: a81569849b
Former-commit-id: 456038d161 [formerly 4ec26b6e31]
Former-commit-id: 32f6ad40ec
|
2014-05-09 10:32:04 -05:00 |
|
Nate Jensen
|
db6d756ffd
|
Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
Former-commit-id: d0d20849b6 [formerly 575360192a] [formerly d0d20849b6 [formerly 575360192a] [formerly e8c4279d10 [formerly 25e500435693940e378df086739fce8eefdba3bb]]]
Former-commit-id: e8c4279d10
Former-commit-id: e0365dd4a3 [formerly 95ca77688a]
Former-commit-id: 191d3a0d06
|
2014-05-09 09:53:25 -05:00 |
|
Roger Ferrel
|
ea6ef4eb89
|
Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.
Change-Id: Ibcd4c5389ba081b19a3134989c507b88b2d882b8
Former-commit-id: 6bfacf85ab [formerly 039f4826ea] [formerly 6bfacf85ab [formerly 039f4826ea] [formerly c226ef3596 [formerly 909a3f42bdb9d8149013056f9956bf0c38b764c5]]]
Former-commit-id: c226ef3596
Former-commit-id: 672875baf9 [formerly ce1ca8b4e3]
Former-commit-id: 940886ffae
|
2014-05-09 09:34:49 -05:00 |
|
Mike Duff
|
c984973464
|
Issue #3026 - feature.xml fix
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794
Former-commit-id: 7e996909d1 [formerly 78f2a26903] [formerly 7e996909d1 [formerly 78f2a26903] [formerly 038b2b7500 [formerly a44e412190741fcb0a91dd451ae538277ae0d79f]]]
Former-commit-id: 038b2b7500
Former-commit-id: b73e635162 [formerly c7f5379b78]
Former-commit-id: 25638a5b40
|
2014-05-09 09:27:10 -05:00 |
|
Ben Steffensmeier
|
f0c4cc03a0
|
Issue #2920 Fix default color of BOXED text.
Former-commit-id: 60479824d1 [formerly 87ea43cf0d] [formerly 60479824d1 [formerly 87ea43cf0d] [formerly 9d4c33ba91 [formerly 59f12cd4cc60f0908c106cbc0572d3f84d0d509b]]]
Former-commit-id: 9d4c33ba91
Former-commit-id: 082a5c515d [formerly 199a2df79e]
Former-commit-id: 2b4d783fd7
|
2014-05-08 18:18:08 -05:00 |
|
Ana Rivera
|
d036ab76d7
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b
Former-commit-id: e7fbea035f [formerly aac45623bc] [formerly e7fbea035f [formerly aac45623bc] [formerly 1b4450ec5f [formerly c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e]]]
Former-commit-id: 1b4450ec5f
Former-commit-id: ebd4358495 [formerly 6a4fb7f0a3]
Former-commit-id: c150a7c8e1
|
2014-05-08 20:10:24 +00:00 |
|
Mike Duff
|
718fc22e25
|
Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: a6e0ed67d1 [formerly b23473ee8a] [formerly a6e0ed67d1 [formerly b23473ee8a] [formerly 335c02d2c6 [formerly 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc]]]
Former-commit-id: 335c02d2c6
Former-commit-id: 0df3f51c87 [formerly 16a973372e]
Former-commit-id: 1dc95cf8de
|
2014-05-08 15:02:54 -05:00 |
|
Lee Venable
|
70e31865be
|
Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
Former-commit-id: 319073a795 [formerly 92517d3ca2] [formerly 319073a795 [formerly 92517d3ca2] [formerly 1496955e44 [formerly a47409fd1673c9584c46aba496be1b7203d9c45d]]]
Former-commit-id: 1496955e44
Former-commit-id: 0a45b07910 [formerly 0b25428b04]
Former-commit-id: 0075d2a450
|
2014-05-08 14:47:03 -05:00 |
|
Mike Duff
|
4adf657556
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 0456fd0597 [formerly 8498235fd8] [formerly 0456fd0597 [formerly 8498235fd8] [formerly 6a67638a94 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]
Former-commit-id: 6a67638a94
Former-commit-id: f49192936a [formerly 70c8135fde]
Former-commit-id: 916d90ee64
|
2014-05-08 14:36:54 -05:00 |
|
Nate Jensen
|
1dc7cc875e
|
Issue #2060 fix auto-update errors with grids in non-map displays
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de
Former-commit-id: 84f9cd1dc8 [formerly 3e3035b6f1] [formerly 84f9cd1dc8 [formerly 3e3035b6f1] [formerly ecc5c5849f [formerly a139113883f69be89a0e0a771f8d6f48d3948686]]]
Former-commit-id: ecc5c5849f
Former-commit-id: d2070f782b [formerly 6c55f4832c]
Former-commit-id: 93f71ec65c
|
2014-05-08 14:08:06 -05:00 |
|
Kiran.Shrestha
|
412ee7d428
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b
Former-commit-id: c1d2c93db3 [formerly f013b49282] [formerly c1d2c93db3 [formerly f013b49282] [formerly f1a707cf64 [formerly 1ac375914b05ea937439b6c0802291f49ff38938]]]
Former-commit-id: f1a707cf64
Former-commit-id: 94be466b40 [formerly 6d19b6efd7]
Former-commit-id: 074c4725b7
|
2014-05-08 15:07:42 -04:00 |
|
Steve Harris
|
77030c2fc3
|
Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
Former-commit-id: a804a071c0 [formerly ce2b030743] [formerly a804a071c0 [formerly ce2b030743] [formerly ff4a6b8122 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]
Former-commit-id: ff4a6b8122
Former-commit-id: 532b861bce [formerly 988ad59a0d]
Former-commit-id: 47991060bb
|
2014-05-08 09:50:34 -05:00 |
|
Michael Gamazaychikov
|
b9d57aa0b4
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf
Former-commit-id: 4a7d050dd4 [formerly e7341afe4d] [formerly 4a7d050dd4 [formerly e7341afe4d] [formerly 588cfd0608 [formerly f934537da168238e76f0be04fc518f6ad315637e]]]
Former-commit-id: 588cfd0608
Former-commit-id: 5c73491447 [formerly 31c221bc37]
Former-commit-id: 7b5e8942cf
|
2014-05-08 14:02:21 +01:00 |
|
Steve Harris
|
2b29fec8d6
|
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: ddd6e35478 [formerly e37e40ed19] [formerly ddd6e35478 [formerly e37e40ed19] [formerly b7a1bda98c [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]
Former-commit-id: b7a1bda98c
Former-commit-id: 7a7c1167c2 [formerly 9591532ffd]
Former-commit-id: 049716e54d
|
2014-05-07 16:01:53 -05:00 |
|
Juliya Dynina
|
547c86f36f
|
Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1
Former-commit-id: 2f3f953823 [formerly d6a796c476] [formerly 2f3f953823 [formerly d6a796c476] [formerly 92202928c9 [formerly 433a3be9362e151d8da6af2d69cdcd50f4a87b93]]]
Former-commit-id: 92202928c9
Former-commit-id: 87433219cc [formerly 3be2acf831]
Former-commit-id: 5e9af9b47d
|
2014-05-07 14:18:01 -05:00 |
|
Ben Steffensmeier
|
0d52351d27
|
Issue #3119 Optimize plot rendering.
Former-commit-id: a19a5bf986 [formerly d7cb05fd92] [formerly a19a5bf986 [formerly d7cb05fd92] [formerly 7274d01d64 [formerly 006df5b77f8f09e0b083b3c3e644744653f3d269]]]
Former-commit-id: 7274d01d64
Former-commit-id: bd08996223 [formerly 9701f68f40]
Former-commit-id: 9274027a7a
|
2014-05-07 13:27:48 -05:00 |
|
Brian.Dyke
|
0daec2c83b
|
Merged 13.5.5 -4 into 1412
Former-commit-id: 5a6425b6b0 [formerly f27d1b1efe] [formerly 5a6425b6b0 [formerly f27d1b1efe] [formerly 30bbd2d1cd [formerly 5644361dffaae25c63748a52c23506907210c741]]]
Former-commit-id: 30bbd2d1cd
Former-commit-id: 4155179c42 [formerly 8bf824a625]
Former-commit-id: e0cd200cee
|
2014-05-07 13:07:15 -04:00 |
|
Nate Jensen
|
76750c319a
|
Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: daac0701fc [formerly d271dfb1a5] [formerly daac0701fc [formerly d271dfb1a5] [formerly 0f1cab916a [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]]
Former-commit-id: 0f1cab916a
Former-commit-id: 89621db281 [formerly 70f70371b1]
Former-commit-id: 12f88d14bf
|
2014-05-06 17:09:56 -05:00 |
|
Ben Steffensmeier
|
b978e0fc1d
|
Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: e70a6999b7 [formerly bbbf957ba8] [formerly e70a6999b7 [formerly bbbf957ba8] [formerly 70df0ee87e [formerly 35845fa63be35661893d31510f83e2d9ab6f60af]]]
Former-commit-id: 70df0ee87e
Former-commit-id: 81916ecdb6 [formerly 945fe1db2f]
Former-commit-id: a39b05ac71
|
2014-05-06 16:19:58 -05:00 |
|
Nate Jensen
|
3aa1481c98
|
Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 26f47e3b00 [formerly a583493711] [formerly 26f47e3b00 [formerly a583493711] [formerly 8f8ea5d014 [formerly 26eb2500104f7afe3fb07ddd66299aa1486375d2]]]
Former-commit-id: 8f8ea5d014
Former-commit-id: 4f3570324a [formerly f1c48f10b1]
Former-commit-id: a20245a64d
|
2014-05-06 16:15:41 -05:00 |
|