Roger Ferrel
|
9a1283fb1e
|
Issue #1298 Changes for non-blocking FuzzValueDialog.
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: 3ad0d7d516 [formerly 023252fb84] [formerly c3f451f799 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]
Former-commit-id: c3f451f799
Former-commit-id: de534f5b43
|
2012-11-08 08:24:38 -06:00 |
|
Nate Jensen
|
2fe69a5871
|
Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development
Former-commit-id: 20a63254e2 [formerly b32a9e839e] [formerly 6b205399d4 [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]
Former-commit-id: 6b205399d4
Former-commit-id: e3208d48a0
|
2012-11-07 18:18:06 -06:00 |
|
Lee Venable
|
15842d7d22
|
Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
Former-commit-id: c8955b5425 [formerly 36c44db46b] [formerly 8956718961 [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]]
Former-commit-id: 8956718961
Former-commit-id: eacc1ca32c
|
2012-11-07 17:38:21 -06:00 |
|
Roger Ferrel
|
42f453ffca
|
Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0
Former-commit-id: ee038e811c [formerly a46535ee0c] [formerly 65d10be5d6 [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]
Former-commit-id: 65d10be5d6
Former-commit-id: 35f3a3953c
|
2012-11-07 15:07:47 -06:00 |
|
Roger Ferrel
|
d6e00b6c35
|
Issue #1298 Changes for non-blocking CallToActionsDlg.
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc
Former-commit-id: 4b0c701d69 [formerly 190922a233] [formerly 81de6cd45b [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]]
Former-commit-id: 81de6cd45b
Former-commit-id: d6560d7730
|
2012-11-07 14:35:38 -06:00 |
|
Lee Venable
|
412c29f116
|
Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development
Former-commit-id: 074543d75e [formerly f368b93484] [formerly 297d2bbc9c [formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]]
Former-commit-id: 297d2bbc9c
Former-commit-id: 24dd8a1bc7
|
2012-11-07 12:31:39 -06:00 |
|
Roger Ferrel
|
35b0dc2cef
|
Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking.
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91
Former-commit-id: 8bf89ad495 [formerly 82abbbf0b7] [formerly 974431a13a [formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]]
Former-commit-id: 974431a13a
Former-commit-id: c6749e3740
|
2012-11-07 11:27:36 -06:00 |
|
Max Schenkelberg
|
5a5bd522a1
|
Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345
Former-commit-id: f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: ca4177dd08
Former-commit-id: 747ab974e9
|
2012-11-07 10:44:42 -06:00 |
|
Matt Nash
|
e87cb88d60
|
Issue #1273 product browser can now change order for grid
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2
Former-commit-id: 76cdfc09bb [formerly 9c9db6643a] [formerly 284aecc6f9 [formerly 9c7477357508794a00267991b825d169df5ae71a]]
Former-commit-id: 284aecc6f9
Former-commit-id: 46f695b72d
|
2012-11-06 14:06:49 -06:00 |
|
Roger Ferrel
|
5c241a7e5d
|
Issue #1304 Clear text field when point removed.
Change-Id: Ia2f56010e7d620023cbf01656c7be30b0dd742cc
Former-commit-id: a6b093c2ce [formerly 921134848b] [formerly 1f71a3bed7 [formerly c927e2eb8a516cf555c0c83a86c51ad209f2a0ab]]
Former-commit-id: 1f71a3bed7
Former-commit-id: a996839d2c
|
2012-11-05 12:56:07 -06:00 |
|
Roger Ferrel
|
9fada57123
|
Issue #1304 Added Point change listners to ChooseByIdDialog and RangeRingDialog.
Change-Id: Id2933ae7ccfb6ed260da619a822c2b5b706f64d3
Former-commit-id: 120764c5ef [formerly 986766487f] [formerly 3045291a29 [formerly d296028a9a0add9a81836030ff7b65be8883956b]]
Former-commit-id: 3045291a29
Former-commit-id: 2b18983017
|
2012-11-05 11:22:28 -06:00 |
|
Dustin Johnson
|
e7a0f96a9a
|
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 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
|
2012-11-01 13:36:06 -05:00 |
|
Ben Steffensmeier
|
ec68d0445e
|
Issue #189 a few fixes to grid resources for FFG Mosaic
Former-commit-id: dc0e75eb29 [formerly 64d4a1add7] [formerly 4b121fd7b3 [formerly f8420e7052145c856b12310776e6acd7362dc9cb]]
Former-commit-id: 4b121fd7b3
Former-commit-id: bde106e70d
|
2012-10-31 11:39:32 -05:00 |
|
Roger Ferrel
|
b289472e49
|
Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog.
Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc
Former-commit-id: 2b80c2c2b5 [formerly d92be142ad] [formerly 3c64544822 [formerly 17f789e76f77467935002d3b466b764ddb0b81f4]]
Former-commit-id: 3c64544822
Former-commit-id: 1e0241e509
|
2012-10-30 17:09:52 -05:00 |
|
Lee Venable
|
7b0e8774db
|
Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development
Former-commit-id: 51c60c1876 [formerly 868fe53216] [formerly 2c86fdb2d0 [formerly 08784a33471cc96472370081f31d7d7edb2a61f7]]
Former-commit-id: 2c86fdb2d0
Former-commit-id: 881a8e726b
|
2012-10-30 16:46:30 -05:00 |
|
Lee Venable
|
f5008c2296
|
Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development
Former-commit-id: 08e6cd0a31 [formerly 276ce2ad08] [formerly e47d1beb09 [formerly 8d14e957dc2152a31c813a9278646904e2a3c777]]
Former-commit-id: e47d1beb09
Former-commit-id: cebd35bb47
|
2012-10-30 16:45:35 -05:00 |
|
Lee Venable
|
364fb3f463
|
Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development
Former-commit-id: eed01fd643 [formerly 33525e4dff] [formerly 0bc4ec2135 [formerly 3bb9ad3e1fb050dba420fc634b742a73b4443ba2]]
Former-commit-id: 0bc4ec2135
Former-commit-id: 2d3eeeaacf
|
2012-10-30 16:44:56 -05:00 |
|
Roger Ferrel
|
bc7e45e5e3
|
Issue #1298 Changes for non-blocking ContourDialog and removal of ButtonEntryDialog.
Change-Id: I6151274f455066c03db49618d6b5801248d48527
Former-commit-id: 84a338fd4c [formerly 0c544da917] [formerly 7c8f48fcb5 [formerly c67543535ff38b777f14df1f41d96dbdacddeb09]]
Former-commit-id: 7c8f48fcb5
Former-commit-id: c0b480bc7f
|
2012-10-30 15:19:08 -05:00 |
|
Roger Ferrel
|
769a831689
|
Issue #1298 Changes for non-blocking BrightnessDialog.
Change-Id: I84e0778c62c7cdffe33d89c5b2a3a4f205572483
Former-commit-id: 9dcaf583f6 [formerly bc1e462d07] [formerly 2fb06a145f [formerly 535d952595adfcd749ee132e45736120aa25cd3d]]
Former-commit-id: 2fb06a145f
Former-commit-id: 191e4e83db
|
2012-10-30 14:00:20 -05:00 |
|
Roger Ferrel
|
2cbd0000ad
|
Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking.
Change-Id: I034b1f02eb3b1ac623c8d2d4b9a953e53534dba0
Former-commit-id: 3b96d312cd [formerly 8952e1cef8] [formerly e37a097596 [formerly 6dc43f8d58b82a4b59a3945cc41ad8dcdda47a11]]
Former-commit-id: e37a097596
Former-commit-id: b93dcebdc0
|
2012-10-30 12:35:48 -05:00 |
|
Ben Steffensmeier
|
1d94435220
|
merge branch Unifeid_Grid into developement
Former-commit-id: 272e057bf1 [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: b6a1563bb2
Former-commit-id: 92fd247ccc
|
2012-10-30 12:24:54 -05:00 |
|
Roger Ferrel
|
baef52459d
|
Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog.
Change-Id: I5a4ad66d3aff1ab4b77b78ec8db233875aa61620
Former-commit-id: 6291083e5b [formerly 87d3ff985e] [formerly 5355b7f620 [formerly 13f856685e36155909e7c4f4f9ac36d3a5633e4a]]
Former-commit-id: 5355b7f620
Former-commit-id: 089e8af498
|
2012-10-30 10:34:40 -05:00 |
|
Lee Venable
|
1a475c55de
|
Merge "Issue #1298 Changes for non-blocking WeatherElementBrowserDialog." into development
Former-commit-id: 3c6facf14b [formerly a7eb12fd9e] [formerly 676856f62f [formerly d6040334d8c3ea717966b54dc6bcc333d67d5b1b]]
Former-commit-id: 676856f62f
Former-commit-id: b491922ddc
|
2012-10-30 10:26:53 -05:00 |
|
Roger Ferrel
|
61349397e4
|
Issue #1298 Changes for non-blocking WeatherElementBrowserDialog.
Change-Id: I3359b2b9f9bbf1e58735891163fa8fd798e4ac1e
Former-commit-id: 2f4ead5037 [formerly f65213c542] [formerly 4a13cfb8a6 [formerly f37d9edd9803c6a2bbf039662b3f2750b1cec8db]]
Former-commit-id: 4a13cfb8a6
Former-commit-id: 551cffe315
|
2012-10-30 09:00:10 -05:00 |
|
Roger Ferrel
|
8fba446977
|
Issue #1298 Changes for non-blocking TimeShiftDialog.
Change-Id: I60f60daee3b25fec2dabd09dd44c85bd3e57160c
Former-commit-id: a6f06c265b [formerly 1d67e245aa] [formerly 7af20b6130 [formerly 1deeb17d498a883af24fe983b7967918b3c3deb9]]
Former-commit-id: 7af20b6130
Former-commit-id: 406de0548d
|
2012-10-30 08:27:25 -05:00 |
|
Roger Ferrel
|
534b308771
|
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 4a2ae2f6db [formerly ac8b26304f847a41c7b9befcc0d16b76e9a8e16d]]
Former-commit-id: 4a2ae2f6db
Former-commit-id: 67d404ad87
|
2012-10-29 13:31:43 -05:00 |
|
Steve Harris
|
e211bfc043
|
Merge branch 'ss_builds' into development
Former-commit-id: 340ce53e22 [formerly fb46bb053d] [formerly afb534db67 [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]
Former-commit-id: afb534db67
Former-commit-id: 048c0c88cd
|
2012-10-29 12:17:12 -05:00 |
|
Steve Harris
|
d8b6157aab
|
12.11.1-12 baseline
Former-commit-id: 565756567f [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 314c03e7b6
|
2012-10-29 12:15:56 -05:00 |
|
Lee Venable
|
55186d5a74
|
Merge "Issue #1287 Changes for non-blocking TimeScalePeriodsDialog." into development
Former-commit-id: 01bd16bbd7 [formerly eb660ac54d] [formerly 4bc57aec7e [formerly edfda206905211559bfd5b384ccae129d11bb5cb]]
Former-commit-id: 4bc57aec7e
Former-commit-id: 79a5d07605
|
2012-10-29 08:40:34 -05:00 |
|
Roger Ferrel
|
d414206760
|
Issue #1287 Changes for non-blocking TimeScalePeriodsDialog.
Change-Id: I5bed1a9f3ee792099749b26071ed2816c84f6049
Former-commit-id: 74c8f86b27 [formerly ea2fdbc1b8] [formerly 99179463f5 [formerly aa32e71beadc5b9302abddedeb53003a66a57261]]
Former-commit-id: 99179463f5
Former-commit-id: 22ebd6b55a
|
2012-10-29 08:09:57 -05:00 |
|
Roger Ferrel
|
8adebd22d3
|
Issue #1287 Changes for non-blocking SiteActivationDlg.
Change-Id: Id059058fda486b57df5d461f3c9eb13981f7f744
Former-commit-id: b345d95b4d [formerly 8c5b00fa42] [formerly 2ab4a8508a [formerly ae1185cb5825915820314fdc48c897676ead8538]]
Former-commit-id: 2ab4a8508a
Former-commit-id: 8fca4cf256
|
2012-10-29 07:21:00 -05:00 |
|
Lee Venable
|
c79354b0a6
|
Merge "Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog." into development
Former-commit-id: d7c043dffa [formerly 6c3b12a9d3] [formerly ddbed06f64 [formerly e16cb0c6c05d7e2fc4ab6eac04217f60df5bcc4b]]
Former-commit-id: ddbed06f64
Former-commit-id: 7621f14d95
|
2012-10-26 15:28:37 -05:00 |
|
Lee Venable
|
2280eef896
|
Merge "Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog." into development
Former-commit-id: 656b6bf04e [formerly 84e66d2fab] [formerly 0967a6348b [formerly 53a9d4129eadd0156855a5c9248ce2848cb08d95]]
Former-commit-id: 0967a6348b
Former-commit-id: 1407f47d1c
|
2012-10-26 15:28:07 -05:00 |
|
Lee Venable
|
15ae8a5add
|
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 41c8c88a03 [formerly f67e7970061c9bc4dde3b4175dcb9b45d204ff34]]
Former-commit-id: 41c8c88a03
Former-commit-id: bd49530415
|
2012-10-26 15:25:52 -05:00 |
|
Roger Ferrel
|
fe48147739
|
Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog.
Change-Id: I7726f8934351cea98edbf7751f23f42248e5b17c
Former-commit-id: 9647a110c6 [formerly af887de89c] [formerly 37c7d61195 [formerly a8e412f5d0cd625b6c421b0609bc7149d7386f1a]]
Former-commit-id: 37c7d61195
Former-commit-id: f4b0b6cd56
|
2012-10-26 15:03:26 -05:00 |
|
Roger Ferrel
|
1b7481abc3
|
Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog.
Change-Id: Ia01b3de6959392afacfc47ac42e794e0b8e357f2
Former-commit-id: f304b930cd [formerly c3d2ac5976] [formerly e2b35d015f [formerly 15e80fd970393b74f6a320a794004f89bf3619a5]]
Former-commit-id: e2b35d015f
Former-commit-id: 7ce8344826
|
2012-10-26 14:44:29 -05:00 |
|
Roger Ferrel
|
ca97133b23
|
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 7a3149dbb3 [formerly 7d57a8ae96ff778892438fb41cd84ce1bb1a8dc7]]
Former-commit-id: 7a3149dbb3
Former-commit-id: cd7c3ec006
|
2012-10-26 14:27:00 -05:00 |
|
Brad Gonzales
|
781265a6a8
|
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 24fc32ee14 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]
Former-commit-id: 24fc32ee14
Former-commit-id: 5949c8b09c
|
2012-10-26 14:00:55 -05:00 |
|
Roger Ferrel
|
eace9f331e
|
Issue #1287 Changes for non-blocking WESaveDialog.
Change-Id: Ic2dbc76126b3b38c27cdd3fc07ca1317725d12fd
Former-commit-id: 6806384d21 [formerly 32154a3789] [formerly 51369fbd50 [formerly e02ff1c81c669ae0bcf5c068487a9c35bc542ff2]]
Former-commit-id: 51369fbd50
Former-commit-id: f4bd80afef
|
2012-10-26 09:01:46 -05:00 |
|
Roger Ferrel
|
ce461c532b
|
Issue #1287 Changes for non-blocking WERevertDialog.
Change-Id: I7112fadab6eaaac1c7145fd998e8dfca3f975f3b
Former-commit-id: a87a84fdbb [formerly 117bcc648e] [formerly 4d2c234072 [formerly 50b20b90ad974962334fb7dbf9c8fa3c369b01a1]]
Former-commit-id: 4d2c234072
Former-commit-id: 3a397258ff
|
2012-10-26 08:23:04 -05:00 |
|
Roger Ferrel
|
47f832734a
|
Issue #1287 Changes for non-blocking PublishDialog.
Change-Id: I551850f82ad40bfa9c49d10c6b8193ec365ccea2
Former-commit-id: 4c40059a5a [formerly 833b7bb850] [formerly 93472a82e5 [formerly a0b4c4eb635ce39cf1a25c78620d317e59d33061]]
Former-commit-id: 93472a82e5
Former-commit-id: c0497226a6
|
2012-10-26 07:07:18 -05:00 |
|
Ben Steffensmeier
|
fcc23a917e
|
Issue #189 changes from code review
Former-commit-id: 3c222ab437 [formerly 984d128d33] [formerly 7139c80557 [formerly 449762acbbe74173121e19f5c325104221c083a2]]
Former-commit-id: 7139c80557
Former-commit-id: b0bf62ce6f
|
2012-10-25 16:33:59 -05:00 |
|
Ben Steffensmeier
|
45cc834fc3
|
Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
Former-commit-id: 7734a983f5 [formerly b7d61e7543] [formerly 6f2c1ede9e [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]
Former-commit-id: 6f2c1ede9e
Former-commit-id: 54f414a7e0
|
2012-10-25 16:17:54 -05:00 |
|
Lee Venable
|
4ab0bd782b
|
Merge "Issue #1287 Changes for non-blocking RefSetAppearanceDialog." into development
Former-commit-id: 4caccdd1a5 [formerly de997956f3] [formerly 02ad711e0c [formerly 9f7230c0e0aafc6d7bd1f3608f020ed33a9f4a4d]]
Former-commit-id: 02ad711e0c
Former-commit-id: 877692bf63
|
2012-10-25 16:06:53 -05:00 |
|
Roger Ferrel
|
16d822f738
|
Issue #1287 Changes for non-blocking RefSetAppearanceDialog.
Change-Id: I0b3f5e8c57600f3d20a7662404b014adc874e6fc
Former-commit-id: 4d60aac952 [formerly 06b3d2f921] [formerly 2b08397e4b [formerly 7e64b7aa2a236d07c04b72e1eac2c660e0c87642]]
Former-commit-id: 2b08397e4b
Former-commit-id: d119a1c518
|
2012-10-25 15:23:45 -05:00 |
|
Roger Ferrel
|
fefd403fd1
|
Issue #1287 Changes for non-blocking ProductScriptsDialog.
Change-Id: Ia68cd67bf7dd10eac5e0aacc9dcf68ca96f8b2f8
Former-commit-id: 5a4c795bbc [formerly 17de26adfb] [formerly 73b4ca43c8 [formerly df3546eba27a1cbca6204351a7961e1aabc9c787]]
Former-commit-id: 73b4ca43c8
Former-commit-id: af40c442db
|
2012-10-25 14:13:41 -05:00 |
|
Lee Venable
|
56ed16dc7f
|
Merge "Issue #1287 Changes for non-blocking ProcessMonitorDialog." into development
Former-commit-id: 4c932a5ad8 [formerly c2e1e42e26] [formerly d7ae341df2 [formerly 711419494f6ec18c3398bdded18b71d0ac4d37ae]]
Former-commit-id: d7ae341df2
Former-commit-id: b5eceeda7f
|
2012-10-25 14:03:42 -05:00 |
|
Nate Jensen
|
bab292b06a
|
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 10cdbdbd61 [formerly 4187d6fd94a38291047860cc780fb1aa9f59d825]]
Former-commit-id: 10cdbdbd61
Former-commit-id: 3c1463c4d9
|
2012-10-25 13:39:11 -05:00 |
|
Lee Venable
|
3b039b4fe7
|
Merge "Issue #1287 Changes SampleSetDialog from review." into development
Former-commit-id: b02ae8d48c [formerly 66dd846674] [formerly 4aef416119 [formerly 7e72d19330025ef611f509c9140103c28cd89b5d]]
Former-commit-id: 4aef416119
Former-commit-id: d6c9359dc9
|
2012-10-25 13:31:50 -05:00 |
|
Lee Venable
|
aa7ef2a8b2
|
Merge "Issue #1287 Changes for non-blocking HiddenWeatherElementDialog." into development
Former-commit-id: 5ab897b8f0 [formerly e32da5af26] [formerly 90e135a991 [formerly 835cb07b70c7120003a8b45a5b628671e4cff956]]
Former-commit-id: 90e135a991
Former-commit-id: f9e4fba04d
|
2012-10-25 13:20:44 -05:00 |
|