Roger Ferrel
35261a7964
Issue #1353 Changes for non-blocking DamDisplayControlDlg.
...
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475
Former-commit-id: 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a
2012-12-10 11:30:06 -06:00
Roger Ferrel
921566317a
Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
...
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481
Former-commit-id: 62cdaba1d9e59c77efe6253105582894cd8596a0
2012-12-07 14:43:53 -06:00
Steve Harris
448dd1c35f
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 7a44f29952ec89991e578c67357e1ef3f3c51d59
2012-11-13 17:28:50 -06:00
Steve Harris
a8560580f8
12.12.1-2 baseline
...
Former-commit-id: 90019fdb91dad949f125e46de9300ccd44f6e315
2012-11-13 17:14:24 -06:00
Ben Steffensmeier
69fc030bb4
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: 911c845199714c07e93f9847ab00fcd6d28a4223
2012-11-13 16:00:19 -06:00
Steve Harris
e4bd20a515
12.12.1-1 baseline
...
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
2012-11-07 12:41:20 -06:00
Ben Steffensmeier
6a9ff88b33
merge Unified_Grid with ss_builds to 12.11.1-7
...
Former-commit-id: ab80625b5c573d8ab1350b4c251414ea036ef016
2012-10-25 12:22:11 -05:00
Steve Harris
d3497e47eb
12.11.1-4 baseline
...
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
2012-10-16 13:27:07 -05:00
Steve Harris
2d0c424713
12.11.1-3 baseline
...
Former-commit-id: 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86
2012-10-15 16:30:31 -05:00
Ben Steffensmeier
8b7256b1ae
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: f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90
2012-10-12 12:45:50 -05:00
Steve Harris
c12ee14e66
12.11.1-2 baseline
...
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: da126f587a1e3761dbe16ee2a41aee0caba85bfc
2012-10-08 13:26:20 -05:00
Ben Steffensmeier
8d150d404c
Issue #189 convert hydro and hydrocommon to grid.
...
Former-commit-id: a84fcbd045c24c16b30df4328aaf3bbbb30efd17
2012-10-01 14:05:40 -05:00
Steven Harris
618aa3f316
12.11.1-1 baseline
...
Former-commit-id: 765055b5332ddace3cec2d07e279652de869cfe4
2012-09-27 15:57:45 -05:00
Ben Steffensmeier
9632663c0a
Issue #189 convert viz/d2d displays from grib to grid.
...
Former-commit-id: 003825d9634299773ad96843cc82d56ded8a1391
2012-09-24 14:05:22 -05:00
Steve Harris
a96d35a1fa
12.10.1-5 baseline
...
Former-commit-id: 28dc700c3ef97a134c8871c2c52086fe7db43035
2012-09-17 15:42:31 -05:00
Steve Harris
fd19ca5624
12.10.1-4 baseline
...
Former-commit-id: 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed
2012-09-13 12:08:11 -05:00
Steve Harris
195158c004
12.10.1-1 baseline
...
Former-commit-id: 7d17407c5b0a4a3f9b4b083891a5a5975c645810
2012-09-04 12:07:27 -05:00
Steve Harris
61f269f54c
12.9.1-5 baseline
...
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Steve Harris
dcda3a2290
12.9.1-4 baseline
...
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
31ae7ea218
12.9.1-1 baseline
...
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
2012-08-15 13:59:00 -05:00
Steve Harris
fd2abfb6f1
12.8.1-5 baseline
...
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
2012-08-01 10:45:37 -05:00
Steve Harris
16bf591a33
12.7.1-8 baseline
...
Former-commit-id: 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1
2012-07-19 16:20:40 -05:00
Steve Harris
2c0ff851ca
12.6.1-9 baseline
...
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
2012-07-10 07:53:49 -05:00
Steve Harris
b13cbb7e00
12.5.1-15 baseline
...
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Steve Harris
67a5a68300
12.4.1-4 baseline
...
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Steve Harris
4068f5295f
12.3.1-10 baseline
...
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
2012-03-30 08:38:33 -05:00
Steve Harris
dcadf7baa4
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: 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637
2012-02-23 12:38:55 -06:00
Steve Harris
c8aae98741
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Steve Harris
6a064cb78b
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: ad74b15c5cab1f5275521f18ee67d30f199a8f95
2012-02-20 12:54:25 -06:00
Steve Harris
93f6535bd8
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: 0ccca40d35e50072218a1da1db474075f8ad0393
2012-02-17 10:55:02 -06:00
Matt Nash
542049e455
Issue #26 tear off menu changes to fix issues
...
Former-commit-id: 30c43cbcd4500c5754261b420f5c9b031bd63014
2012-02-03 13:13:15 -06:00
Matt Nash
66be3bec40
Moving 12.1.1 into ss_sync
...
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
9f19e3f712
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00
