Roger Ferrel
|
b08deb98cf
|
Issue #1578 Changes for non-blocking FlashFloodGuidanceDlg.
Change-Id: I00efe50ba8e0fe11fcca560ef2d07293c9bdf771
Former-commit-id: 48609202e6 [formerly 0c5e92eb7f ] [formerly bb69390c9b ] [formerly 48609202e6 [formerly 0c5e92eb7f ] [formerly bb69390c9b ] [formerly 78a7d02fd2 [formerly bb69390c9b [formerly d3fd2d7f0591f6fbe15d522a6c909f4509fede94]]]]
Former-commit-id: 78a7d02fd2
Former-commit-id: 3c2c6f8156 [formerly d9197606ff ] [formerly 3dcd22d561969147753ef1769b030af9913894e1 [formerly c1b45bd6c9 ]]
Former-commit-id: a58472e17e107c77ddcd7760a8cd4761c8f98f73 [formerly 7c4114c404 ]
Former-commit-id: a802ac6f39
|
2013-02-07 08:27:18 -06:00 |
|
Roger Ferrel
|
419f645d3e
|
Issue #1578 Code clean up for non-blocking dialogs.
Changes from code review.
Change-Id: I9f95dd07736f96af8cb1116030a9fb778fe4b047
Former-commit-id: 1914a16504 [formerly 5e2b33206c ] [formerly 581b04f8f7 ] [formerly 1914a16504 [formerly 5e2b33206c ] [formerly 581b04f8f7 ] [formerly db818dfd35 [formerly 581b04f8f7 [formerly e3c21436e1186e467daf071bb723a2c31d6d3579]]]]
Former-commit-id: db818dfd35
Former-commit-id: 2b54f7aac4 [formerly fc8537fb12 ] [formerly 55193c36669e7a9b900055e5f3aa0567b8ff4e7d [formerly 1029538171 ]]
Former-commit-id: 2d334880b7b01c75d2419599faa3a763f21832b2 [formerly 22bc10663c ]
Former-commit-id: 3e5e303037
|
2013-02-06 13:42:57 -06:00 |
|
Roger Ferrel
|
5fca009311
|
Issue #1578 Changes for non-blocking CaveHydroSWTDialog, singleton TimeseriesDlg and removal of TimeSeriesconfigAction.
Change-Id: Ie249af9dcb2b84db686bca5c0936c2157d40c507
Former-commit-id: 2bf24f97ee [formerly a558cbc03a ] [formerly eaa3834f6b ] [formerly 2bf24f97ee [formerly a558cbc03a ] [formerly eaa3834f6b ] [formerly dc965dc82a [formerly eaa3834f6b [formerly 413491362e25a08b7e43f86987cc059f794a674b]]]]
Former-commit-id: dc965dc82a
Former-commit-id: 3f715082ec [formerly 30a1f42557 ] [formerly 4a3137039bf4b27fdc3d09ef6745a196568a0bf6 [formerly d9d53340bb ]]
Former-commit-id: cfa6e134c8ac268c358e2f352186162e9c0ac12f [formerly 24ff19dae7 ]
Former-commit-id: c4c24e2753
|
2013-02-05 16:13:08 -06:00 |
|
Mike Duff
|
efbad48825
|
Issue #1560 - TS Graphs refresh data on page up/down.
Former-commit-id: 1f71b3c0df [formerly 24e9ae73f0 ] [formerly fc24735297 ] [formerly 1f71b3c0df [formerly 24e9ae73f0 ] [formerly fc24735297 ] [formerly f03e9cc5ce [formerly fc24735297 [formerly 272894304774c8446ac6476cd9edcb8e212ffb19]]]]
Former-commit-id: f03e9cc5ce
Former-commit-id: fca5b04fa4 [formerly f5ef2dc1fe ] [formerly 1c778dd8ecedb2260d7a955f5176aacd9fddd3c9 [formerly a51d48db5e ]]
Former-commit-id: 40c46049a021e63e8ec1fb2d9beb9e99f9e2cbff [formerly a0e2621664 ]
Former-commit-id: 7b6f64506a
|
2013-01-30 16:38:04 -06:00 |
|
Steve Harris
|
b92dfd1b62
|
13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816 ] [formerly 83e9157df7 ] [formerly a4fa438a41 [formerly 33bc5fd816 ] [formerly 83e9157df7 ] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21 ] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79 ]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1 ]
Former-commit-id: 2779f5c6d9
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
2c834d0f58
|
13.2.1-1 baseline
Former-commit-id: 11b05eedeb [formerly 48d1aa7732 ] [formerly 9771dfae6b ] [formerly 11b05eedeb [formerly 48d1aa7732 ] [formerly 9771dfae6b ] [formerly c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 1d1791b3b4 [formerly 8ed6a53113 ] [formerly b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf ]]
Former-commit-id: c7cd6e75591b001d138f41ea10b2ed691477e255 [formerly 9146e727f9 ]
Former-commit-id: 08bf724a6c
|
2013-01-23 11:13:03 -05:00 |
|
Richard Peter
|
0a55bcfd67
|
Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 6e42fa32d3 [formerly a966546e31 ] [formerly 3fb7d96ec1 ] [formerly 6e42fa32d3 [formerly a966546e31 ] [formerly 3fb7d96ec1 ] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]]
Former-commit-id: 1dbb34523b
Former-commit-id: d880361e06 [formerly 79ef100838 ] [formerly 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9 ]]
Former-commit-id: ef42f50f6a062518b4a0d8effc537eaf4c7292a1 [formerly cd2014bf8d ]
Former-commit-id: e838f2db25
|
2013-01-14 18:07:17 -06:00 |
|
Steve Harris
|
e5f32a2bbe
|
13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1 ] [formerly e62172c8c7 ] [formerly 8dd688c878 [formerly 5dfe4d10f1 ] [formerly e62172c8c7 ] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 3d35fd52d5 [formerly e34695538d ] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca ]]
Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275 ]
Former-commit-id: b4556ea28f
|
2013-01-14 18:42:21 -05:00 |
|
Richard Peter
|
7d529beed2
|
Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5 ] [formerly 029ebaa63a ] [formerly 95f0508c29 [formerly d0a6ba23e5 ] [formerly 029ebaa63a ] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a [formerly 80bf1d7a28 ] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09 ]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e ]
Former-commit-id: 398b47967d
|
2013-01-09 17:55:05 -06:00 |
|
Steve Harris
|
3e63f280a2
|
13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe ] [formerly 8e5f9e0e6c ] [formerly 1d4d25b49b [formerly efd3392abe ] [formerly 8e5f9e0e6c ] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4 ] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57 ]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2 ]
Former-commit-id: b7f180d9d3
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
745f2c6409
|
13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515 ] [formerly c0c1d56f3a ] [formerly e8f4a2f031 [formerly 51208e5515 ] [formerly c0c1d56f3a ] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c ] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553 ]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858 ]
Former-commit-id: f52ec0b0a0
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
db5990243a
|
Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: e0e596120c [formerly d4686333a1 ] [formerly ab8b1ae64d ] [formerly e0e596120c [formerly d4686333a1 ] [formerly ab8b1ae64d ] [formerly ce72ebb094 [formerly ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]]
Former-commit-id: ce72ebb094
Former-commit-id: 88f9070c93 [formerly 15849ae72a ] [formerly 638be45c65cc1e7b65d1b4e332046932a30ff790 [formerly 113fdcb679 ]]
Former-commit-id: 90d18a302d7bff79b3ebe72d11d8f08efc5f661a [formerly db24093e42 ]
Former-commit-id: 868acb808b
|
2012-12-11 08:56:54 -06:00 |
|
Steve Harris
|
179755f156
|
Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: d27c5237c3 [formerly 4d4771ee3a ] [formerly 43ddfe98c4 ] [formerly d27c5237c3 [formerly 4d4771ee3a ] [formerly 43ddfe98c4 ] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]]
Former-commit-id: f6988eefff
Former-commit-id: 377804398b [formerly f02c1ef71d ] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d ]]
Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerly ebcc9975c4 ]
Former-commit-id: b0a60923c4
|
2012-12-11 08:45:53 -06:00 |
|
Roger Ferrel
|
b544c9205d
|
Issue #1353 Changes for non-blocking DamDisplayControlDlg.
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475
Former-commit-id: 57bad75093 [formerly f9a8d30c4d ] [formerly 35261a7964 ] [formerly 57bad75093 [formerly f9a8d30c4d ] [formerly 35261a7964 ] [formerly 40b8e4ec57 [formerly 35261a7964 [formerly 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a]]]]
Former-commit-id: 40b8e4ec57
Former-commit-id: c6b6263dc8 [formerly 80d7309ea7 ] [formerly df96fece3ee8f724089352eddd79ab3cbf5a43eb [formerly fdad99bcc8 ]]
Former-commit-id: 8719df88dc6d6a0d15d4d2045bc3bb20f4fe5184 [formerly 387c5d0e36 ]
Former-commit-id: d8640632cd
|
2012-12-10 11:30:06 -06:00 |
|
Roger Ferrel
|
95611a3de2
|
Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481
Former-commit-id: b5ff90958b [formerly f72e89ad2c ] [formerly 921566317a ] [formerly b5ff90958b [formerly f72e89ad2c ] [formerly 921566317a ] [formerly 81966d39fc [formerly 921566317a [formerly 62cdaba1d9e59c77efe6253105582894cd8596a0]]]]
Former-commit-id: 81966d39fc
Former-commit-id: d6787b7477 [formerly bc26433783 ] [formerly 989bb37959e7fc26d621af08b76f25afbe60302b [formerly 053584c4e2 ]]
Former-commit-id: 7166d6086831198d6a7eb8718ab6c141ecd6a9d3 [formerly 039b95d202 ]
Former-commit-id: 50bf368b38
|
2012-12-07 14:43:53 -06:00 |
|
Steve Harris
|
cedbde75e3
|
12.12.1-12 baseline
Former-commit-id: 8b74846a1b [formerly 89def5cf03 ] [formerly e8e41630e8 ] [formerly 8b74846a1b [formerly 89def5cf03 ] [formerly e8e41630e8 ] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 79b0e973ef [formerly 69ab975fab ] [formerly 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23 ]]
Former-commit-id: 54c80ccffc60d6ee8a544b475ed12355b32a2f26 [formerly 190378beeb ]
Former-commit-id: f8a9ae24cb
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
5f22640e99
|
12.12.1-8 baseline
Former-commit-id: 8790caf84e [formerly 2d338b4cec ] [formerly 19962f41ba ] [formerly 8790caf84e [formerly 2d338b4cec ] [formerly 19962f41ba ] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]]
Former-commit-id: 5093a7c442
Former-commit-id: a45a7fe1bf [formerly ff4131c2ee ] [formerly 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735 ]]
Former-commit-id: d1f389a14d75a14807b83f7528cff619dda45f17 [formerly ec2cdc1593 ]
Former-commit-id: 0b22b3c014
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
b5fd6ed2fd
|
Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4 ] [formerly 448dd1c35f ] [formerly 1ee8938748 [formerly 8fc896f7d4 ] [formerly 448dd1c35f ] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]]
Former-commit-id: 00f3d51546
Former-commit-id: 98670f1cc2 [formerly 21ecd53719 ] [formerly 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915 ]]
Former-commit-id: 02f982c590df771367e3d55fa354bfe951bed8de [formerly 59efd9a217 ]
Former-commit-id: ae9d9985cd
|
2012-11-13 17:28:50 -06:00 |
|
Steve Harris
|
9e4dbe2640
|
12.12.1-2 baseline
Former-commit-id: 7192b19284 [formerly ed809a02db ] [formerly a8560580f8 ] [formerly 7192b19284 [formerly ed809a02db ] [formerly a8560580f8 ] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 5365b72401 [formerly 111e7607cf ] [formerly 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed ]]
Former-commit-id: 0a26a9f757bec6107dd0eb5024ce9aaf5d84b865 [formerly 96a4a4f3f5 ]
Former-commit-id: 53d74c66e7
|
2012-11-13 17:14:24 -06:00 |
|
Ben Steffensmeier
|
b57a30d18d
|
Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc
Former-commit-id: 626f398224 [formerly ed4f88aa22 ] [formerly 69fc030bb4 ] [formerly 626f398224 [formerly ed4f88aa22 ] [formerly 69fc030bb4 ] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]]
Former-commit-id: e8090e654b
Former-commit-id: fa599c93a8 [formerly 109ec1e778 ] [formerly 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3 ]]
Former-commit-id: 1922ebb0208920ac3ef27814907ade54d1a0244a [formerly 7761060a12 ]
Former-commit-id: 9f2f2591ee
|
2012-11-13 16:00:19 -06:00 |
|
Steve Harris
|
94cd5a1388
|
12.12.1-1 baseline
Former-commit-id: 8278cac143 [formerly c2839cc86d ] [formerly e4bd20a515 ] [formerly 8278cac143 [formerly c2839cc86d ] [formerly e4bd20a515 ] [formerly e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]]
Former-commit-id: e1498006c7
Former-commit-id: 3cb24c1d06 [formerly 4f243de928 ] [formerly cc5d9cd9866ef60af47606a02772dd35474145e9 [formerly 214fcd3b63 ]]
Former-commit-id: 5b863edab7014aa1117ea6831f473bf942ace0fe [formerly a5be98d6de ]
Former-commit-id: af59663a99
|
2012-11-07 12:41:20 -06:00 |
|
Ben Steffensmeier
|
84ee3cecaa
|
merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 1a215cb42a [formerly 4f503d3a1e ] [formerly 6a9ff88b33 ] [formerly 1a215cb42a [formerly 4f503d3a1e ] [formerly 6a9ff88b33 ] [formerly c2934ae7a5 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 24de750932 [formerly 9b8f2bcdbd ] [formerly de67db55a641384b09da8b5dffaf5f786198848b [formerly a77d2097f8 ]]
Former-commit-id: c7706c1a1114c9415a5ad6c33596002a145bf919 [formerly dd5ab10b61 ]
Former-commit-id: 86562637f0
|
2012-10-25 12:22:11 -05:00 |
|
Steve Harris
|
8794e3b599
|
12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9 ] [formerly d3497e47eb ] [formerly 6e44abdba1 [formerly 98171b5de9 ] [formerly d3497e47eb ] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07 ] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce ]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3 ]
Former-commit-id: 35e34308c5
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
e42c12350b
|
12.11.1-3 baseline
Former-commit-id: a65c057df5 [formerly 196afa0e5f ] [formerly 2d0c424713 ] [formerly a65c057df5 [formerly 196afa0e5f ] [formerly 2d0c424713 ] [formerly 5d796f775c [formerly 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]]
Former-commit-id: 5d796f775c
Former-commit-id: 7fcbb49a3e [formerly 725b2f8ba5 ] [formerly 0e268084394b033a5de6dba694d14423a1da3040 [formerly 5723fb0031 ]]
Former-commit-id: eaae8c3b883f287ffd1c17522c62444fa45a6410 [formerly bf1f88482b ]
Former-commit-id: c25ebcdc41
|
2012-10-15 16:30:31 -05:00 |
|
Ben Steffensmeier
|
51d1c03c36
|
Merge branch 'ss_builds' into Unified_Grid
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml
Former-commit-id: a67ce9586c [formerly de3769129c ] [formerly 8b7256b1ae ] [formerly a67ce9586c [formerly de3769129c ] [formerly 8b7256b1ae ] [formerly 266a2f317f [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]]]
Former-commit-id: 266a2f317f
Former-commit-id: 97c23508d7 [formerly fde1e73d58 ] [formerly aad7acdf220a9ba94d6a280496d0b78f3466b6be [formerly fed5a35af3 ]]
Former-commit-id: 4391a50cd6a1b526355ffcad5b2b61ac30604784 [formerly b2fdd9283d ]
Former-commit-id: 29777154bb
|
2012-10-12 12:45:50 -05:00 |
|
Steve Harris
|
75d99f4e93
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 04da0dbf50 [formerly 75901860c2 ] [formerly c12ee14e66 ] [formerly 04da0dbf50 [formerly 75901860c2 ] [formerly c12ee14e66 ] [formerly 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 6e0b2c55d7 [formerly 772c60efa4 ] [formerly 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc ]]
Former-commit-id: 8fe8231e2d1c3ba8a832320dad34957e6a59e8fe [formerly e72b6d5da6 ]
Former-commit-id: ff9321e3ce
|
2012-10-08 13:26:20 -05:00 |
|
Ben Steffensmeier
|
2495d79171
|
Issue #189 convert hydro and hydrocommon to grid.
Former-commit-id: a5c60f0f13 [formerly 3e0da6d171 ] [formerly 8d150d404c ] [formerly a5c60f0f13 [formerly 3e0da6d171 ] [formerly 8d150d404c ] [formerly 3e93e8980b [formerly 8d150d404c [formerly a84fcbd045c24c16b30df4328aaf3bbbb30efd17]]]]
Former-commit-id: 3e93e8980b
Former-commit-id: f976af446f [formerly 3a1ba7bd87 ] [formerly 9c843ec0f10baa33a6447d47f517d98afd981744 [formerly 734922cb44 ]]
Former-commit-id: 15a7c506481d5aff6c1d5b18c5778b910456537a [formerly 24e6010646 ]
Former-commit-id: d3f7a486e7
|
2012-10-01 14:05:40 -05:00 |
|
Steven Harris
|
db663faca9
|
12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3 ] [formerly 618aa3f316 ] [formerly ffe3641057 [formerly 0e86bfd1d3 ] [formerly 618aa3f316 ] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93 ] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022 ]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83 ]
Former-commit-id: 2f855322f6
|
2012-09-27 15:57:45 -05:00 |
|
Ben Steffensmeier
|
2be6128151
|
Issue #189 convert viz/d2d displays from grib to grid.
Former-commit-id: 54767956bc [formerly 8e5b20236d ] [formerly 9632663c0a ] [formerly 54767956bc [formerly 8e5b20236d ] [formerly 9632663c0a ] [formerly f918b6636f [formerly 9632663c0a [formerly 003825d9634299773ad96843cc82d56ded8a1391]]]]
Former-commit-id: f918b6636f
Former-commit-id: ecdef95d0a [formerly 9512238d6e ] [formerly 7490d8b24afa2934ebd15d8ff27aa170ba918366 [formerly 6c38e6abb2 ]]
Former-commit-id: c681a18cb95fad2c1f4c02dc98365a32a2b66a40 [formerly 769e28c28d ]
Former-commit-id: 231ab11d9a
|
2012-09-24 14:05:22 -05:00 |
|
Steve Harris
|
277255717d
|
12.10.1-5 baseline
Former-commit-id: d0cd58d6bc [formerly 82feb4de50 ] [formerly a96d35a1fa ] [formerly d0cd58d6bc [formerly 82feb4de50 ] [formerly a96d35a1fa ] [formerly 4fd8893e55 [formerly a96d35a1fa [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]]
Former-commit-id: 4fd8893e55
Former-commit-id: 70566fbec1 [formerly a903893a09 ] [formerly 3760dcf872cc3205410a8002df70f1952ec6e644 [formerly deed84c1a2 ]]
Former-commit-id: 04dc60f4a3b146bf387bf04f40efb975397eb03d [formerly 430a11f72b ]
Former-commit-id: 288d4afff5
|
2012-09-17 15:42:31 -05:00 |
|
Steve Harris
|
ed04125cd7
|
12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c ] [formerly fd19ca5624 ] [formerly 0d8d18d7e2 [formerly e38e81ab8c ] [formerly fd19ca5624 ] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5 ] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576 ]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec ]
Former-commit-id: e57e7237a9
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
bc97cf788a
|
12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c ] [formerly 195158c004 ] [formerly 7248f8b762 [formerly 0abf64b77c ] [formerly 195158c004 ] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83 [formerly e720b8ed31 ] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7 ]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9 ]
Former-commit-id: a924a8347a
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
98059f9ef1
|
12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44 ] [formerly 61f269f54c ] [formerly 77cbd6c1e5 [formerly a1d931fd44 ] [formerly 61f269f54c ] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5 ] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb ]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed ]
Former-commit-id: 2d928d328e
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
867586657b
|
12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960 ] [formerly dcda3a2290 ] [formerly 71b024e3a1 [formerly 36c108e960 ] [formerly dcda3a2290 ] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3 [formerly d7d60cc623 ] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b ]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501 ]
Former-commit-id: 7e1d1f6e08
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
31353e2296
|
12.9.1-1 baseline
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9 ] [formerly 31ae7ea218 ] [formerly b9fb1c89d4 [formerly 8309193ce9 ] [formerly 31ae7ea218 ] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df ] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416 ]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121 ]
Former-commit-id: 16d7d955fc
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
1098368e19
|
12.8.1-5 baseline
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3 ] [formerly fd2abfb6f1 ] [formerly 2e804fc8c4 [formerly 2653ddc2e3 ] [formerly fd2abfb6f1 ] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 4f47148ced [formerly dab00b12e6 ] [formerly 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1 ]]
Former-commit-id: 573a0cc46f2d0efe2e8514f12ca675b4673c9160 [formerly e86949a8d3 ]
Former-commit-id: d3be09bd74
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
23dc8deeb0
|
12.7.1-8 baseline
Former-commit-id: b242dd98d6 [formerly 11f96dbedd ] [formerly 16bf591a33 ] [formerly b242dd98d6 [formerly 11f96dbedd ] [formerly 16bf591a33 ] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972 [formerly f2102bfb24 ] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964 ]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9 ]
Former-commit-id: 36e2ad3023
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
c74431ba29
|
12.6.1-9 baseline
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868 ] [formerly 2c0ff851ca ] [formerly 32fdf6ed3b [formerly 7c064b6868 ] [formerly 2c0ff851ca ] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443 ] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0 ]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b ]
Former-commit-id: 37f2b6e138
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
46068c6716
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 2f10c7a1e4 [formerly 8552902906 ] [formerly b13cbb7e00 ] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e ] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f ]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c ]
Former-commit-id: 39ff9954f8
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
5b35d8a6e0
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd ] [formerly 67a5a68300 ] [formerly 4767b0e069 [formerly 750b7543dd ] [formerly 67a5a68300 ] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae ] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd ]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c ]
Former-commit-id: 74b66d9683
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
9340618732
|
12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b ] [formerly 4068f5295f ] [formerly 760ead2047 [formerly 0e4128712b ] [formerly 4068f5295f ] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39 [formerly 8bc60b1e32 ] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605 ]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b ]
Former-commit-id: 293563cfe7
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
587c928f4e
|
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 0be3703c7e [formerly 4981170462 ] [formerly dcadf7baa4 ] [formerly 0be3703c7e [formerly 4981170462 ] [formerly dcadf7baa4 ] [formerly 86e586befe [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]]
Former-commit-id: 86e586befe
Former-commit-id: fbb5de922a [formerly 4eb1ef5b0f ] [formerly 5a0e0d2312e9dc1ae83176f1127db903c68bc140 [formerly 938dc5b21c ]]
Former-commit-id: a02575690595cf7dbca41fcc8e53a47ab455d3ac [formerly 2c958713b6 ]
Former-commit-id: 93d99ca49c
|
2012-02-23 12:38:55 -06:00 |
|
Steve Harris
|
3a4af24369
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de ] [formerly c8aae98741 ] [formerly 829d2791e9 [formerly 8da36046de ] [formerly c8aae98741 ] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6 [formerly b55a488ed8 ] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963 ]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc ]
Former-commit-id: 978d22db50
|
2012-02-22 11:14:43 -06:00 |
|
Steve Harris
|
2acea8b7d5
|
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: cc45f5a268 [formerly a2fd2cf6fa ] [formerly 6a064cb78b ] [formerly cc45f5a268 [formerly a2fd2cf6fa ] [formerly 6a064cb78b ] [formerly d02529fef4 [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]]
Former-commit-id: d02529fef4
Former-commit-id: 4ffbe4780e [formerly b41e5f2415 ] [formerly b1cec7b0617c7b5f5c46fade03d4b59fd4aeb442 [formerly d133454b27 ]]
Former-commit-id: 1d157738e844ae1be12f9b1669c8101f16df9737 [formerly d9c8a99210 ]
Former-commit-id: d3c80a1557
|
2012-02-20 12:54:25 -06:00 |
|
Steve Harris
|
8c9e581f41
|
Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 7b4b066a2b [formerly c209d6de36 ] [formerly 93f6535bd8 ] [formerly 7b4b066a2b [formerly c209d6de36 ] [formerly 93f6535bd8 ] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]]
Former-commit-id: b137302802
Former-commit-id: 43c3cfdd1a [formerly 1ac6b36d1f ] [formerly eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24 ]]
Former-commit-id: f9b44e61385fcc409fa97cc2681f13c4a9c57a4a [formerly 895404abeb ]
Former-commit-id: 9a09879521
|
2012-02-17 10:55:02 -06:00 |
|
Matt Nash
|
e1956ce215
|
Issue #26 tear off menu changes to fix issues
Former-commit-id: 41d93a82a1 [formerly 0ea872be36 ] [formerly 542049e455 ] [formerly 41d93a82a1 [formerly 0ea872be36 ] [formerly 542049e455 ] [formerly 0ff3ef8d72 [formerly 542049e455 [formerly 30c43cbcd4500c5754261b420f5c9b031bd63014]]]]
Former-commit-id: 0ff3ef8d72
Former-commit-id: b6f2bb73c3 [formerly 919433b8d4 ] [formerly bc5a3a17c6ecc7edd1af6a345b6d7e1d8bd2b15d [formerly 88689efbfa ]]
Former-commit-id: 6c62f3373357543cab66604c41b607ae086f5dc6 [formerly 6f5a048cac ]
Former-commit-id: 817e2a41d6
|
2012-02-03 13:13:15 -06:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7 ] [formerly 66be3bec40 ] [formerly d8da2252c3 [formerly 580e2938d7 ] [formerly 66be3bec40 ] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf ] [formerly 21d2361f00 [formerly 1faae42484 ]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c ] [formerly 9f19e3f712 ] [formerly 133dc97f67 [formerly a02aeb236c ] [formerly 9f19e3f712 ] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59 ] [formerly 377dcd10b9 [formerly 3360eb6c5f ]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|