xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6297 commits 31 branches 40 tags 3.8 GiB
Commit graph

3416 commits

Author SHA1 Message Date
Richard Peter
69fea4c8b3 Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1 
Former-commit-id: 80a5f2fc1b [formerly 40b7623c87] [formerly 80a5f2fc1b [formerly 40b7623c87] [formerly 87da8bd952 [formerly 1f786fd25cab2956c2cc3318a7adbabf6e8c306d]]]
Former-commit-id: 87da8bd952
Former-commit-id: c799f78f5d [formerly 8baf897297]
Former-commit-id: 1776389eb7
 2014-05-19 16:07:51 -05:00
Brian Clements
008c911f03 Omaha #3180 fixed inviting strangers and multiple users in collaboration 
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited


Former-commit-id: b5e961d6b4 [formerly 0e18d45bdf] [formerly b5e961d6b4 [formerly 0e18d45bdf] [formerly 573ffcb0bf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]]
Former-commit-id: 573ffcb0bf
Former-commit-id: 6769aff618 [formerly e4433c5e10]
Former-commit-id: 3c6a10e154
 2014-05-19 15:54:36 -05:00
Ben Steffensmeier
eeebf5ae7b Omaha #3133 remove topo from alertviz feature. 
Former-commit-id: c4f9bab999 [formerly 24b879764f] [formerly c4f9bab999 [formerly 24b879764f] [formerly 31c323151c [formerly d9ce5c7b78bc3483cd17e8896b9260e2c4f0a807]]]
Former-commit-id: 31c323151c
Former-commit-id: 87118964b1 [formerly 68aba0cdd5]
Former-commit-id: 0e0229c560
 2014-05-19 14:21:23 -05:00
Nate Jensen
80b9e5ee6b Merge "Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore." into omaha_14.4.1 
Former-commit-id: 9996d67317 [formerly 76bfba5945] [formerly 9996d67317 [formerly 76bfba5945] [formerly 94d032dbc4 [formerly 353d0ddca384a33fe529c0b920595a99c0f40548]]]
Former-commit-id: 94d032dbc4
Former-commit-id: 6fb3e37a29 [formerly 65ecb7e926]
Former-commit-id: 423bf2f21f
 2014-05-19 13:36:26 -05:00
Brian.Dyke
3d35be33cb Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1 
Former-commit-id: c4b7b8dd74 [formerly dbd3bb54e8] [formerly c4b7b8dd74 [formerly dbd3bb54e8] [formerly d5a4669fc4 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]]
Former-commit-id: d5a4669fc4
Former-commit-id: f2885c9996 [formerly f30bd7d9ae]
Former-commit-id: 39d8bd9004
 2014-05-19 14:07:04 -04:00
Brian.Dyke
b65a3a3214 CM-MERGE:OB13.5.5-8 into 14.1.2 
Former-commit-id: 2eae2be646 [formerly b29db01a59] [formerly 2eae2be646 [formerly b29db01a59] [formerly 06c2478539 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]]
Former-commit-id: 06c2478539
Former-commit-id: 3558d8f162 [formerly 9baa09f4bc]
Former-commit-id: c88e8d41b6
 2014-05-19 13:26:45 -04:00
Richard Peter
8a71079141 Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1 
Former-commit-id: 1e9c2b27b6 [formerly 0f9015e824] [formerly 1e9c2b27b6 [formerly 0f9015e824] [formerly 0480bfa478 [formerly 4ca4b10fe7331282d32f0a21549f5e6eadc7e16c]]]
Former-commit-id: 0480bfa478
Former-commit-id: f3e7d16402 [formerly 802a043085]
Former-commit-id: fa926cd515
 2014-05-19 12:12:05 -05:00
Nate Jensen
b7f846ac6d Merge "Omaha #3163 Add support for reading colored text styles from future versions of collaboration." into omaha_14.4.1 
Former-commit-id: b93e410f60 [formerly cb6ef0e9a3] [formerly b93e410f60 [formerly cb6ef0e9a3] [formerly d79ef53ad0 [formerly 6f3d40c96cafe8f0f05d539534607067a2a37776]]]
Former-commit-id: d79ef53ad0
Former-commit-id: c5d944c52f [formerly 8a31eaf6e1]
Former-commit-id: 0bc127a4e9
 2014-05-19 11:46:10 -05:00
Brian Clements
de232ae55c Omaha #2536 merged uf.edex.textdbsrv into text plugins 
split into uf.common.dataplugin.text and uf.edex.plugin.text


Former-commit-id: 4d40a98ad7 [formerly a06d332ff4] [formerly 4d40a98ad7 [formerly a06d332ff4] [formerly 2f5cffbe15 [formerly 5f238c51d856984808dee0d2ba62b6a8fbdbd6a1]]]
Former-commit-id: 2f5cffbe15
Former-commit-id: 7761b74112 [formerly 8ddae2fc54]
Former-commit-id: f61d1ac976
 2014-05-19 10:53:37 -05:00
Ben Steffensmeier
c85c8b6283 Omaha #3164 Disable thin client request compression when it doesn't work. 
Former-commit-id: d697592de2 [formerly ccf53a4c99] [formerly d697592de2 [formerly ccf53a4c99] [formerly 25f901a102 [formerly ce132a929437f18f531503701bb09e33261ae4c4]]]
Former-commit-id: 25f901a102
Former-commit-id: 9ddc32ee05 [formerly 7f46683fb0]
Former-commit-id: 92f4c86dac
 2014-05-19 10:40:50 -05:00
Gang.Zhang
7cd2402325 ASM #95 - Fix 0.0 for NO DATA Issue caused failed back. 
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac

