Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue koppor/jabref#521 (Add feature: allow drag&drop from selected bib entries to other library tabs) #4

Draft
wants to merge 30 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ffe1663
Squashed 'buildres/csl/csl-styles/' changes from e740261c4c..3d3573c8db
Jul 1, 2022
303df42
Refresh example styles
Jul 1, 2022
d958f4d
Squashed 'buildres/csl/csl-locales/' changes from 969d9567ac..55459cd79f
Jul 1, 2022
4c70468
Merge commit 'd958f4df57b5a123562d27cf3ad9d444d7348d4a'
Jul 1, 2022
f69d5c7
fix merge conflict
Siedlerchr Jul 1, 2022
eb1d7a9
Merge pull request #8943 from JabRef/refresh-csl
Siedlerchr Jul 1, 2022
050cd3f
Fix theme switching exception (#8939)
HoussemNasri Jul 3, 2022
1301384
move "Warn about duplicates on import" preferences option (#8937)
christinait2022 Jul 3, 2022
b251ebc
Remember Sidepane width after restart (#8936)
HoussemNasri Jul 3, 2022
ba30547
Add notification when adding previous entries to new group configurat…
LIM0000 Jul 3, 2022
438ec5a
Bump mariadb-java-client from 2.7.5 to 2.7.6 (#8953)
dependabot[bot] Jul 4, 2022
e6d9109
Bump checkstyle from 10.1 to 10.3.1 (#8950)
dependabot[bot] Jul 4, 2022
60e9cf2
Bump checkstyle from 10.1 to 10.3.1 (#8950)
dependabot[bot] Jul 4, 2022
17f0120
Disable ResearchGateTest on CI (#8955)
koppor Jul 4, 2022
8bd1845
Improvement on check for missing commas when importing or opening a .…
LIM0000 Jul 9, 2022
1e3160e
Refactor context menu entry types changing (#8957)
Siedlerchr Jul 9, 2022
f9093f0
Cleanup index when opening a library (#8962)
btut Jul 9, 2022
3874aa3
Keep UTF-8 encoding header if present (#8964)
koppor Jul 9, 2022
14406e3
Bump jsoup from 1.15.1 to 1.15.2 (#8967)
dependabot[bot] Jul 11, 2022
cef980d
Bump classgraph from 4.8.147 to 4.8.149 (#8968)
dependabot[bot] Jul 11, 2022
76850e7
Fix charset detection with utf16 and others (#8947)
Siedlerchr Jul 11, 2022
354c7f8
revert jsoup version upgrade
Siedlerchr Jul 11, 2022
2a82b9a
Fix .bat errorlevel handling with pwsh.exe check (#8965)
Tobi0 Jul 11, 2022
7ec0b1a
New Crowdin updates (#8969)
Siedlerchr Jul 12, 2022
0cfbe33
New Crowdin updates (#8972)
Siedlerchr Jul 14, 2022
b255928
Add: drag'n'drop bib entries to other opened tabs
GNAQ Jul 15, 2022
e98f54e
Add: drag'n'drop bib entries to other opened tabs (fix import)
GNAQ Jul 15, 2022
5eab1c1
Add: drag'n'drop bib entries to other opened tabs (bug fixes)
GNAQ Jul 15, 2022
e8caadd
Add: drag'n'drop bib entries to other opened tabs (update changelog)
GNAQ Jul 15, 2022
39b1b0a
Merge branch 'JabRef:main' into feature-issue-521
GNAQ Jul 15, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We added an extra option in the 'Find Unlinked Files' dialog view to ignore unnecessary files like Thumbs.db, DS_Store, etc. [koppor#373](https://github.com/koppor/jabref/issues/373)
- JabRef now writes log files. Linux: `$home/.cache/jabref/logs/version`, Windows: `%APPDATA%\..\Local\harawata\jabref\version\logs`, Mac: `Users/.../Library/Logs/jabref/version`
- We added an importer for Citavi backup files, support ".ctv5bak" and ".ctv6bak" file formats. [#8322](https://github.com/JabRef/jabref/issues/8322)
- We added a feature about allowing drag selected entries and drop them to other opened inactive library tabs.

### Changed

Expand All @@ -34,10 +35,14 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We improved group expansion arrow that prevent it from activating group when expanding or collapsing. [#7982](https://github.com/JabRef/jabref/issues/7982), [#3176](https://github.com/JabRef/jabref/issues/3176)
- When configured SSL certificates changed, JabRef warns the user to restart to apply the configuration.
- We improved the appearances and logic of the "Manage field names & content" dialog, and renamed it to "Automatic field editor". [#6536](https://github.com/JabRef/jabref/issues/6536)
- We fixed an issue that caused JabRef to sometimes open multiple instances when "Remote Operation" is enabled. [#8653](https://github.com/JabRef/jabref/issues/8653)
- We improved the message explaining the options when modifying an automatic keyword group [#8911](https://github.com/JabRef/jabref/issues/8911)
- We moved the preferences option "Warn about duplicates on import" option from the tab "File" to the tab "Import and Export". [koppor#570](https://github.com/koppor/jabref/issues/570)
- When JabRef encounters `% Encoding: UTF-8` header, it is kept during writing (and not removed). [#8964](https://github.com/JabRef/jabref/pull/8964)
- We replace characters which cannot be decoded using the specified encoding by a (probably another) valid character. This happens if JabRef detects the wrong charset (e.g., UTF-8 instead of Windows 1252). One can use the [Integrity Check](https://docs.jabref.org/finding-sorting-and-cleaning-entries/checkintegrity) to find those characters.

### Fixed

- We fixed an issue that caused JabRef to sometimes open multiple instances when "Remote Operation" is enabled. [#8653](https://github.com/JabRef/jabref/issues/8653)
- We fixed an issue where linked files with the filetype "application/pdf" in an entry were not shown with the correct PDF-Icon in the main table [8930](https://github.com/JabRef/jabref/issues/8930)
- We fixed an issue where "open folder" for linked files did not open the folder and did not select the file unter certain Linux desktop environments [#8679](https://github.com/JabRef/jabref/issues/8679), [#8849](https://github.com/JabRef/jabref/issues/8849)
- We fixed an issue where the content of a big shared database library is not shown [#8788](https://github.com/JabRef/jabref/issues/8788)
Expand All @@ -50,6 +55,10 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We fixed an issue where the exception that there are invalid characters in filename. [#8786](https://github.com/JabRef/jabref/issues/8786)
- When the proxy configuration removed the proxy user/password, this change is applied immediately.
- We fixed an issue where removing several groups deletes only one of them. [#8390](https://github.com/JabRef/jabref/issues/8390)
- We fixed an issue where the Sidepane (groups, web search and open office) width is not remembered after restarting JabRef. [#8907](https://github.com/JabRef/jabref/issues/8907)
- We fixed a bug where switching between themes will cause an error/exception. [#8939](https://github.com/JabRef/jabref/pull/8939)
- We fixed a bug where files that were deleted in the source bibtex file were kept in the index. [#8962](https://github.com/JabRef/jabref/pull/8962)
- We fixed "Error while sending to JabRef" when the browser extension interacts with JabRef. [JabRef-Browser-Extension#479](https://github.com/JabRef/JabRef-Browser-Extension/issues/479)

### Removed

Expand Down
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ dependencyLocking {
}

javafx {
version = "18"
version = "18.0.1"
modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web', 'javafx.swing' ]
}

Expand All @@ -127,7 +127,6 @@ dependencies {
implementation 'com.h2database:h2-mvstore:2.1.214'

implementation group: 'org.apache.tika', name: 'tika-core', version: '2.4.1'
implementation 'com.ibm.icu:icu4j-charset:71.1'

// required for reading write-protected PDFs - see https://github.com/JabRef/jabref/pull/942#issuecomment-209252635
implementation 'org.bouncycastle:bcprov-jdk18on:1.71'
Expand All @@ -151,7 +150,7 @@ dependencies {
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.3'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.13.3'

implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.5'
implementation group: 'org.mariadb.jdbc', name: 'mariadb-java-client', version: '2.7.6'

implementation 'org.postgresql:postgresql:42.4.0'

Expand Down Expand Up @@ -208,7 +207,7 @@ dependencies {

implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1'

testImplementation 'io.github.classgraph:classgraph:4.8.147'
testImplementation 'io.github.classgraph:classgraph:4.8.149'
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
testImplementation 'org.junit.platform:junit-platform-launcher:1.8.2'

Expand All @@ -221,7 +220,7 @@ dependencies {
testImplementation "org.testfx:testfx-junit5:4.0.16-alpha"
testImplementation "org.hamcrest:hamcrest-library:2.2"

checkstyle 'com.puppycrawl.tools:checkstyle:10.1'
checkstyle 'com.puppycrawl.tools:checkstyle:10.3.1'
// xjc needs the runtime as well for the ant task, otherwise it fails
xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
Expand Down
8 changes: 4 additions & 4 deletions buildres/csl/csl-locales/.github/workflows/merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
DISTRIBUTION_UPDATER_TOKEN: "${{ secrets.DISTRIBUTION_UPDATER_TOKEN }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: github.event_name == 'push'
- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: github.event_name == 'workflow_dispatch'
with:
fetch-depth: 0
Expand All @@ -30,7 +30,7 @@ jobs:
id: release
run: echo ::set-output name=branch::v1.0.2
- name: Checkout release branch
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ steps.release.outputs.branch }}
path: './release'
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
ruby-version: 3.0.2
- name: but use cache to speed that up
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand Down
8 changes: 4 additions & 4 deletions buildres/csl/csl-locales/.github/workflows/sheldon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:
# labels to a PR
# https://securitylab.github.com/research/github-actions-preventing-pwn-requests
- name: Checkout repo for OWNER TEST
uses: actions/checkout@v2
uses: actions/checkout@v3
if: contains(github.event.pull_request.labels.*.name, 'safe to test')
with:
ref: ${{ github.event.pull_request.head.ref }}

# otherwise, checkout the current master, and the pr to the subdirectory 'pull-request'
- name: Checkout base repo for pull-request test
uses: actions/checkout@v2
uses: actions/checkout@v3
if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
- name: Checkout pull-request
uses: actions/checkout@v2
uses: actions/checkout@v3
if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
with:
ruby-version: 3.0.2
- name: but use cache to speed that up
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion buildres/csl/csl-locales/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ GEM
csl-styles (2.0.0)
csl (~> 2.0)
diff-lcs (1.5.0)
diffy (3.4.0)
diffy (3.4.2)
dotenv (2.7.6)
erubis (2.7.0)
faraday (1.8.0)
Expand Down
6 changes: 6 additions & 0 deletions buildres/csl/csl-styles/.github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
8 changes: 4 additions & 4 deletions buildres/csl/csl-styles/.github/workflows/merge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
DISTRIBUTION_UPDATER_TOKEN: "${{ secrets.DISTRIBUTION_UPDATER_TOKEN }}"
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: github.event_name == 'push'
- uses: actions/checkout@v2
- uses: actions/checkout@v3
if: github.event_name == 'workflow_dispatch'
with:
fetch-depth: 0
Expand All @@ -30,7 +30,7 @@ jobs:
id: release
run: echo ::set-output name=branch::v1.0.2
- name: Checkout release branch
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ steps.release.outputs.branch }}
path: './release'
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
ruby-version: 3.0.2
- name: but use cache to speed that up
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && (steps.update.outputs.updated == 'true' || steps.update.outputs.deleted == 'true'))
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand Down
8 changes: 4 additions & 4 deletions buildres/csl/csl-styles/.github/workflows/sheldon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@ jobs:
# labels to a PR
# https://securitylab.github.com/research/github-actions-preventing-pwn-requests
- name: Checkout repo for OWNER TEST
uses: actions/checkout@v2
uses: actions/checkout@v3
if: contains(github.event.pull_request.labels.*.name, 'safe to test')
with:
ref: ${{ github.event.pull_request.head.ref }}

# otherwise, checkout the current master, and the pr to the subdirectory 'pull-request'
- name: Checkout base repo for pull-request test
uses: actions/checkout@v2
uses: actions/checkout@v3
if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
- name: Checkout pull-request
uses: actions/checkout@v2
uses: actions/checkout@v3
if: "! contains(github.event.pull_request.labels.*.name, 'safe to test')"
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
with:
ruby-version: 3.0.2
- name: but use cache to speed that up
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
Expand Down
2 changes: 1 addition & 1 deletion buildres/csl/csl-styles/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ GEM
csl-styles (2.0.0)
csl (~> 2.0)
diff-lcs (1.5.0)
diffy (3.4.0)
diffy (3.4.2)
dotenv (2.7.6)
erubis (2.7.0)
faraday (1.8.0)
Expand Down
10 changes: 5 additions & 5 deletions buildres/csl/csl-styles/advanced-materials.csl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<id>http://www.zotero.org/styles/advanced-materials</id>
<link href="http://www.zotero.org/styles/advanced-materials" rel="self"/>
<link href="http://www.zotero.org/styles/small" rel="template"/>
<link href="http://onlinelibrary.wiley.com/journal/10.1002/%28ISSN%291521-4095/homepage/2089_authorresources.html" rel="documentation"/>
<link href="https://onlinelibrary.wiley.com/page/journal/15214095/homepage/author-guidelines" rel="documentation"/>
<author>
<name>Jimmy Lawrence</name>
<email>jimmymisc@gmail.com</email>
Expand All @@ -16,13 +16,13 @@
<issn>0935-9648</issn>
<eissn>1521-4095</eissn>
<summary>A style for Wiley's Advanced Materials</summary>
<updated>2012-09-27T22:06:38+00:00</updated>
<updated>2022-06-22T14:43:19+00:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<macro name="author">
<names variable="author">
<name initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
<label form="short" prefix=", " text-case="capitalize-first" suffix=" "/>
<label form="short" text-case="capitalize-first" prefix=", "/>
<substitute>
<names variable="editor"/>
<names variable="translator"/>
Expand All @@ -32,7 +32,7 @@
<macro name="editor">
<names variable="editor">
<label form="short" text-case="capitalize-first" suffix=".: " strip-periods="true"/>
<name initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
<name delimiter-precedes-last="always" initialize-with=". "/>
</names>
</macro>
<macro name="year-date">
Expand Down Expand Up @@ -124,7 +124,7 @@
<text macro="year-date"/>
</group>
</else-if>
<else-if type="webpage">
<else-if type="webpage post post-weblog" match="any">
<group delimiter=", ">
<text variable="title" quotes="true"/>
<text macro="access"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<category citation-format="author-date"/>
<category field="biology"/>
<category field="botany"/>
<updated>2021-07-27T13:34:10+00:00</updated>
<updated>2022-06-14T08:25:19+00:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
<macro name="edition">
Expand All @@ -32,11 +32,13 @@
<macro name="container">
<choose>
<if type="chapter paper-conference" match="any">
<text term="in" text-case="capitalize-first" font-style="italic" prefix=". " suffix=" "/>
<names variable="editor translator" delimiter=", " suffix=". ">
<name initialize-with="." delimiter=", " delimiter-precedes-last="never" and="symbol"/>
<label form="short" prefix=" (" suffix=")"/>
</names>
<group delimiter=": ">
<text term="in" text-case="capitalize-first" font-style="normal" prefix=". " suffix=" "/>
<names variable="editor translator" delimiter=", " suffix=". ">
<name initialize-with="." delimiter=", " delimiter-precedes-last="never" and="symbol"/>
<label form="short" prefix=" (" suffix=")"/>
</names>
</group>
<group delimiter=", ">
<text variable="container-title" text-case="title"/>
<text variable="collection-title" text-case="title"/>
Expand All @@ -49,7 +51,7 @@
</group>
</else-if>
<else>
<group prefix=". " delimiter=", ">
<group delimiter=", " prefix=". ">
<text variable="container-title" form="short"/>
<text variable="collection-title"/>
</group>
Expand Down Expand Up @@ -86,14 +88,7 @@
</names>
</macro>
<macro name="access">
<choose>
<if type="webpage">
<group>
<text value="URL" suffix=" "/>
<text variable="URL"/>
</group>
</if>
</choose>
<text variable="URL" prefix="&lt;" suffix="&gt;"/>
</macro>
<macro name="title">
<choose>
Expand All @@ -106,10 +101,6 @@
</group>
</group>
</if>
<else-if type="webpage">
<text variable="title"/>
<text value="WWW Document" prefix=" [" suffix="]"/>
</else-if>
<else>
<text variable="title"/>
</else>
Expand Down Expand Up @@ -173,13 +164,13 @@
</if>
<else-if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
<group delimiter=", " prefix=". ">
<text macro="edition"/>
<text macro="event"/>
<text macro="publisher"/>
<group>
<text variable="genre"/>
<text variable="number" prefix=" No. "/>
</group>
<text macro="edition"/>
<text macro="event"/>
<text macro="publisher"/>
</group>
</else-if>
<else-if type="chapter paper-conference" match="any">
Expand All @@ -188,15 +179,21 @@
<text macro="publisher"/>
</group>
</else-if>
<else-if type="webpage post post-weblog" match="any">
<group delimiter=". " prefix=". ">
<date form="text" date-parts="year-month-day" variable="issued"/>
<text macro="access"/>
</group>
</else-if>
</choose>
</macro>
<citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year">
<sort>
<key macro="issued"/>
<key macro="author"/>
<key macro="issued"/>
</sort>
<layout prefix="(" suffix=")" delimiter=", ">
<group delimiter=" ">
<layout delimiter="; " prefix="(" suffix=")">
<group delimiter=", ">
<text macro="author-short"/>
<text macro="issued"/>
</group>
Expand All @@ -217,7 +214,6 @@
</group>
<text macro="locators"/>
</group>
<text macro="access" prefix=". "/>
</layout>
</bibliography>
</style>
Loading