Dustin Johnson
|
931d94d1de
|
Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
edexOsgi/build.edex/deploy-common/external-rules.xml
edexOsgi/build.edex/deploy-common/plugin-methods.xml
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
edexOsgi/build.edex/build.xml
edexOsgi/build.edex/esb/conf/modes.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0
Former-commit-id: 8e69107b5a [formerly 98d7beae50] [formerly 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: e7a0f96a9a [formerly bcf575966b]
Former-commit-id: 4d9c945388
|
2012-11-01 13:36:06 -05:00 |
|
Ben Steffensmeier
|
518644cc2f
|
Issue #189 a few fixes to grid resources for FFG Mosaic
Former-commit-id: dc0e75eb29 [formerly 64d4a1add7] [formerly dc0e75eb29 [formerly 64d4a1add7] [formerly 4b121fd7b3 [formerly f8420e7052145c856b12310776e6acd7362dc9cb]]]
Former-commit-id: 4b121fd7b3
Former-commit-id: ec68d0445e [formerly bde106e70d]
Former-commit-id: b830e7c9c2
|
2012-10-31 11:39:32 -05:00 |
|
Roger Ferrel
|
0d1b4baba6
|
Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog.
Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc
Former-commit-id: 2b80c2c2b5 [formerly d92be142ad] [formerly 2b80c2c2b5 [formerly d92be142ad] [formerly 3c64544822 [formerly 17f789e76f77467935002d3b466b764ddb0b81f4]]]
Former-commit-id: 3c64544822
Former-commit-id: b289472e49 [formerly 1e0241e509]
Former-commit-id: e27cbc2edb
|
2012-10-30 17:09:52 -05:00 |
|
Lee Venable
|
8be54fc2ed
|
Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development
Former-commit-id: 51c60c1876 [formerly 868fe53216] [formerly 51c60c1876 [formerly 868fe53216] [formerly 2c86fdb2d0 [formerly 08784a33471cc96472370081f31d7d7edb2a61f7]]]
Former-commit-id: 2c86fdb2d0
Former-commit-id: 7b0e8774db [formerly 881a8e726b]
Former-commit-id: 3163b91c70
|
2012-10-30 16:46:30 -05:00 |
|
Lee Venable
|
bb7ec69f5d
|
Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development
Former-commit-id: 08e6cd0a31 [formerly 276ce2ad08] [formerly 08e6cd0a31 [formerly 276ce2ad08] [formerly e47d1beb09 [formerly 8d14e957dc2152a31c813a9278646904e2a3c777]]]
Former-commit-id: e47d1beb09
Former-commit-id: f5008c2296 [formerly cebd35bb47]
Former-commit-id: 2cdc38472f
|
2012-10-30 16:45:35 -05:00 |
|
Lee Venable
|
629769bf4a
|
Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development
Former-commit-id: eed01fd643 [formerly 33525e4dff] [formerly eed01fd643 [formerly 33525e4dff] [formerly 0bc4ec2135 [formerly 3bb9ad3e1fb050dba420fc634b742a73b4443ba2]]]
Former-commit-id: 0bc4ec2135
Former-commit-id: 364fb3f463 [formerly 2d3eeeaacf]
Former-commit-id: c2f84c7c52
|
2012-10-30 16:44:56 -05:00 |
|
Roger Ferrel
|
3fc2e7f9e0
|
Issue #1298 Changes for non-blocking ContourDialog and removal of ButtonEntryDialog.
Change-Id: I6151274f455066c03db49618d6b5801248d48527
Former-commit-id: 84a338fd4c [formerly 0c544da917] [formerly 84a338fd4c [formerly 0c544da917] [formerly 7c8f48fcb5 [formerly c67543535ff38b777f14df1f41d96dbdacddeb09]]]
Former-commit-id: 7c8f48fcb5
Former-commit-id: bc7e45e5e3 [formerly c0b480bc7f]
Former-commit-id: 14d1eb4453
|
2012-10-30 15:19:08 -05:00 |
|
Roger Ferrel
|
922045cf1a
|
Issue #1298 Changes for non-blocking BrightnessDialog.
Change-Id: I84e0778c62c7cdffe33d89c5b2a3a4f205572483
Former-commit-id: 9dcaf583f6 [formerly bc1e462d07] [formerly 9dcaf583f6 [formerly bc1e462d07] [formerly 2fb06a145f [formerly 535d952595adfcd749ee132e45736120aa25cd3d]]]
Former-commit-id: 2fb06a145f
Former-commit-id: 769a831689 [formerly 191e4e83db]
Former-commit-id: fe1af85c72
|
2012-10-30 14:00:20 -05:00 |
|
Roger Ferrel
|
6d49470c36
|
Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking.
Change-Id: I034b1f02eb3b1ac623c8d2d4b9a953e53534dba0
Former-commit-id: 3b96d312cd [formerly 8952e1cef8] [formerly 3b96d312cd [formerly 8952e1cef8] [formerly e37a097596 [formerly 6dc43f8d58b82a4b59a3945cc41ad8dcdda47a11]]]
Former-commit-id: e37a097596
Former-commit-id: 2cbd0000ad [formerly b93dcebdc0]
Former-commit-id: 6c9c5a0a5f
|
2012-10-30 12:35:48 -05:00 |
|
Ben Steffensmeier
|
1931b503a2
|
merge branch Unifeid_Grid into developement
Former-commit-id: 272e057bf1 [formerly d0a2ed32b5] [formerly 272e057bf1 [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]]
Former-commit-id: b6a1563bb2
Former-commit-id: 1d94435220 [formerly 92fd247ccc]
Former-commit-id: 38b0dafe0b
|
2012-10-30 12:24:54 -05:00 |
|
Roger Ferrel
|
69fc576fda
|
Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog.
Change-Id: I5a4ad66d3aff1ab4b77b78ec8db233875aa61620
Former-commit-id: 6291083e5b [formerly 87d3ff985e] [formerly 6291083e5b [formerly 87d3ff985e] [formerly 5355b7f620 [formerly 13f856685e36155909e7c4f4f9ac36d3a5633e4a]]]
Former-commit-id: 5355b7f620
Former-commit-id: baef52459d [formerly 089e8af498]
Former-commit-id: 4637ecd3fa
|
2012-10-30 10:34:40 -05:00 |
|
Lee Venable
|
964b297c67
|
Merge "Issue #1298 Changes for non-blocking WeatherElementBrowserDialog." into development
Former-commit-id: 3c6facf14b [formerly a7eb12fd9e] [formerly 3c6facf14b [formerly a7eb12fd9e] [formerly 676856f62f [formerly d6040334d8c3ea717966b54dc6bcc333d67d5b1b]]]
Former-commit-id: 676856f62f
Former-commit-id: 1a475c55de [formerly b491922ddc]
Former-commit-id: 00ae0f75a4
|
2012-10-30 10:26:53 -05:00 |
|
Roger Ferrel
|
30a42aa2e2
|
Issue #1298 Changes for non-blocking WeatherElementBrowserDialog.
Change-Id: I3359b2b9f9bbf1e58735891163fa8fd798e4ac1e
Former-commit-id: 2f4ead5037 [formerly f65213c542] [formerly 2f4ead5037 [formerly f65213c542] [formerly 4a13cfb8a6 [formerly f37d9edd9803c6a2bbf039662b3f2750b1cec8db]]]
Former-commit-id: 4a13cfb8a6
Former-commit-id: 61349397e4 [formerly 551cffe315]
Former-commit-id: f4bc26d598
|
2012-10-30 09:00:10 -05:00 |
|
Roger Ferrel
|
be9e3ee1d9
|
Issue #1298 Changes for non-blocking TimeShiftDialog.
Change-Id: I60f60daee3b25fec2dabd09dd44c85bd3e57160c
Former-commit-id: a6f06c265b [formerly 1d67e245aa] [formerly a6f06c265b [formerly 1d67e245aa] [formerly 7af20b6130 [formerly 1deeb17d498a883af24fe983b7967918b3c3deb9]]]
Former-commit-id: 7af20b6130
Former-commit-id: 8fba446977 [formerly 406de0548d]
Former-commit-id: 8c40af7954
|
2012-10-30 08:27:25 -05:00 |
|
Roger Ferrel
|
563f2bae29
|
Issue #1287 Changes for blocking ServiceBackupDlg in stand alone mode and removal no longer uses class.
Change-Id: Ice2b62bd22044f77536e00650962bfb9ea7d4082
Former-commit-id: af547b7c6f [formerly 55461bc61d] [formerly af547b7c6f [formerly 55461bc61d] [formerly 4a2ae2f6db [formerly ac8b26304f847a41c7b9befcc0d16b76e9a8e16d]]]
Former-commit-id: 4a2ae2f6db
Former-commit-id: 534b308771 [formerly 67d404ad87]
Former-commit-id: 72be898478
|
2012-10-29 13:31:43 -05:00 |
|
Steve Harris
|
6f16b46b8d
|
Merge branch 'ss_builds' into development
Former-commit-id: 340ce53e22 [formerly fb46bb053d] [formerly 340ce53e22 [formerly fb46bb053d] [formerly afb534db67 [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]]
Former-commit-id: afb534db67
Former-commit-id: e211bfc043 [formerly 048c0c88cd]
Former-commit-id: e9e3bdbec2
|
2012-10-29 12:17:12 -05:00 |
|
Steve Harris
|
a9e1b01ad7
|
12.11.1-12 baseline
Former-commit-id: 565756567f [formerly 8682e4f6ca] [formerly 565756567f [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: d8b6157aab [formerly 314c03e7b6]
Former-commit-id: 09f6e43195
|
2012-10-29 12:15:56 -05:00 |
|
Lee Venable
|
30c6b911b4
|
Merge "Issue #1287 Changes for non-blocking TimeScalePeriodsDialog." into development
Former-commit-id: 01bd16bbd7 [formerly eb660ac54d] [formerly 01bd16bbd7 [formerly eb660ac54d] [formerly 4bc57aec7e [formerly edfda206905211559bfd5b384ccae129d11bb5cb]]]
Former-commit-id: 4bc57aec7e
Former-commit-id: 55186d5a74 [formerly 79a5d07605]
Former-commit-id: 497492b70c
|
2012-10-29 08:40:34 -05:00 |
|
Roger Ferrel
|
6d56215868
|
Issue #1287 Changes for non-blocking TimeScalePeriodsDialog.
Change-Id: I5bed1a9f3ee792099749b26071ed2816c84f6049
Former-commit-id: 74c8f86b27 [formerly ea2fdbc1b8] [formerly 74c8f86b27 [formerly ea2fdbc1b8] [formerly 99179463f5 [formerly aa32e71beadc5b9302abddedeb53003a66a57261]]]
Former-commit-id: 99179463f5
Former-commit-id: d414206760 [formerly 22ebd6b55a]
Former-commit-id: 49903040c7
|
2012-10-29 08:09:57 -05:00 |
|
Roger Ferrel
|
ff40c3c818
|
Issue #1287 Changes for non-blocking SiteActivationDlg.
Change-Id: Id059058fda486b57df5d461f3c9eb13981f7f744
Former-commit-id: b345d95b4d [formerly 8c5b00fa42] [formerly b345d95b4d [formerly 8c5b00fa42] [formerly 2ab4a8508a [formerly ae1185cb5825915820314fdc48c897676ead8538]]]
Former-commit-id: 2ab4a8508a
Former-commit-id: 8adebd22d3 [formerly 8fca4cf256]
Former-commit-id: 5652b7e685
|
2012-10-29 07:21:00 -05:00 |
|
Lee Venable
|
ec797c784b
|
Merge "Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog." into development
Former-commit-id: d7c043dffa [formerly 6c3b12a9d3] [formerly d7c043dffa [formerly 6c3b12a9d3] [formerly ddbed06f64 [formerly e16cb0c6c05d7e2fc4ab6eac04217f60df5bcc4b]]]
Former-commit-id: ddbed06f64
Former-commit-id: c79354b0a6 [formerly 7621f14d95]
Former-commit-id: 7ac4bfac5d
|
2012-10-26 15:28:37 -05:00 |
|
Lee Venable
|
27d8639921
|
Merge "Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog." into development
Former-commit-id: 656b6bf04e [formerly 84e66d2fab] [formerly 656b6bf04e [formerly 84e66d2fab] [formerly 0967a6348b [formerly 53a9d4129eadd0156855a5c9248ce2848cb08d95]]]
Former-commit-id: 0967a6348b
Former-commit-id: 2280eef896 [formerly 1407f47d1c]
Former-commit-id: 7b4bbc1206
|
2012-10-26 15:28:07 -05:00 |
|
Lee Venable
|
88b4c01882
|
Merge "Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository: edexOsgi/com.raytheon.uf.common.event edexOsgi/com.raytheon.uf.common.stats edexOsgi/com.raytheon.uf.edex.event.feature edexOsgi/com.raytheon.uf.edex.event edexOsgi/com.raytheon.uf.edex.stats" into development
Former-commit-id: 41472f07d2 [formerly 173813c954] [formerly 41472f07d2 [formerly 173813c954] [formerly 41c8c88a03 [formerly f67e7970061c9bc4dde3b4175dcb9b45d204ff34]]]
Former-commit-id: 41c8c88a03
Former-commit-id: 15ae8a5add [formerly bd49530415]
Former-commit-id: 1f07aee476
|
2012-10-26 15:25:52 -05:00 |
|
Roger Ferrel
|
bed37132b7
|
Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog.
Change-Id: I7726f8934351cea98edbf7751f23f42248e5b17c
Former-commit-id: 9647a110c6 [formerly af887de89c] [formerly 9647a110c6 [formerly af887de89c] [formerly 37c7d61195 [formerly a8e412f5d0cd625b6c421b0609bc7149d7386f1a]]]
Former-commit-id: 37c7d61195
Former-commit-id: fe48147739 [formerly f4b0b6cd56]
Former-commit-id: 21c3e3b387
|
2012-10-26 15:03:26 -05:00 |
|
Roger Ferrel
|
b67f36bdc0
|
Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog.
Change-Id: Ia01b3de6959392afacfc47ac42e794e0b8e357f2
Former-commit-id: f304b930cd [formerly c3d2ac5976] [formerly f304b930cd [formerly c3d2ac5976] [formerly e2b35d015f [formerly 15e80fd970393b74f6a320a794004f89bf3619a5]]]
Former-commit-id: e2b35d015f
Former-commit-id: 1b7481abc3 [formerly 7ce8344826]
Former-commit-id: c7a81f74a9
|
2012-10-26 14:44:29 -05:00 |
|
Roger Ferrel
|
2075c8605c
|
Issue #1287 changes for non-blocking ISCRequestReplyDlg and SendISCDialog; removal of no longer used classes.
Change-Id: I25b8caa1a1316a63d051fa29d913330355afcc75
Former-commit-id: 2711bab50a [formerly 57a547fc66] [formerly 2711bab50a [formerly 57a547fc66] [formerly 7a3149dbb3 [formerly 7d57a8ae96ff778892438fb41cd84ce1bb1a8dc7]]]
Former-commit-id: 7a3149dbb3
Former-commit-id: ca97133b23 [formerly cd7c3ec006]
Former-commit-id: 83ce19bfb8
|
2012-10-26 14:27:00 -05:00 |
|
Brad Gonzales
|
673749c4b9
|
Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository:
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats
update the edex feature and edex build.xml to include the edex stat projects.
Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4
Former-commit-id: d26119c383 [formerly b2656df2f8] [formerly d26119c383 [formerly b2656df2f8] [formerly 24fc32ee14 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]]
Former-commit-id: 24fc32ee14
Former-commit-id: 781265a6a8 [formerly 5949c8b09c]
Former-commit-id: e1a106fdbb
|
2012-10-26 14:00:55 -05:00 |
|
Roger Ferrel
|
19628b17e1
|
Issue #1287 Changes for non-blocking WESaveDialog.
Change-Id: Ic2dbc76126b3b38c27cdd3fc07ca1317725d12fd
Former-commit-id: 6806384d21 [formerly 32154a3789] [formerly 6806384d21 [formerly 32154a3789] [formerly 51369fbd50 [formerly e02ff1c81c669ae0bcf5c068487a9c35bc542ff2]]]
Former-commit-id: 51369fbd50
Former-commit-id: eace9f331e [formerly f4bd80afef]
Former-commit-id: 7cc1520364
|
2012-10-26 09:01:46 -05:00 |
|
Roger Ferrel
|
caa8b4b78a
|
Issue #1287 Changes for non-blocking WERevertDialog.
Change-Id: I7112fadab6eaaac1c7145fd998e8dfca3f975f3b
Former-commit-id: a87a84fdbb [formerly 117bcc648e] [formerly a87a84fdbb [formerly 117bcc648e] [formerly 4d2c234072 [formerly 50b20b90ad974962334fb7dbf9c8fa3c369b01a1]]]
Former-commit-id: 4d2c234072
Former-commit-id: ce461c532b [formerly 3a397258ff]
Former-commit-id: 34d61db4da
|
2012-10-26 08:23:04 -05:00 |
|
Roger Ferrel
|
9150ccbc51
|
Issue #1287 Changes for non-blocking PublishDialog.
Change-Id: I551850f82ad40bfa9c49d10c6b8193ec365ccea2
Former-commit-id: 4c40059a5a [formerly 833b7bb850] [formerly 4c40059a5a [formerly 833b7bb850] [formerly 93472a82e5 [formerly a0b4c4eb635ce39cf1a25c78620d317e59d33061]]]
Former-commit-id: 93472a82e5
Former-commit-id: 47f832734a [formerly c0497226a6]
Former-commit-id: 5a3c07823b
|
2012-10-26 07:07:18 -05:00 |
|
Ben Steffensmeier
|
94f0378fab
|
Issue #189 changes from code review
Former-commit-id: 3c222ab437 [formerly 984d128d33] [formerly 3c222ab437 [formerly 984d128d33] [formerly 7139c80557 [formerly 449762acbbe74173121e19f5c325104221c083a2]]]
Former-commit-id: 7139c80557
Former-commit-id: fcc23a917e [formerly b0bf62ce6f]
Former-commit-id: c1e4873727
|
2012-10-25 16:33:59 -05:00 |
|
Ben Steffensmeier
|
34e4be26d0
|
Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
Former-commit-id: 7734a983f5 [formerly b7d61e7543] [formerly 7734a983f5 [formerly b7d61e7543] [formerly 6f2c1ede9e [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]]
Former-commit-id: 6f2c1ede9e
Former-commit-id: 45cc834fc3 [formerly 54f414a7e0]
Former-commit-id: d2eb23821f
|
2012-10-25 16:17:54 -05:00 |
|
Lee Venable
|
8051f97bec
|
Merge "Issue #1287 Changes for non-blocking RefSetAppearanceDialog." into development
Former-commit-id: 4caccdd1a5 [formerly de997956f3] [formerly 4caccdd1a5 [formerly de997956f3] [formerly 02ad711e0c [formerly 9f7230c0e0aafc6d7bd1f3608f020ed33a9f4a4d]]]
Former-commit-id: 02ad711e0c
Former-commit-id: 4ab0bd782b [formerly 877692bf63]
Former-commit-id: 7172610fa7
|
2012-10-25 16:06:53 -05:00 |
|
Roger Ferrel
|
e7af6bf461
|
Issue #1287 Changes for non-blocking RefSetAppearanceDialog.
Change-Id: I0b3f5e8c57600f3d20a7662404b014adc874e6fc
Former-commit-id: 4d60aac952 [formerly 06b3d2f921] [formerly 4d60aac952 [formerly 06b3d2f921] [formerly 2b08397e4b [formerly 7e64b7aa2a236d07c04b72e1eac2c660e0c87642]]]
Former-commit-id: 2b08397e4b
Former-commit-id: 16d822f738 [formerly d119a1c518]
Former-commit-id: 0ddbad2654
|
2012-10-25 15:23:45 -05:00 |
|
Roger Ferrel
|
50dd72fe48
|
Issue #1287 Changes for non-blocking ProductScriptsDialog.
Change-Id: Ia68cd67bf7dd10eac5e0aacc9dcf68ca96f8b2f8
Former-commit-id: 5a4c795bbc [formerly 17de26adfb] [formerly 5a4c795bbc [formerly 17de26adfb] [formerly 73b4ca43c8 [formerly df3546eba27a1cbca6204351a7961e1aabc9c787]]]
Former-commit-id: 73b4ca43c8
Former-commit-id: fefd403fd1 [formerly af40c442db]
Former-commit-id: 10ef3046a4
|
2012-10-25 14:13:41 -05:00 |
|
Lee Venable
|
0e24944929
|
Merge "Issue #1287 Changes for non-blocking ProcessMonitorDialog." into development
Former-commit-id: 4c932a5ad8 [formerly c2e1e42e26] [formerly 4c932a5ad8 [formerly c2e1e42e26] [formerly d7ae341df2 [formerly 711419494f6ec18c3398bdded18b71d0ac4d37ae]]]
Former-commit-id: d7ae341df2
Former-commit-id: 56ed16dc7f [formerly b5eceeda7f]
Former-commit-id: 673bb4b340
|
2012-10-25 14:03:42 -05:00 |
|
Nate Jensen
|
69c06d130b
|
Merge "Issue #1194 change TimeMatcher so it only uses dtd in cases where dt and dtf are very different." into development
Former-commit-id: 72a4b36e91 [formerly c6ca41e7c3] [formerly 72a4b36e91 [formerly c6ca41e7c3] [formerly 10cdbdbd61 [formerly 4187d6fd94a38291047860cc780fb1aa9f59d825]]]
Former-commit-id: 10cdbdbd61
Former-commit-id: bab292b06a [formerly 3c1463c4d9]
Former-commit-id: 72c9a5a4c7
|
2012-10-25 13:39:11 -05:00 |
|
Lee Venable
|
5b0435bb79
|
Merge "Issue #1287 Changes SampleSetDialog from review." into development
Former-commit-id: b02ae8d48c [formerly 66dd846674] [formerly b02ae8d48c [formerly 66dd846674] [formerly 4aef416119 [formerly 7e72d19330025ef611f509c9140103c28cd89b5d]]]
Former-commit-id: 4aef416119
Former-commit-id: 3b039b4fe7 [formerly d6c9359dc9]
Former-commit-id: 12954b7925
|
2012-10-25 13:31:50 -05:00 |
|
Lee Venable
|
bb64b138aa
|
Merge "Issue #1287 Changes for non-blocking HiddenWeatherElementDialog." into development
Former-commit-id: 5ab897b8f0 [formerly e32da5af26] [formerly 5ab897b8f0 [formerly e32da5af26] [formerly 90e135a991 [formerly 835cb07b70c7120003a8b45a5b628671e4cff956]]]
Former-commit-id: 90e135a991
Former-commit-id: aa7ef2a8b2 [formerly f9e4fba04d]
Former-commit-id: 88b9f8fffc
|
2012-10-25 13:20:44 -05:00 |
|
Roger Ferrel
|
6f2120abff
|
Issue #1287 Changes for non-blocking ProcessMonitorDialog.
Change-Id: Icba40d0766d796da155766005da1f3842920f286
Former-commit-id: a6a6bbb22d [formerly bf86d2c98b] [formerly a6a6bbb22d [formerly bf86d2c98b] [formerly ff72fd0fbd [formerly 1dea100231893ca5a954c13e2f9e9770fec0f028]]]
Former-commit-id: ff72fd0fbd
Former-commit-id: cb9cc69b18 [formerly dd47425456]
Former-commit-id: 00cbea46c9
|
2012-10-25 13:10:21 -05:00 |
|
Lee Venable
|
6f5f4efc7f
|
Merge "Issue #1287 Chamges for non-blocking GridsInterpolateDialog." into development
Former-commit-id: 3f5bf75b08 [formerly 14294c1984] [formerly 3f5bf75b08 [formerly 14294c1984] [formerly 38ceefb7ef [formerly b9746712b90aa685c91b4f484e5eed9bfc920a8b]]]
Former-commit-id: 38ceefb7ef
Former-commit-id: 4d0df94c06 [formerly c165d9dec9]
Former-commit-id: 5ecb7df20e
|
2012-10-25 13:08:33 -05:00 |
|
Ben Steffensmeier
|
73f44a1225
|
Issue #1194 change TimeMatcher so it only uses dtd in cases where dt and dtf are very different.
Former-commit-id: b01de6a051 [formerly 8400bc010b] [formerly b01de6a051 [formerly 8400bc010b] [formerly 9b19ec5b29 [formerly 1aa108da3e26e698af4ea0206ca1e7fb1ffcc588]]]
Former-commit-id: 9b19ec5b29
Former-commit-id: 884fa10618 [formerly f65f294d2a]
Former-commit-id: fce09d8c44
|
2012-10-25 13:03:41 -05:00 |
|
Roger Ferrel
|
d45a3bc631
|
Issue #1287 Changes for non-blocking HiddenWeatherElementDialog.
Change-Id: Iccc5f755f0eab9ee952b1f6c8d33e1842bcddddf
Former-commit-id: 86236eacbf [formerly ef8f1e5fdd] [formerly 86236eacbf [formerly ef8f1e5fdd] [formerly 5823279aa8 [formerly c9b9cd92c8663d0ee896fbf98434eb1a63df2015]]]
Former-commit-id: 5823279aa8
Former-commit-id: 2adcf71c69 [formerly 66996e056f]
Former-commit-id: 9498b10294
|
2012-10-25 12:29:39 -05:00 |
|
Ben Steffensmeier
|
86562637f0
|
merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]]
Former-commit-id: c2934ae7a5
Former-commit-id: 9b8f2bcdbd [formerly a77d2097f8]
Former-commit-id: dd5ab10b61
|
2012-10-25 12:22:11 -05:00 |
|
Roger Ferrel
|
6756c1393e
|
Issue #1287 Changes SampleSetDialog from review.
Change-Id: Ifcca23bdacabf7495cdc08763b6ebad0b6961f09
Former-commit-id: 61d530b0e6 [formerly 615b9b8fbb] [formerly 61d530b0e6 [formerly 615b9b8fbb] [formerly 5e4c7c0d53 [formerly 0eb964cc6bb9e2961b30f39e52a0b178f09d96ca]]]
Former-commit-id: 5e4c7c0d53
Former-commit-id: a9f16da620 [formerly c302c27ba7]
Former-commit-id: 75883c04c5
|
2012-10-25 11:09:55 -05:00 |
|
Roger Ferrel
|
3443764431
|
Issue #1287 Chamges for non-blocking GridsInterpolateDialog.
Change-Id: Ia3f01307a862a9cfa870f20ba5f05a56eb51e187
Former-commit-id: 18914b1cd0 [formerly 3e7b9efcbd] [formerly 18914b1cd0 [formerly 3e7b9efcbd] [formerly e2365768d0 [formerly 1763a82ea33df9d61fd754523bca389ffe4b5f0f]]]
Former-commit-id: e2365768d0
Former-commit-id: 10a3dbd7d2 [formerly 5a1e45896c]
Former-commit-id: 843acc2786
|
2012-10-25 09:42:15 -05:00 |
|
Roger Ferrel
|
2084d948aa
|
Issue #1287 Changes for non-blocking EditActionsDialog.
Change-Id: Ic14a30846d68c016aedac183c5637d858c6c9687
Former-commit-id: 6421e908fb [formerly 6525b553aa] [formerly 6421e908fb [formerly 6525b553aa] [formerly 44a1292bfe [formerly acbfa37d7bb57078469fb63f31356c8500baa075]]]
Former-commit-id: 44a1292bfe
Former-commit-id: 2895b274d2 [formerly 0c79b72381]
Former-commit-id: 7080506915
|
2012-10-25 08:51:43 -05:00 |
|
Lee Venable
|
76c7a3e7ea
|
Merge "Issue #1287 Changes for non-blocking SaveDeleteSelectTRDialog." into development
Former-commit-id: 076c9e55ea [formerly 900bddaab9] [formerly 076c9e55ea [formerly 900bddaab9] [formerly da5917e583 [formerly bdf06545fdf40531cf42ff29ca8d1f130a849469]]]
Former-commit-id: da5917e583
Former-commit-id: de911c657c [formerly baf9c741db]
Former-commit-id: 46b0ec1eef
|
2012-10-25 08:23:15 -05:00 |
|
Roger Ferrel
|
02b69aea45
|
Issue #1287 Changes for non-blocking SaveDeleteSelectTRDialog.
Change-Id: I22500cf5f7e3f11c16abd50b1ad5c80be81283cb
Former-commit-id: a989cceaa6 [formerly 5f016cac30] [formerly a989cceaa6 [formerly 5f016cac30] [formerly d2122ef959 [formerly 86f70d36d7eac5b472a1aa22922c30390436f880]]]
Former-commit-id: d2122ef959
Former-commit-id: 687dc18b9a [formerly fbc8331f28]
Former-commit-id: a2feba9e51
|
2012-10-25 08:08:33 -05:00 |
|
Roger Ferrel
|
be4dd4aa5b
|
Issue #1287 Changes for non-blocking SampleSetDialog.
Change-Id: I6b3eab5386418f9303190892f1a746d63a82ce65
Former-commit-id: 538ce87115 [formerly 8af2d4a404] [formerly 538ce87115 [formerly 8af2d4a404] [formerly af299023e2 [formerly 622b739d6e1352aacb96b7dd0f797f2b43fe5847]]]
Former-commit-id: af299023e2
Former-commit-id: 463e648808 [formerly 3eb28edd6c]
Former-commit-id: 6752ed4a22
|
2012-10-24 17:12:14 -05:00 |
|