jalview

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
JAL-3247 sign the AppleScript uninstaller

JAL-3141 deleted TODO comment in Messages_es

    • -1
    • +0
    /resources/lang/Messages_es.properties
Merge branch 'develop' into task/JAL-3141_JAL-3247_merge

updating merge

    • -1
    • +1
    /resources/lang/Messages_es.properties
JAL-3248 saving

JAL-3141 Added HashMap types for Java 1.8 compatibility

    • -1
    • +1
    /src/jalview/io/BackupFilesPresetEntry.java
Merge branch 'task/JAL-3141_Customise_checkbox' into task/JAL-3141_JAL-3247_merge

JAL-3141 Object array cast missing

Merge branch 'task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge' into task/JAL-3141_JAL-3247_merge

merge attempt

Merge branch 'develop' into task/JAL-3247_JAL-3246_JAL-3254_JAL-3236_merge

Merging in develop

JAL-3247 Added AppleScript based App to run old Jalview uninstaller if present

    • binary
    /utils/install4j/DS_Store_1
    • binary
    /utils/install4j/DS_Store_2
    • binary
    /utils/install4j/Uninstall Old Jalview.scpt
    • -0
    • +7
    /utils/install4j/uninstall_app_dmg_file_inclusions.sh
    • binary
    /utils/install4j/uninstall_old_jalview.icns
    • -0
    • +13
    /utils/install4j/uninstall_old_jalview_files.xml
JAL-3210 updated Jmol library in j11lib, j8lib

    • binary
    /j11lib/Jmol-14.29.17.jar
    • binary
    /j11lib/Jmol-14.6.4_2016.10.26-no_netscape.jar
    • binary
    /j8lib/Jmol-14.29.17.jar
    • binary
    /lib/Jmol-14.6.4_2016.10.26-no_netscape.jar
JAL-3141 Generified the JvUtils.buildComboWithTooltips to an Object and adjusted other code in FeatureTypeSettings. Added one more tooltip.

    • -0
    • +1
    /resources/lang/Messages_es.properties
    • -12
    • +23
    /src/jalview/gui/FeatureTypeSettings.java
    • -10
    • +33
    /src/jalview/jbgui/GPreferences.java
JAL-3141 test file in test folder not examples

    • -0
    • +2
    /test/jalview/io/backupfilestest.fa
JAL-3141 One more error log fix

    • -1
    • +1
    /src/jalview/io/BackupFilesPresetEntry.java
JAL-3141 Added tooltips on Schemes dropdown and Customise checkbox

    • -0
    • +7
    /resources/lang/Messages_es.properties
    • -0
    • +7
    /src/jalview/io/BackupFilesPresetEntry.java
    • -0
    • +12
    /src/jalview/jbgui/GPreferences.java
JAL-3141 Fixes recommended from gmc's test

    • -0
    • +1
    /resources/lang/Messages_es.properties
    • -12
    • +2
    /src/jalview/io/IntKeyStringValueEntry.java
    • -23
    • +8
    /src/jalview/jbgui/GPreferences.java
Merge branch 'develop' into features/JAL-3010ontologyFeatureSettings

    • -0
    • +2
    /resources/lang/Messages_es.properties
    • -6
    • +5
    /src/jalview/gui/FeatureTypeSettings.java
JAL-3010 commit to enable merge

    • -0
    • +2
    /.settings/org.eclipse.jdt.groovy.core.prefs
JAL-3010 commit to allow merge

JAL-1988 Spanish typo corrección

    • -1
    • +1
    /resources/lang/Messages_es.properties
JAL-3141 Fixed vertical size of the example filenames box\! Yay\!

    • -16
    • +17
    /src/jalview/jbgui/GPreferences.java
JAL-3210 delete old package post merge

Merge branch 'develop' into trialMerge

Conflicts:

.classpath

.project

.settings/org.eclipse.jdt.core.prefs

.settings/org.eclipse.jdt.groovy.core.prefs

.settings/org.eclipse.jdt.ui.prefs

build.xml

src/MCview/AppletPDBCanvas.java

src/MCview/Atom.java

src/MCview/PDBCanvas.java

src/jalview/appletgui/EmbmenuFrame.java

src/jalview/appletgui/OverviewPanel.java

src/jalview/appletgui/SeqPanel.java

src/jalview/bin/Jalview.java

src/jalview/ext/paradise/Annotate3D.java

src/jalview/gui/AlignFrame.java

src/jalview/gui/Desktop.java

src/jalview/gui/FeatureRenderer.java

src/jalview/gui/FeatureTypeSettings.java

src/jalview/io/FileLoader.java

src/jalview/jbgui/GDesktop.java

src/jalview/util/ImageMaker.java

src/jalview/util/Platform.java

    • -124
    • +1
    /.settings/org.eclipse.jdt.core.prefs
    • -1
    • +4
    /resources/lang/Messages_es.properties
    • -0
    • +6
    /src/MCview/AppletPDBCanvas.java
    • -0
    • +6
    /src/MCview/PDBCanvas.java
    • -2
    • +2
    /src/jalview/analysis/Conservation.java
    • -1
    • +9
    /src/jalview/appletgui/AlignFrame.java
    • -2
    • +2
    /src/jalview/appletgui/AlignViewport.java
  1. … 35 more files in changeset.
JAL-3141 Fixed tests

    • -24
    • +24
    /test/jalview/io/BackupFilesTest.java
JAL-3141 Reworked a lot of BackupFiles to allow the Customise Checkbox

    • -1
    • +2
    /resources/lang/Messages_es.properties
    • -15
    • +19
    /src/jalview/gui/Preferences.java
    • -5
    • +4
    /src/jalview/io/BackupFilenameParts.java
    • -32
    • +11
    /src/jalview/io/BackupFiles.java
    • -0
    • +166
    /src/jalview/io/BackupFilesPresetEntry.java
    • -0
    • +31
    /src/jalview/io/IntKeyStringValueEntry.java
    • -174
    • +182
    /src/jalview/jbgui/GPreferences.java
    • -4
    • +13
    /test/jalview/io/BackupFilesTest.java
Added to index to allow merge

    • -0
    • +2
    /.settings/org.eclipse.jdt.groovy.core.prefs
Updated to match develop to allow merge

Merge branch 'Jalview-JS/JAL-3253-applet' of https://source.jalview.org/git/jalview.git into Jalview-JS/JAL-3253-applet

JAL-3274 import build properties and authors resources from JalviewJS site or classes directory, or jalview.jar as appropriate.

JAL-3274 copy classes/.build_properties to site/swingjs/j2s/