Matthew Howard
|
f74c927e2d
|
Merge "Issue #86" into master_14.2.1
Former-commit-id: 447a107aca [formerly 0a02d1ffbb] [formerly 447a107aca [formerly 0a02d1ffbb] [formerly cdc4e69257 [formerly 29b822524bcc5740c21b855c2967a3c06d7b4ab6]]]
Former-commit-id: cdc4e69257
Former-commit-id: 745c31ae15 [formerly d8885b317a]
Former-commit-id: 025b5ef618
|
2014-01-08 14:08:11 -05:00 |
|
Ben Steffensmeier
|
7303bd3b62
|
Issue #2537 Split modelsounding into common/edex plugins.
Change-Id: I34aa58bc13736109bd71f0b0085df6548c4623a8
Former-commit-id: f516a684d4 [formerly f520a26fbd] [formerly f516a684d4 [formerly f520a26fbd] [formerly d79f804d4e [formerly e80e4aa972c394d699feba553d8d13e4f9dd3a03]]]
Former-commit-id: d79f804d4e
Former-commit-id: 9913e51429 [formerly fac9fd296f]
Former-commit-id: 4fef47c0a8
|
2014-01-06 16:02:59 -06:00 |
|
Steve Harris
|
1ca553385c
|
14.1.1-15 baseline
Former-commit-id: f88ff2bde9 [formerly 8bbd803ace] [formerly f88ff2bde9 [formerly 8bbd803ace] [formerly d8e5799328 [formerly cb8eca2a0dfc0e2348301e8d9932db824ecaf34c]]]
Former-commit-id: d8e5799328
Former-commit-id: 282d10fe6d [formerly 35d8f5a281]
Former-commit-id: cd4a09623c
|
2014-01-06 14:08:08 -05:00 |
|
Steve Harris
|
5862555160
|
14.1.1-14 baseline
Former-commit-id: 6df7c67f95 [formerly f2ad9da4eb] [formerly 6df7c67f95 [formerly f2ad9da4eb] [formerly 9ef1c841b9 [formerly 46bdb43889bdc681fec2aba45004a1583caaa6ae]]]
Former-commit-id: 9ef1c841b9
Former-commit-id: 0989c17710 [formerly 43cc501e0d]
Former-commit-id: a2bdee5cc1
|
2014-01-06 14:02:30 -05:00 |
|
Juliya Dynina
|
ff5a430788
|
Merge "Issue #108" into master_14.2.1
Former-commit-id: f8eb9286de [formerly 849db3c6b6] [formerly f8eb9286de [formerly 849db3c6b6] [formerly acb74fef04 [formerly 3d02d349d8b86f75844826687255467d5ad1e4f2]]]
Former-commit-id: acb74fef04
Former-commit-id: 843898398a [formerly 8d83807391]
Former-commit-id: 777dde10e6
|
2013-12-24 10:09:24 -05:00 |
|
Steve Naples
|
5059613581
|
Issue #108
Change-Id: Ibace852cec618503f0a58fb504f58a4ad9106001
Former-commit-id: 5ce519e976 [formerly 9324bece92] [formerly 5ce519e976 [formerly 9324bece92] [formerly ee4c282df3 [formerly 5255505bb000e1ca212894e92de20f7d3cc41618]]]
Former-commit-id: ee4c282df3
Former-commit-id: 136b2865bd [formerly 700fe6e8e2]
Former-commit-id: a7b89f4651
|
2013-12-23 21:23:13 +00:00 |
|
Loubna.Bousaidi
|
1691ca156a
|
Issue #207
Change-Id: Ia50dedd9b2a8340403131596ebb0e73b21c5ba90
Former-commit-id: d5895a1ab0 [formerly 962ead39bb] [formerly d5895a1ab0 [formerly 962ead39bb] [formerly 226c767f96 [formerly eabfef02dc20e810ca9731a77bb96d73a800503b]]]
Former-commit-id: 226c767f96
Former-commit-id: 5f09b6bcb3 [formerly 4b750e5788]
Former-commit-id: c058d2921b
|
2013-12-23 20:30:13 +00:00 |
|
Juliya Dynina
|
961d6b625e
|
Merge "Issue #117" into master_14.2.1
Former-commit-id: 2538556fc3 [formerly 6b5e8c49d9] [formerly 2538556fc3 [formerly 6b5e8c49d9] [formerly 6b7c88469c [formerly 46a6facdf2894434c0787bd9f4b9f9e1cb7cc35f]]]
Former-commit-id: 6b7c88469c
Former-commit-id: ddce2302d3 [formerly 7cbfc0847b]
Former-commit-id: 40ad29baa6
|
2013-12-23 09:18:36 -05:00 |
|
Juliya Dynina
|
98d57490c2
|
Merge "Issue #117" into master_14.2.1
Former-commit-id: 8e6c7a1e0c [formerly b83c80c046] [formerly 8e6c7a1e0c [formerly b83c80c046] [formerly 4eef15705b [formerly ff8dcb6aface85849c91bc81f862ea4c382da19d]]]
Former-commit-id: 4eef15705b
Former-commit-id: 6d2643704c [formerly d9572ab14e]
Former-commit-id: 4a97f3edd8
|
2013-12-23 09:18:22 -05:00 |
|
Rici.Yu
|
cc1e095b3f
|
Issue #86
Change-Id: Iccda23ba7bdfd0619adcd6333ae10f35dd1fdf7c
Former-commit-id: 795cb798c6 [formerly 2b011e9ead] [formerly 795cb798c6 [formerly 2b011e9ead] [formerly feda1354ca [formerly 38ae417a29d24e6ffc0f71cde94882989098903d]]]
Former-commit-id: feda1354ca
Former-commit-id: 5fa8bfa9fe [formerly f372d317b2]
Former-commit-id: 4aad17e25d
|
2013-12-20 15:47:50 -05:00 |
|
David Friedman
|
91e52302b0
|
Issue #114
Change-Id: I7fd218b0120fe8d8eb6ab535d6d07b40c6c0773d
Former-commit-id: 6c1b1f33ee [formerly 01d657fd50] [formerly 6c1b1f33ee [formerly 01d657fd50] [formerly fe50967163 [formerly cd136c3a57f7836606755ad9d1de7a3b8234d1d8]]]
Former-commit-id: fe50967163
Former-commit-id: 1eae25014b [formerly 0975f982f2]
Former-commit-id: 6fadfec657
|
2013-12-20 20:33:18 +00:00 |
|
Qinglu.Lin
|
4a36b4add7
|
Issue #117
Change-Id: I83e97c43ab9c27a965a9329d5cc4d691c7e20dc2
Former-commit-id: 9eb26957f2 [formerly 6e1dd369a8] [formerly 9eb26957f2 [formerly 6e1dd369a8] [formerly cfc815af76 [formerly c877d3db7b960309def150343672757b59b353a3]]]
Former-commit-id: cfc815af76
Former-commit-id: b3d17992b8 [formerly 3a1e624b72]
Former-commit-id: c1ada67b8c
|
2013-12-20 14:31:16 -05:00 |
|
Qinglu.Lin
|
2ae0355053
|
Issue #117
Change-Id: I52293e2148fdc1fbfd22ad01e03d6d628cd1c09a
Former-commit-id: 50732574aa [formerly db66cbb605] [formerly 50732574aa [formerly db66cbb605] [formerly 5dc466443b [formerly 6f197a78afa6a8760f852e94861950a230eaedcc]]]
Former-commit-id: 5dc466443b
Former-commit-id: 66f60fc4a7 [formerly 5026332931]
Former-commit-id: 986593f331
|
2013-12-20 14:21:54 -05:00 |
|
David Gillingham
|
203e25ab3c
|
Issue #2641: Fix ETN assignment issues introduced by baseline merge.
Former-commit-id: c48c0523ff [formerly 136265183d] [formerly c48c0523ff [formerly 136265183d] [formerly 09bfdc49e3 [formerly 7ae8efacb3c886ec18af64dca7784f4aa1512bf4]]]
Former-commit-id: 09bfdc49e3
Former-commit-id: 6e642b81fe [formerly 8f3802eecf]
Former-commit-id: 24c8fc930e
|
2013-12-18 16:18:47 -06:00 |
|
Richard Peter
|
1c743d4d44
|
Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.viz.gfe/GFESuite/ifpIMAGE
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/GfeClient.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/vtec/GFEVtecUtil.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
Change-Id: Ic1f763baa305eb65f7f5373dea34e01a6373fec7
Former-commit-id: e4f59ea119 [formerly 1de516964b] [formerly e4f59ea119 [formerly 1de516964b] [formerly 2e7fd9ddba [formerly 31f410bcf6ab8d069a1f1a2e1af0c25a0daabad9]]]
Former-commit-id: 2e7fd9ddba
Former-commit-id: 5c0cf804f1 [formerly 62fa535744]
Former-commit-id: 4059813742
|
2013-12-17 21:04:53 -06:00 |
|
Mike Duff
|
707ac59a98
|
Issue #2633 - Fix refresh issues with Bandwidth Utilization Graph
Former-commit-id: e26bea423e [formerly 66f5585774] [formerly e26bea423e [formerly 66f5585774] [formerly 6406bcdd05 [formerly 9b73b9db1ff2e7aeab888118348c66090ef7e2ae]]]
Former-commit-id: 6406bcdd05
Former-commit-id: 0232f16e7a [formerly 54f7feef03]
Former-commit-id: b54ab4df6a
|
2013-12-17 09:41:30 -06:00 |
|
Bryan Kowal
|
fad82481c1
|
Issue #2182 - PostgreSQL port is now configurable in postgresql.conf; Java path is no longer relative in wrapper.conf
Amend: wrap file access in try..finally; move StringBuilder outside of a loop
Change-Id: Iafa7493ef79a0a891f36923f1695cefdb47e16da
Former-commit-id: 0c3b22c8f2 [formerly 43008f4698] [formerly 0c3b22c8f2 [formerly 43008f4698] [formerly 120ebd045a [formerly 71f74d7b8125994537ef5520fe59134a7f86e9af]]]
Former-commit-id: 120ebd045a
Former-commit-id: 68181d3f62 [formerly fac9d72cc8]
Former-commit-id: 9e0e6662c8
|
2013-12-16 16:39:10 -06:00 |
|
Lee Venable
|
b95b380eb2
|
Issue #2583 - Procedure dialog fixes and clean up.
Change-Id: I9255d9bb21bc8794aacddffe571e62149dd08c10
Former-commit-id: d6eb7534f5 [formerly aa0e9121f8] [formerly d6eb7534f5 [formerly aa0e9121f8] [formerly 7ee6053c22 [formerly c88681909d99025be43e5d77dd2a89bbc6e929e2]]]
Former-commit-id: 7ee6053c22
Former-commit-id: d05d650430 [formerly f3c8b69e2e]
Former-commit-id: b7d5aa748a
|
2013-12-12 16:15:56 -06:00 |
|
Steve Harris
|
800136d61b
|
14.1.1-13 baseline
Former-commit-id: 85eebac7e2 [formerly c88b10039a] [formerly 85eebac7e2 [formerly c88b10039a] [formerly b0b55a676b [formerly 6eef3022653638f9031a85932d8d551aba5600d2]]]
Former-commit-id: b0b55a676b
Former-commit-id: 5368f23247 [formerly 61d4adc979]
Former-commit-id: ff08301890
|
2013-12-12 16:59:57 -05:00 |
|
Ben Steffensmeier
|
df1bc54013
|
Issue #2602 Switch around the order of some things on startup to make thinclient better.
Former-commit-id: bf508b4455 [formerly a37db9d1b4] [formerly bf508b4455 [formerly a37db9d1b4] [formerly 922674273e [formerly 41f4a0a6050319adf27f3656b665a2fb011b849c]]]
Former-commit-id: 922674273e
Former-commit-id: 0fb85fe4aa [formerly 4a86c90bfc]
Former-commit-id: b3ef07794a
|
2013-12-11 12:45:11 -06:00 |
|
Slav Korolev
|
65720fea82
|
Issue #2570. Show All subscriptions in Subscription manager.
Former-commit-id: 85bc26b5a3 [formerly b59e9499d2] [formerly 85bc26b5a3 [formerly b59e9499d2] [formerly 67e18055cc [formerly 27e177b2425db0a0241884b18e2501a923d02be4]]]
Former-commit-id: 67e18055cc
Former-commit-id: 746157755b [formerly 6811b0e5c1]
Former-commit-id: 04bc1a3052
|
2013-12-11 08:57:13 -05:00 |
|
Mike Duff
|
bddf555eab
|
Issue #2601 - Fix NullPointerException.
Former-commit-id: 773e546f62 [formerly 9e9706f55f] [formerly 773e546f62 [formerly 9e9706f55f] [formerly d2fe42c27c [formerly fbeeddbf895ec1568452df632c8147c17757bb0c]]]
Former-commit-id: d2fe42c27c
Former-commit-id: 02bbd4eaa6 [formerly 32b468023d]
Former-commit-id: dd1af02457
|
2013-12-10 09:03:42 -06:00 |
|
Lee Venable
|
099f3f504a
|
Merge "Issue #2271 - Fix menu problem with previously selected points being selectable again" into omaha_14.2.1
Former-commit-id: 997c575919 [formerly 249435f17c] [formerly 997c575919 [formerly 249435f17c] [formerly 2c6b4309f0 [formerly c4cda041169c5fe3f813a71c1b09b5eaeba9e385]]]
Former-commit-id: 2c6b4309f0
Former-commit-id: 4850830125 [formerly cc7885610d]
Former-commit-id: 291c7f95c4
|
2013-12-09 09:51:41 -06:00 |
|
Mike Duff
|
74b19522a2
|
Issue #2271 - Fix menu problem with previously selected points being selectable again
Change-Id: I8c8a1e7f1f87b87ba6bd065df2692c82f988e8ee
Former-commit-id: 850e4dfbde [formerly 0a5f2e3484] [formerly 850e4dfbde [formerly 0a5f2e3484] [formerly ebc730ac2d [formerly 959fcd37424b6261606d2ae65663403764be9c39]]]
Former-commit-id: ebc730ac2d
Former-commit-id: 1925177772 [formerly 4d210517bd]
Former-commit-id: 96de34b2c1
|
2013-12-06 12:58:38 -06:00 |
|
Nate Jensen
|
907a6e3304
|
Issue #2599 fix constructor
Change-Id: I90564c027b23f449181fe46a9d8f2cebddf4d52e
Former-commit-id: ec6b5393ef [formerly 9bff38e0d3] [formerly ec6b5393ef [formerly 9bff38e0d3] [formerly 41014a105d [formerly 8b0c799cf132a90211d1344d4e16785895f76263]]]
Former-commit-id: 41014a105d
Former-commit-id: e8f28c6799 [formerly f3e455d1a3]
Former-commit-id: eb68a1be85
|
2013-12-06 12:35:22 -06:00 |
|
Ben Steffensmeier
|
fe53e49cb3
|
Issue #2537 Fix feature for poitndata dependency on dataaccess.
Former-commit-id: 067c510315 [formerly 59c6a24b68] [formerly 067c510315 [formerly 59c6a24b68] [formerly d883f8dbb1 [formerly 6f3e621fb69e31cc11b6111fdddc702dee29d33f]]]
Former-commit-id: d883f8dbb1
Former-commit-id: 899cb2628c [formerly 99afa17fd2]
Former-commit-id: c27934d7ad
|
2013-12-06 09:14:01 -06:00 |
|
Richard Peter
|
8cde2b5e9d
|
Merge "Issue #2545 - Get bandwidth graph data by network" into development
Former-commit-id: df4a4c5121 [formerly d0b50eee3c] [formerly df4a4c5121 [formerly d0b50eee3c] [formerly 6fde307f0a [formerly a31695805478d27e072d069d5d3b369001c1d80d]]]
Former-commit-id: 6fde307f0a
Former-commit-id: 45889cb80f [formerly 9f4dfc9051]
Former-commit-id: ef7ba1f1ee
|
2013-12-05 14:54:46 -06:00 |
|
Mike Duff
|
0885df1d3f
|
Issue #2545 - Get bandwidth graph data by network
Change-Id: I4de455a4da43f180ff37eb72370addec77a29314
Former-commit-id: a412a19583 [formerly 4796f43495] [formerly a412a19583 [formerly 4796f43495] [formerly 0c452e2434 [formerly 9102f16c8a6409e92ded498b82a6a4e6a531f2c0]]]
Former-commit-id: 0c452e2434
Former-commit-id: 45cf9384d8 [formerly 7f2ddb1360]
Former-commit-id: d3c5ee0468
|
2013-12-05 13:35:31 -06:00 |
|
Nate Jensen
|
9740b5349b
|
Merge "Issue #2537 Use PointDataAccessFactory for multiple point data types. Change-Id: I655091f116cde662933ed96d926372a14a435dfc" into development
Former-commit-id: b16c88133b [formerly c47f6546dd] [formerly b16c88133b [formerly c47f6546dd] [formerly ae0bd2a86f [formerly 648e5bff2e85d00cf5bcee923f2a137aa76117fc]]]
Former-commit-id: ae0bd2a86f
Former-commit-id: 15fee953f5 [formerly 7163e28d35]
Former-commit-id: bd4e9158f0
|
2013-12-05 12:59:58 -06:00 |
|
Richard Peter
|
ae6e34be4b
|
Merge branch 'omaha_14.1.1' (14.1.1-11) into development
Conflicts:
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANUnwarnedDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResourceData.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/AbstractTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANCellTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANDmdTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANMesoTableDlg.java
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/tables/SCANTvsTableDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIUtil.java
msi/VizLauncher/VizLauncher/com/raytheon/viz/launcher/process/AbstractProcessLauncher.cs
Change-Id: Iaf9f42e7ee93949d34c70916fd91acf8c838c83a
Former-commit-id: b3b23647b4 [formerly 0c4ae068ad] [formerly b3b23647b4 [formerly 0c4ae068ad] [formerly a0b6ea8bb2 [formerly b09f1559254f06a82afa91f0cc14c8150f88ce64]]]
Former-commit-id: a0b6ea8bb2
Former-commit-id: 60679a818a [formerly da027298d4]
Former-commit-id: fd93b7d85e
|
2013-12-05 12:12:27 -06:00 |
|
Ben Steffensmeier
|
2eb9a45951
|
Issue #2537 Use PointDataAccessFactory for multiple point data types.
Change-Id: I655091f116cde662933ed96d926372a14a435dfc
Former-commit-id: 7c2a4ef72c [formerly f682e66e9b] [formerly 7c2a4ef72c [formerly f682e66e9b] [formerly 46a466497c [formerly 91a3fdbc8bd98603a1cda218729d5542dac809ef]]]
Former-commit-id: 46a466497c
Former-commit-id: fde968a834 [formerly ad9fee446d]
Former-commit-id: 956e8b04f2
|
2013-12-05 10:54:28 -06:00 |
|
Lee Venable
|
0ef3c4386d
|
Merge "Issue #2592 - Fixed SWT checkbox issue with colored background/foreground." into omaha_14.1.1
Former-commit-id: 67accdb7e3 [formerly 4f1b663b37] [formerly 67accdb7e3 [formerly 4f1b663b37] [formerly b7be687903 [formerly 1d8f18b5e8a7e932008b8a8baf347f55fcf83e07]]]
Former-commit-id: b7be687903
Former-commit-id: 40dc07e0ff [formerly 3a3333e4ec]
Former-commit-id: 195162014d
|
2013-12-05 08:30:28 -06:00 |
|
Lee Venable
|
24102d052b
|
Issue #2592 - Fixed SWT checkbox issue with colored background/foreground.
Change-Id: I94e9c691ca68c0d22e27ba107d99b8397f1d942b
Former-commit-id: 9c64148733 [formerly 266d4884da] [formerly 9c64148733 [formerly 266d4884da] [formerly a385ec612c [formerly a1624e9bcf8677d6edd76a68122aa07690383b34]]]
Former-commit-id: a385ec612c
Former-commit-id: cddca699c6 [formerly d433717c8c]
Former-commit-id: ef61348fb8
|
2013-12-05 08:25:46 -06:00 |
|
Ron Anderson
|
bbd7ea36a1
|
Issue #2331 Fixed Topo retrieval for smartTools/procedures
Change-Id: Iab9d5216f278836f3b8b2245330fdb2b254a5ae3
Former-commit-id: 497236ca74 [formerly b5906249cc] [formerly 497236ca74 [formerly b5906249cc] [formerly 20eeb2796e [formerly a7a201ec657a333f6e6f5c3c1d12a3d1f9b50a4c]]]
Former-commit-id: 20eeb2796e
Former-commit-id: e30d6041ee [formerly 103fed386f]
Former-commit-id: 89e87a1683
|
2013-12-04 17:10:48 -06:00 |
|
Steve Harris
|
60f062ea59
|
14.1.1-12 baseline
Former-commit-id: 371d1ca63c [formerly b24d9c80b0] [formerly 371d1ca63c [formerly b24d9c80b0] [formerly a3ec45a99f [formerly 3b3b8ffbdadc65f41b67f2d649ec18e19521c989]]]
Former-commit-id: a3ec45a99f
Former-commit-id: 4e6f319422 [formerly 14421048af]
Former-commit-id: 234ca267ed
|
2013-12-04 16:47:59 -05:00 |
|
Ron Anderson
|
95d6bebb13
|
Issue #2490 Fixed error handling in HazardsTable.py
Change-Id: Icfe1698e59b4b8976f488df209588f4350c58db2
Former-commit-id: 54219aa03d [formerly 7459d65134] [formerly 54219aa03d [formerly 7459d65134] [formerly c9cb2bdb6a [formerly 0526d24a2b70680c850f54cbbfd5c2ef5bdf21ef]]]
Former-commit-id: c9cb2bdb6a
Former-commit-id: a99197c5c2 [formerly 75d2dd7a29]
Former-commit-id: 1988e86bbd
|
2013-12-04 15:29:28 -06:00 |
|
Nate Jensen
|
b6f9b78e92
|
Merge "Issue #2600 Fix typo in DataStoreCache." into development
Former-commit-id: 286539f323 [formerly 020c4de47d] [formerly 286539f323 [formerly 020c4de47d] [formerly 0ead2a03ea [formerly 860ac1873dffff0ea221bde1f898aa93ad25859f]]]
Former-commit-id: 0ead2a03ea
Former-commit-id: 331df460ff [formerly 78629260d9]
Former-commit-id: 35abe8c3af
|
2013-12-04 11:54:11 -06:00 |
|
Dave Hladky
|
393d4a2967
|
Issue #2607 Fixed Nullpointer
Former-commit-id: 4b81f76ce3 [formerly 25ce37d2d8] [formerly 4b81f76ce3 [formerly 25ce37d2d8] [formerly 25f745bc12 [formerly 6968c9f0a13880fe60e90a84b67a597753cbb175]]]
Former-commit-id: 25f745bc12
Former-commit-id: c93d7b57a1 [formerly b0f12b6613]
Former-commit-id: 3cf23e1e4d
|
2013-12-04 11:36:23 -06:00 |
|
Ben Steffensmeier
|
ea09aaff72
|
Issue #2600 Fix typo in DataStoreCache.
Former-commit-id: 80a98a3d7e [formerly 3c8962fb96] [formerly 80a98a3d7e [formerly 3c8962fb96] [formerly 0b4eaac59e [formerly 5f20550b08b2299c7bb7a4769b13c4c9e50c90dd]]]
Former-commit-id: 0b4eaac59e
Former-commit-id: d6640590e9 [formerly d1b4fdd9c8]
Former-commit-id: cb6d8f6070
|
2013-12-04 11:22:47 -06:00 |
|
Nate Jensen
|
92fb530969
|
Merge "Issue #2576 Increased the font size of EMER." into development
Former-commit-id: ee18295efe [formerly cc53373478] [formerly ee18295efe [formerly cc53373478] [formerly c29836abd7 [formerly 947196e8ac4bb82536102bb56413d94589569599]]]
Former-commit-id: c29836abd7
Former-commit-id: cb3d6e2de3 [formerly bad9e2ab44]
Former-commit-id: b58a9fbed7
|
2013-12-03 17:44:55 -06:00 |
|
Richard Peter
|
30862929e2
|
Merge branch 'development_on_RHEL5' (GOES-R) into development
Conflicts:
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
nativeLib/edexBridge/edexBridge.cpp
rpms/build/i386/build.sh
rpms/build/x86_64/build.sh
Former-commit-id: 760f215e8c [formerly f5f75ec629] [formerly 760f215e8c [formerly f5f75ec629] [formerly e82e1137f9 [formerly 039d9ecb587338801cdab9cad11b06890517d6a4]]]
Former-commit-id: e82e1137f9
Former-commit-id: ee03dcf505 [formerly 94994868fa]
Former-commit-id: b0e694483f
|
2013-12-03 16:25:31 -06:00 |
|
Jonathan Sanchez
|
bcfa6bb00b
|
Issue #2576 Increased the font size of EMER.
Change-Id: Ic6994ce60611b2af76bdee153daffe328e556ef1
Former-commit-id: b8fd84509d [formerly 88f7b75df4] [formerly b8fd84509d [formerly 88f7b75df4] [formerly eeb3b0173b [formerly 15cdd4c1fdb336416a4cc320731d5ecbbb0db6f6]]]
Former-commit-id: eeb3b0173b
Former-commit-id: 641673e1d5 [formerly dc4b8ec40f]
Former-commit-id: e0b5d6f75d
|
2013-12-03 13:00:47 -06:00 |
|
Nate Jensen
|
c4f8d3e8d5
|
Merge "Issue #2573 safer and faster progressive disclosure" into development
Former-commit-id: b8116e6724 [formerly ece38c85c0] [formerly b8116e6724 [formerly ece38c85c0] [formerly 2daf0f2691 [formerly 2be1427cdcd61d47a5463f6e4e85910200fda931]]]
Former-commit-id: 2daf0f2691
Former-commit-id: b6e54e2709 [formerly a5cf904e1f]
Former-commit-id: 57d1764c46
|
2013-12-03 09:41:02 -06:00 |
|
Nate Jensen
|
cd258c50ee
|
Issue #2573 safer and faster progressive disclosure
Change-Id: If568c0958f7e6133ce03fe5c4a17e6d865d431fd
Former-commit-id: 5c80b34e16 [formerly 622cc1b223] [formerly 5c80b34e16 [formerly 622cc1b223] [formerly 90d6b5bd74 [formerly 36621eb21598f3730d0aa88973932e877367fecf]]]
Former-commit-id: 90d6b5bd74
Former-commit-id: e5cfe76cac [formerly e40c71acd1]
Former-commit-id: ecd87941e6
|
2013-12-02 17:28:09 -06:00 |
|
Steve Harris
|
6f4e8734c8
|
Merge branch 'master_14.1.1' into omaha_14.1.1
Former-commit-id: b0a61f5695 [formerly 65d5f13864] [formerly b0a61f5695 [formerly 65d5f13864] [formerly b98eb9ffa4 [formerly 361e9942cf804578fb3e873229c1cd6fd6689fdf]]]
Former-commit-id: b98eb9ffa4
Former-commit-id: 1195e95c8b [formerly 6539b80ded]
Former-commit-id: 2e47683d4a
|
2013-12-02 16:17:38 -06:00 |
|
Steve Harris
|
bfa9d638cc
|
14.1.1-11 baseline
Former-commit-id: 337b138200 [formerly 70a6f1936e] [formerly 337b138200 [formerly 70a6f1936e] [formerly 71ae71c850 [formerly c32b2b2037c84cc074e7dc5a5a13b93223640d7d]]]
Former-commit-id: 71ae71c850
Former-commit-id: 8bd818de09 [formerly 5526a8999d]
Former-commit-id: f88a635a58
|
2013-12-02 17:10:10 -05:00 |
|
Slav Korolev
|
bfb25c50cc
|
Issue #2387. Added system status refresh.
Former-commit-id: b6a1724218 [formerly 1be43bc76c] [formerly b6a1724218 [formerly 1be43bc76c] [formerly f7f00b77d0 [formerly f3530467b1845a488fa0996ee7100a2dc145394a]]]
Former-commit-id: f7f00b77d0
Former-commit-id: 3dc318418e [formerly 5e225387fd]
Former-commit-id: 20793f8784
|
2013-12-02 16:14:45 -05:00 |
|
Ben Steffensmeier
|
b29fbe64a8
|
Issue #2537 point data code cleanup.
Former-commit-id: 42107fba5c [formerly a4e3a4a03b] [formerly 42107fba5c [formerly a4e3a4a03b] [formerly 7889c14b35 [formerly 8809ac9faa7669e7a0817b9b1c15c322b05e06a2]]]
Former-commit-id: 7889c14b35
Former-commit-id: a4e3bf34b8 [formerly 62ca7b1df6]
Former-commit-id: 8c386a2aac
|
2013-11-26 15:16:54 -06:00 |
|
Ben Steffensmeier
|
d307af23eb
|
Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images
Change-Id: I5a244397aa6172e406df1d0f4619dd53373584e0
Former-commit-id: 8a7d3ceab1 [formerly 927801985a] [formerly 8a7d3ceab1 [formerly 927801985a] [formerly 3696896b49 [formerly 029c03379ffa8317fa0afe8b2f69cbe1ac3c3fd1]]]
Former-commit-id: 3696896b49
Former-commit-id: ca5e771451 [formerly 70ca78c7b5]
Former-commit-id: a3f5fcabf6
|
2013-11-25 11:31:57 -06:00 |
|
Richard Peter
|
5bb7b93078
|
Merge "Issue #2532 Fix grid displays of grids larger than the world." into development
Former-commit-id: 4b09affc7c [formerly b26e562845] [formerly 4b09affc7c [formerly b26e562845] [formerly be7c2ef08e [formerly f2df036fd63196cd8e7f29cbb80944099c2db92a]]]
Former-commit-id: be7c2ef08e
Former-commit-id: d1201473cd [formerly c51cc4bf17]
Former-commit-id: 91fcef9d3f
|
2013-11-22 12:38:05 -06:00 |
|