awips2/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe
Fay.Liang eed6737801 ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
..
actions Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-09-19 10:28:57 -05:00
colortable
config Omaha #2975 optimize lookup of edit areas and gfe configs 2014-09-29 12:29:25 -05:00
constants
contours
core Merge tag 'OB_14.3.1-32m' into omaha_14.4.1 2014-11-10 08:42:01 -06:00
dialogs ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m. 2015-01-12 13:03:31 -05:00
edittool Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style 2014-08-14 15:43:17 -05:00
export Issue #2847: Add option to export only selected parms to GFE KML export dialog. 2014-04-03 11:30:59 -05:00
gridmanager Issue #3776 Cache SWT fill patterns used in history mode. 2014-10-29 15:20:18 -05:00
ifpimage
interpolation Merge branch 'master_14.1.2' into master_14.2.1 2014-04-09 16:00:54 -05:00
jobs
log
makehazard ASM #646 GFE: Event end time cannot be set beyond 96 hours on the MakeHazard GUI 2014-11-21 14:32:17 +00:00
menu Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective 2014-08-29 16:17:22 -05:00
perspective Issue #2594 added low memory warning job 2014-08-05 08:21:27 -05:00
preferences
procedures Omaha #3361 reduce number of extraneous localization requests at GFE 2014-07-09 09:24:31 -05:00
product
python
query
rsc Omaha #3557 Fixed NPE when parm is removed from display 2014-11-04 17:41:19 -06:00
sampler
smartscript
smarttool Omaha #3676 harden numpy array to java array conversions to work with 2014-10-15 09:02:07 -05:00
statusline
tasks Omaha #2841 Fix errors when formatters fail to queue due to pending limit. 2014-05-30 10:47:28 -05:00
temporaleditor Issue #3776 Cache SWT fill patterns used in history mode. 2014-10-29 15:20:18 -05:00
textformatter ASM #14946 - GFE: ZFP displaying time for office timezone for zones in different timezone 2014-12-16 15:34:35 -05:00
textproduct Omaha #3361 reduce number of extraneous localization requests at GFE 2014-07-09 09:24:31 -05:00
types
ui ASM #638 - Inconsistent Type for scale widget value accessed through the varDict. 2014-12-11 19:37:00 -05:00
visual
vtec Merge branch 'master_14.1.1' into master_14.2.1 2014-02-18 10:45:20 -06:00
ActivateSiteComponent.java Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication 2014-09-10 15:43:19 -05:00
Activator.java
BaseGfePyController.java Omaha #3676 harden numpy array to java array conversions to work with 2014-10-15 09:02:07 -05:00
GfeClient.java Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-09-19 10:28:57 -05:00
GFEException.java
GFEOperationFailedException.java
GFEPreference.java
GFEServerException.java
GridManagerView.java
IConfigurationChange.java
IConfigurationChangeListener.java
LocalizationConstants.java
PreferenceConstants.java
PreferenceInitializer.java
PythonPreferenceStore.java Issue #2729 Revert changes made to PythonPreferenceStore.java in favor changes to GfePyIncludeUtil.java made in #3500. 2014-09-24 09:17:43 -05:00
PythonUtil.java
QuickSetPropertyTester.java
ServiceBackupComponent.java Omaha #3612 Refactored AbstractCAVEComponent to extend CAVEApplication 2014-09-10 15:43:19 -05:00