Former-commit-id: 6e034005e0 [formerly 94fea6748f] [formerly 6e034005e0 [formerly 94fea6748f] [formerly 9c1587b92d [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]]
Former-commit-id: 9c1587b92d
Former-commit-id: ec6053c3f7 [formerly baa1546e39]
Former-commit-id: b82d8bf6fb
 2014-05-19 15:40:41 +01:00
brian.dyke
b2e3c50ec0 Merge branch 'master_14.3.1-4' into asm_14.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 9626317825 [formerly 011d121e4b] [formerly 9626317825 [formerly 011d121e4b] [formerly 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]
Former-commit-id: 58683ad040
Former-commit-id: 2e105c1d5d [formerly bc4649765a]
Former-commit-id: b42011fc76
 2014-05-19 09:45:37 -04:00
Brian.Dyke
eefa4dbf96 CM-MERGE:OB13.5.5-7 into 14.1.2 
Former-commit-id: 509616ba6a [formerly f8ed9c7944] [formerly 509616ba6a [formerly f8ed9c7944] [formerly e9bd17a21f [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]]
Former-commit-id: e9bd17a21f
Former-commit-id: e563eb3376 [formerly 409a48b907]
Former-commit-id: acf4cbbd78
 2014-05-19 07:55:42 -04:00
Ben Steffensmeier
eabe045d36 Omaha #3163 Remove all references to WORD_WRAP in A2 plugins. 
Former-commit-id: 6a3d5f869e [formerly 885448b04d] [formerly 6a3d5f869e [formerly 885448b04d] [formerly a52718783a [formerly 8e7fa0cdb864d95c70fe1859d9ef9a1851c0b123]]]
Former-commit-id: a52718783a
Former-commit-id: 5607277ae2 [formerly 68244ce2d7]
Former-commit-id: 405e99e4ce
 2014-05-16 14:40:50 -05:00
Ben Steffensmeier
c347188e0a Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore. 
Former-commit-id: 01379cd329 [formerly 748ecc5fac] [formerly 01379cd329 [formerly 748ecc5fac] [formerly 8446ace149 [formerly bb8c1130a9da5cdb06590b20d7f5bde9e1d7c812]]]
Former-commit-id: 8446ace149
Former-commit-id: 2e88a0b800 [formerly 82d9c403d2]
Former-commit-id: 353b7c4090
 2014-05-16 13:36:31 -05:00
Ben Steffensmeier
3ade0c85eb Omaha #3163 Add support for reading colored text styles from future versions of collaboration. 
Former-commit-id: 08f7d7b8dd [formerly 67e68732d6] [formerly 08f7d7b8dd [formerly 67e68732d6] [formerly 79ef4a5301 [formerly 63d4e9f1e2bf95792fa82d101ce59f23e2cbdaf9]]]
Former-commit-id: 79ef4a5301
Former-commit-id: fcbd4cc9ee [formerly 126f47f725]
Former-commit-id: e38c19dd1d
 2014-05-16 12:50:48 -05:00
Nate Jensen
126af61500 Omaha #3133 attempt to fix build 
Change-Id: Ib6668229987cb136c16fb57128becb1624e0b212

Former-commit-id: 7cfbc3d06c [formerly 6240667b0f] [formerly 7cfbc3d06c [formerly 6240667b0f] [formerly 11c580549a [formerly 661a24eafe2374970982a137146c77d9ec1a1406]]]
Former-commit-id: 11c580549a
Former-commit-id: d0fc6945fd [formerly 94c289f944]
Former-commit-id: cedb413487
 2014-05-15 17:02:27 -05:00
Nate Jensen
f0b89d994f Omaha #3133 remove unused dependencies 
Change-Id: I9a0ac7d0b15f266ea8818ac0db82067887e59ec6

Former-commit-id: 63b925e17e [formerly 3db92e6c0b] [formerly 63b925e17e [formerly 3db92e6c0b] [formerly 1ae82b82db [formerly 5a00869db4e7467e49e9a632150a8135ea32b569]]]
Former-commit-id: 1ae82b82db
Former-commit-id: 3f73399ab8 [formerly 4731b10575]
Former-commit-id: 46767a2454
 2014-05-15 13:57:55 -05:00
Nate Jensen
cbc5cbfb77 Merge "Omaha #3061 added better checks for when to send invite/session payloads" into omaha_14.4.1 
Former-commit-id: 7ed74b7242 [formerly 198a63cef8] [formerly 7ed74b7242 [formerly 198a63cef8] [formerly 2cd5c8cca9 [formerly b65ddc7f6f3831117ad3c0d517335289cba8ede0]]]
Former-commit-id: 2cd5c8cca9
Former-commit-id: e0387c077e [formerly 01a5b4ba14]
Former-commit-id: 44df43cfa0
 2014-05-15 08:36:51 -05:00
Steve Harris
dfc96a2fae Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Former-commit-id: 5e6b9943f1 [formerly 1a06d18686] [formerly 5e6b9943f1 [formerly 1a06d18686] [formerly c83753b4d3 [formerly 5c1f5dbf543c9cd27cf83158308a9ce34d057201]]]
Former-commit-id: c83753b4d3
Former-commit-id: 3337f2d6d1 [formerly 1b709fb6c3]
Former-commit-id: 3e4e9365ca
 2014-05-15 08:31:27 -05:00
Brian Clements
cac498a5d4 Omaha #3061 added better checks for when to send invite/session payloads 
Former-commit-id: ee51a84f50 [formerly a698d81571] [formerly ee51a84f50 [formerly a698d81571] [formerly 01269cd989 [formerly 073d3c10ac7c5e9cd6f5e34864ec0261219cbfd5]]]
Former-commit-id: 01269cd989
Former-commit-id: c71459d36e [formerly 6bf803303e]
Former-commit-id: 2da28330cb
 2014-05-14 17:00:09 -05:00
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