Ben Steffensmeier
|
ccf53a4c99
|
Omaha #3164 Disable thin client request compression when it doesn't work.
Former-commit-id: ce132a929437f18f531503701bb09e33261ae4c4
|
2014-05-19 10:40:50 -05:00 |
|
Gang.Zhang
|
94fea6748f
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 5880dcd0b727c3d473873b8382ace78955ab800b
|
2014-05-19 15:40:41 +01:00 |
|
brian.dyke
|
011d121e4b
|
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: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
|
2014-05-19 09:45:37 -04:00 |
|
Brian.Dyke
|
f8ed9c7944
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114
|
2014-05-19 07:55:42 -04:00 |
|
Ben Steffensmeier
|
885448b04d
|
Omaha #3163 Remove all references to WORD_WRAP in A2 plugins.
Former-commit-id: 8e7fa0cdb864d95c70fe1859d9ef9a1851c0b123
|
2014-05-16 14:40:50 -05:00 |
|
Ben Steffensmeier
|
748ecc5fac
|
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: bb8c1130a9da5cdb06590b20d7f5bde9e1d7c812
|
2014-05-16 13:36:31 -05:00 |
|
Ben Steffensmeier
|
67e68732d6
|
Omaha #3163 Add support for reading colored text styles from future versions of collaboration.
Former-commit-id: 63d4e9f1e2bf95792fa82d101ce59f23e2cbdaf9
|
2014-05-16 12:50:48 -05:00 |
|
Nate Jensen
|
6240667b0f
|
Omaha #3133 attempt to fix build
Change-Id: Ib6668229987cb136c16fb57128becb1624e0b212
Former-commit-id: 661a24eafe2374970982a137146c77d9ec1a1406
|
2014-05-15 17:02:27 -05:00 |
|
Nate Jensen
|
3db92e6c0b
|
Omaha #3133 remove unused dependencies
Change-Id: I9a0ac7d0b15f266ea8818ac0db82067887e59ec6
Former-commit-id: 5a00869db4e7467e49e9a632150a8135ea32b569
|
2014-05-15 13:57:55 -05:00 |
|
Nate Jensen
|
198a63cef8
|
Merge "Omaha #3061 added better checks for when to send invite/session payloads" into omaha_14.4.1
Former-commit-id: b65ddc7f6f3831117ad3c0d517335289cba8ede0
|
2014-05-15 08:36:51 -05:00 |
|
Steve Harris
|
1a06d18686
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Former-commit-id: 5c1f5dbf543c9cd27cf83158308a9ce34d057201
|
2014-05-15 08:31:27 -05:00 |
|
Brian Clements
|
a698d81571
|
Omaha #3061 added better checks for when to send invite/session payloads
Former-commit-id: 073d3c10ac7c5e9cd6f5e34864ec0261219cbfd5
|
2014-05-14 17:00:09 -05:00 |
|
Richard Peter
|
7ae2b1299f
|
Merge "Omaha #2536 moved WMO Header into new common plugin" into omaha_14.4.1
Former-commit-id: 1844df3fb769bccb3e5b19722e2fdeaec9c6bbe0
|
2014-05-14 16:25:16 -05:00 |
|
Brian.Dyke
|
627541512d
|
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: f7d6bee49c5777e5d63c724eba1242a1baf153ac
|
2014-05-14 16:08:16 -04:00 |
|
Qinglu.Lin
|
75c4b15e8e
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: 763641d787f7f8c79bf28456314dcc16786702ed
|
2014-05-14 15:30:16 -04:00 |
|
Ben Steffensmeier
|
3e23857dcc
|
Omaha #2697 Collaboration will no longer use local maps.
Former-commit-id: 7e10b6d308a3bb17692abaefd9a8e84cc5016621
|
2014-05-14 13:53:29 -05:00 |
|
Brian Clements
|
2b1c7eaa37
|
Omaha #2536 moved WMO Header into new common plugin
moved WMO time parsing code from TimeTools to WMOTimeParser
Former-commit-id: c2e57be98850284cb01ba921b9dddcadbe66b311
|
2014-05-14 13:45:09 -05:00 |
|
Nate Jensen
|
68c8238275
|
Omaha #3133 remove unused uf.common.cache from alertviz feature
Change-Id: Ib4a36a727e8b26a708f247e6263518786cc60832
Former-commit-id: e659b393f23e5e999c2b03ddad648f2748ee97e9
|
2014-05-13 17:52:12 -05:00 |
|
Bryan Kowal
|
3535340136
|
Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: 2b13221d7c644147f6eda1acb8b126667be00926
|
2014-05-13 14:43:04 -05:00 |
|
Nate Jensen
|
07426ce408
|
Omaha #3133 remove uf.common.monitor's dependency on org.eclipse.swt
Change-Id: I362c5c2ece96e77a0cce5af7ac75a403c95ab851
Former-commit-id: b842a78cdfb945767aecf7da3ad55b71c9d09bfb
|
2014-05-13 13:12:54 -05:00 |
|
Brian.Dyke
|
e95bc87a19
|
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: 019c1405290753ed47cecd9a0bb26c220d78d010
|
2014-05-13 11:23:55 -04:00 |
|
Matthew Howard
|
5a20085f32
|
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
Former-commit-id: 2052df4ca5f68165b477994b21357c245ff73546
|
2014-05-13 07:49:18 -05:00 |
|
Nate Jensen
|
cc86f19bad
|
Omaha #3133 remove edex dependencies from common.monitor plugin
Change-Id: Iea84cdadc86b9bb137bc2e34d546e51f9978d5e3
Former-commit-id: d25e1bee210a084e17d4ee781eddb42c14735140
|
2014-05-12 16:46:06 -05:00 |
|
Steve Harris
|
cf62cf4a6e
|
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: a830db2a282e6a29d119fc0d3357c2223c48d175
|
2014-05-12 16:13:19 -05:00 |
|
Steve Harris
|
652fb19bc4
|
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: a20833879f1a0434c562a22a874b1e1722278954
|
2014-05-12 15:05:43 -05:00 |
|
Zhidong.Hao
|
d6cae51207
|
ASM #509 GFE: Product editor still auto-wraps when the option is turned off
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4
Former-commit-id: a48b81894fed165aba58a0097359bbd0f1931be5
|
2014-05-12 15:16:38 -04:00 |
|
Juliya Dynina
|
107b64a544
|
Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
Former-commit-id: 0c54c56efa1306d781d64621ccf7f62b3bf70997
|
2014-05-12 14:01:40 -05:00 |
|
Juliya Dynina
|
d7bea845fe
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 350448988d24fd2eb58812128b062e3a0f44b956
|
2014-05-12 14:01:07 -05:00 |
|
Ana Rivera
|
91715e7a3f
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: e71ef5db23122405fc6aab71526a9cc3ec3ad823
|
2014-05-12 18:55:06 +00:00 |
|
Matthew Howard
|
b807c877f4
|
Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f
|
2014-05-12 13:52:12 -05:00 |
|
Loubna.Bousaidi
|
ec5bd7a2bb
|
ASM #527 update revision and shef_qual_code
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: 860ea4b3644a526ac10b4366f158824fe6cbdcb0
|
2014-05-12 18:42:12 +00:00 |
|
Zhidong.Hao
|
8d560036b1
|
ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 62f8c0ab0e046fd4365bd37394f93e8bca4e642d
|
2014-05-12 14:33:25 -04:00 |
|
Brian.Dyke
|
386ec058e1
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3
|
2014-05-12 14:07:11 -04:00 |
|
Matthew Howard
|
d40d9931db
|
Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
Former-commit-id: 59fb75bdc025a3b2feb95d20d263060b55e87b28
|
2014-05-12 13:00:55 -05:00 |
|
Rici.Yu
|
2ea1c1fa60
|
ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127
Former-commit-id: df46f9fc541a47e5f31210663ef69c4c5863fa28
|
2014-05-12 13:38:04 -04:00 |
|
Nate Jensen
|
eff5a8e32f
|
Merge "Omaha #3075 updates for pydev 3.4.1" into omaha_14.4.1
Former-commit-id: a213a01ac89bf84a6a0d4dfea44073cb0b2a7fce
|
2014-05-12 11:56:34 -05:00 |
|
Bryan Kowal
|
6e6a6a73ee
|
Issue #3026 - remove unnecessary hpe ffmp dependency
Former-commit-id: c94c973ef6a663f93a6b1a6301f5553d4e88ac73
|
2014-05-12 11:46:35 -05:00 |
|
Michael Gamazaychikov
|
4f541a5460
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c
Former-commit-id: 988d5f26d3bd3e42397f62288a8c9b10e341495b
|
2014-05-12 13:33:58 +01:00 |
|
Nate Jensen
|
e6569b4a7d
|
Omaha #3075 updates for pydev 3.4.1
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1
Former-commit-id: a038aea9bb25e31b29b054e8899c0b51bc183fef
|
2014-05-09 16:45:39 -05:00 |
|
Brian Clements
|
08a406ff18
|
Omaha #3107 added timeout handling logic for leader transfer verification
Former-commit-id: 294a489ba547bf90df9d6b6a5107c8993c5b8333
|
2014-05-09 15:43:46 -05:00 |
|
Lee Venable
|
364f0d877a
|
Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
Former-commit-id: 06b3cb4dd8f07600e6513a15a2495b485b0812b6
|
2014-05-09 11:14:51 -05:00 |
|
Juliya Dynina
|
dd13f453e6
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 789fffccf3389143a1660a477301cfcb43a82890
|
2014-05-09 11:08:12 -05:00 |
|
Mike Duff
|
03356dd554
|
Issue #3145 - Fix Scan threat labels, dispose font
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d
Former-commit-id: 84bd0800b2652b31c06015fa49f816f1402f461d
|
2014-05-09 10:32:04 -05:00 |
|
Nate Jensen
|
575360192a
|
Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
Former-commit-id: 25e500435693940e378df086739fce8eefdba3bb
|
2014-05-09 09:53:25 -05:00 |
|
Roger Ferrel
|
039f4826ea
|
Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.
Change-Id: Ibcd4c5389ba081b19a3134989c507b88b2d882b8
Former-commit-id: 909a3f42bdb9d8149013056f9956bf0c38b764c5
|
2014-05-09 09:34:49 -05:00 |
|
Mike Duff
|
78f2a26903
|
Issue #3026 - feature.xml fix
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794
Former-commit-id: a44e412190741fcb0a91dd451ae538277ae0d79f
|
2014-05-09 09:27:10 -05:00 |
|
Ben Steffensmeier
|
87ea43cf0d
|
Issue #2920 Fix default color of BOXED text.
Former-commit-id: 59f12cd4cc60f0908c106cbc0572d3f84d0d509b
|
2014-05-08 18:18:08 -05:00 |
|
Ana Rivera
|
aac45623bc
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b
Former-commit-id: c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e
|
2014-05-08 20:10:24 +00:00 |
|
Mike Duff
|
b23473ee8a
|
Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc
|
2014-05-08 15:02:54 -05:00 |
|
Lee Venable
|
92517d3ca2
|
Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
Former-commit-id: a47409fd1673c9584c46aba496be1b7203d9c45d
|
2014-05-08 14:47:03 -05:00 |
|