Skip to content

Commit d49632a

Browse files
SiedlerchrSiedlerchr
committed
Merge remote-tracking branch 'upstream/main' into fix-for-9214
* upstream/main: [WIP] Add GitHub action: Greetings.yml - Automates advice to JabRefs first time code contributors (JabRef#9272) Minor code improvements in library properties dialog (JabRef#9265) Adjust and make tests for BibTex/Biblatex/CSL mapping more accurate by adding Apa 7th edition (JabRef#9255) Removed swing from default file dir detection (JabRef#9222) Make autosave tick in shared database opening dialog active (JabRef#9258) Bump controlsfx from 11.1.1 to 11.1.2 (JabRef#9261) Bump actions/configure-pages from 1 to 2 (JabRef#9262) Bump hmarr/auto-approve-action from 2.4.0 to 3.0.0 (JabRef#9259) Bump gittools/actions from 0.9.13 to 0.9.14 (JabRef#9260) Fix for resizing cleanup entries dialog (JabRef#9240) Refresh example styles Squashed 'buildres/csl/csl-locales/' changes from cb98d36691..e243665390 Squashed 'buildres/csl/csl-styles/' changes from 7bde3e4..4eee79a Fix casing Update contributing.md Remove obsolete Jekyll howto Updates Just-the-Docs from 0.3.3 to 0.4.0.rc3 (JabRef#9249) Place subgroups w.r.t. alphabetical ordering (JabRef#9228) DOAB Fetcher now fetches ISBN and imprint fields where possible (JabRef#9229)
2 parents 79ce315 + b34ce0d commit d49632a

File tree

120 files changed

+3114
-1067
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+3114
-1067
lines changed

‎.github/workflows/automerge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
env:
1717
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
1818
- name: Auto approve
19-
uses: hmarr/auto-approve-action@v2.4.0
19+
uses: hmarr/auto-approve-action@v3.0.0
2020
if: steps.waitforstatuschecks.outputs.status == 'success'
2121
with:
2222
github-token: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/deployment.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ jobs:
5656
with:
5757
fetch-depth: 0
5858
- name: Install GitVersion
59-
uses: gittools/actions/gitversion/[email protected].13
59+
uses: gittools/actions/gitversion/[email protected].14
6060
with:
6161
versionSpec: "5.x"
6262
- name: Run GitVersion
6363
id: gitversion
64-
uses: gittools/actions/gitversion/[email protected].13
64+
uses: gittools/actions/gitversion/[email protected].14
6565
- name: Set up JDK
6666
uses: actions/setup-java@v3
6767
with:
@@ -157,12 +157,12 @@ jobs:
157157
- name: Fetch all history for all tags and branches
158158
run: git fetch --prune --unshallow
159159
- name: Install GitVersion
160-
uses: gittools/actions/gitversion/[email protected].13
160+
uses: gittools/actions/gitversion/[email protected].14
161161
with:
162162
versionSpec: '5.x'
163163
- name: Run GitVersion
164164
id: gitversion
165-
uses: gittools/actions/gitversion/[email protected].13
165+
uses: gittools/actions/gitversion/[email protected].14
166166
- name: Get linux binaries
167167
uses: actions/download-artifact@master
168168
with:

‎.github/workflows/greetings.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Greetings
2+
3+
on:
4+
issues:
5+
types: assigned
6+
7+
jobs:
8+
greeting:
9+
runs-on: ubuntu-latest
10+
permissions:
11+
issues: write
12+
pull-requests: write
13+
steps:
14+
- uses: actions/first-interaction@v1
15+
with:
16+
repo-token: ${{ secrets.GITHUB_TOKEN }}
17+
issue-message: "As a general advice for newcomers: check out https://github.com/JabRef/jabref/blob/main/CONTRIBUTING.md for a start. Also, https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace is worth having a look at. Feel free to ask if you have any questions here on GitHub or also at JabRef's [Gitter](https://gitter.im/JabRef/jabref) chat.
18+
19+
Try to open a (draft) pull request early on, so that people can see you are working on the issue and so that they can see the direction the pull request is heading towards. This way, you will likely receive valuable feedback."

‎.github/workflows/pages.yml

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Deploy Jekyll site to Pages
2+
3+
on:
4+
push:
5+
paths:
6+
- 'docs/**'
7+
- '.github/workflows/pages.yml'
8+
workflow_dispatch:
9+
10+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
11+
permissions:
12+
contents: read
13+
pages: write
14+
id-token: write
15+
16+
# Allow one concurrent deployment
17+
concurrency:
18+
group: "pages"
19+
cancel-in-progress: true
20+
21+
jobs:
22+
build:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- name: Checkout
26+
uses: actions/checkout@v3
27+
- name: Setup Ruby
28+
uses: ruby/setup-ruby@v1
29+
with:
30+
ruby-version: '3.0' # Not needed with a .ruby-version file
31+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
32+
cache-version: 0 # Increment this number if you need to re-download cached gems
33+
- name: Setup Pages
34+
id: pages
35+
uses: actions/configure-pages@v2
36+
- name: Build with Jekyll
37+
uses: actions/jekyll-build-pages@v1
38+
with:
39+
source: docs/
40+
destination: ./_site
41+
- name: Upload artifact
42+
uses: actions/upload-pages-artifact@v1
43+
44+
deploy:
45+
if: github.ref == 'refs/heads/main'
46+
environment:
47+
name: github-pages
48+
url: ${{ steps.deployment.outputs.page_url }}
49+
runs-on: ubuntu-latest
50+
needs: build
51+
steps:
52+
- name: Deploy to GitHub Pages
53+
id: deployment
54+
uses: actions/deploy-pages@v1

‎.github/workflows/refresh-csl-subtrees.yml

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
run: |
3333
git subtree pull --prefix buildres/csl/csl-styles csl-styles master --squash || true
3434
cp buildres/csl/csl-styles/acm-siggraph.csl src/main/resources/csl-styles/
35+
cp buildres/csl/csl-styles/apa.csl src/main/resources/csl-styles/
3536
cp buildres/csl/csl-styles/ieee.csl src/main/resources/csl-styles/
3637
cp buildres/csl/csl-styles/turabian-author-date.csl src/main/resources/csl-styles/
3738
git add .

‎CHANGELOG.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,19 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
3636
- We call backup files `.bak` and temporary writing files now `.sav`.
3737
- JabRef keeps 10 older versions of a `.bib` file in the [user data dir](https://github.com/harawata/appdirs#supported-directories) (instead of a single `.sav` (now: `.bak`) file in the directory of the `.bib` file)
3838
- We changed the button label from "Return to JabRef" to "Return to library" to better indicate the purpose of the action.
39-
- We removed "last-search-date" from the SLR feature, because the last-search-date can be deducted from the git logs. [#9116](https://github.com/JabRef/jabref/pull/9116)
4039
- A user can now add arbitrary data into `study.yml`. JabRef just ignores this data. [#9124](https://github.com/JabRef/jabref/pull/9124)
4140
- We reworked the External Changes Resolver dialog. [#9021](https://github.com/JabRef/jabref/pull/9021)
4241
- The fallback directory of the file folder now is the general file directory. In case there was a directory configured for a library and this directory was not found, JabRef placed the PDF next to the .bib file and not into the general file directory.
43-
- The global default directory for storing PDFs is now the subdirectory "JabRef" in the user's home.
42+
- The global default directory for storing PDFs is now the documents folder in the user's home.
4443
- We reworked the Define study parameters dialog. [#9123](https://github.com/JabRef/jabref/pull/9123)
4544
- We simplified the actions to fast-resolve duplicates to 'Keep Left', 'Keep Right', 'Keep Both' and 'Keep Merged'. [#9056](https://github.com/JabRef/jabref/issues/9056)
4645
- We fixed an issue where a message about changed metadata would occur on saving although nothing changed. [#9159](https://github.com/JabRef/jabref/issues/9159)
46+
- When adding or editing a subgroup it is placed w.r.t. to alphabetical ordering rather than at the end. [koppor#577](https://github.com/koppor/jabref/issues/577)
47+
- We modified the Directory of Open Access Books (DOAB) fetcher so that it will now also fetch the ISBN when possible. [#8708](https://github.com/JabRef/jabref/issues/8708)
4748

4849
### Fixed
4950

51+
- We fixed the Cleanup entries dialog is partially visible [#9223](https://github.com/JabRef/jabref/issues/9223)
5052
- We fixed the display of the "Customize Entry Types" dialogue title [#9198](https://github.com/JabRef/jabref/issues/9198)
5153
- We fixed an issue where author names with tilde accents (for example ñ) were marked as "Names are not in the standard BibTex format" [#8071](https://github.com/JabRef/jabref/issues/8071)
5254
- We fixed an issue where the possibility to generate a subdatabase from an aux file was writing empty files when called from the commandline [#9115](https://github.com/JabRef/jabref/issues/9115), [forum#3516](https://discourse.jabref.org/t/export-subdatabase-from-aux-file-on-macos-command-line/3516)
@@ -72,6 +74,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
7274

7375
### Removed
7476

77+
- We removed "last-search-date" from the SLR feature, because the last-search-date can be deducted from the git logs. [#9116](https://github.com/JabRef/jabref/pull/9116)
7578

7679

7780

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ dependencies {
173173
implementation 'org.fxmisc.flowless:flowless:0.6.10'
174174
implementation 'org.fxmisc.richtext:richtextfx:0.10.9'
175175
implementation 'com.jfoenix:jfoenix:9.0.10'
176-
implementation 'org.controlsfx:controlsfx:11.1.1'
176+
implementation 'org.controlsfx:controlsfx:11.1.2'
177177

178178
implementation 'org.jsoup:jsoup:1.15.3'
179179
implementation 'com.konghq:unirest-java:3.13.11'

‎buildres/csl/csl-locales/locales-af-ZA.xml

+13-14
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
<term name="in">in</term>
6767
<term name="in press">in press</term>
6868
<term name="internet">internet</term>
69-
<term name="interview">interview</term>
7069
<term name="letter">brief</term>
7170
<term name="no date">no date</term>
7271
<term name="no date" form="short">n.d.</term>
@@ -90,9 +89,9 @@
9089
<term name="article-magazine">magazine article</term>
9190
<term name="article-newspaper">newspaper article</term>
9291
<term name="bill">bill</term>
93-
<term name="book">book</term>
92+
<!-- book is in the list of locator terms -->
9493
<term name="broadcast">broadcast</term>
95-
<term name="chapter">book chapter</term>
94+
<!-- chapter is in the list of locator terms -->
9695
<term name="classic">classic</term>
9796
<term name="collection">collection</term>
9897
<term name="dataset">dataset</term>
@@ -135,8 +134,8 @@
135134
<term name="article-journal" form="short">journal art.</term>
136135
<term name="article-magazine" form="short">mag. art.</term>
137136
<term name="article-newspaper" form="short">newspaper art.</term>
138-
<term name="book" form="short">bk.</term>
139-
<term name="chapter" form="short">bk. chap.</term>
137+
<!-- book is in the list of locator terms -->
138+
<!-- chapter is in the list of locator terms -->
140139
<term name="document" form="short">doc.</term>
141140
<!-- figure is in the list of locator terms -->
142141
<term name="graphic" form="short">graph.</term>
@@ -300,39 +299,39 @@
300299
</term>
301300

302301
<!-- SHORT LOCATOR FORMS -->
303-
<term name="appendix">
302+
<term name="appendix" form="short">
304303
<single>app.</single>
305304
<multiple>apps.</multiple>
306305
</term>
307-
<term name="article-locator">
306+
<term name="article-locator" form="short">
308307
<single>art.</single>
309308
<multiple>arts.</multiple>
310309
</term>
311-
<term name="elocation">
310+
<term name="elocation" form="short">
312311
<single>loc.</single>
313312
<multiple>locs.</multiple>
314313
</term>
315-
<term name="equation">
314+
<term name="equation" form="short">
316315
<single>eq.</single>
317316
<multiple>eqs.</multiple>
318317
</term>
319-
<term name="rule">
318+
<term name="rule" form="short">
320319
<single>r.</single>
321320
<multiple>rr.</multiple>
322321
</term>
323-
<term name="scene">
322+
<term name="scene" form="short">
324323
<single>sc.</single>
325324
<multiple>scs.</multiple>
326325
</term>
327-
<term name="table">
326+
<term name="table" form="short">
328327
<single>tbl.</single>
329328
<multiple>tbls.</multiple>
330329
</term>
331-
<term name="timestamp"> <!-- generally blank -->
330+
<term name="timestamp" form="short"> <!-- generally blank -->
332331
<single></single>
333332
<multiple></multiple>
334333
</term>
335-
<term name="title-locator">
334+
<term name="title-locator" form="short">
336335
<single>tit.</single>
337336
<multiple>tits.</multiple>
338337
</term>

‎buildres/csl/csl-locales/locales-ar.xml

+14-15
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
<term name="in">في</term>
7373
<term name="in press">قيد النشر</term>
7474
<term name="internet">انترنت</term>
75-
<term name="interview">مقابلة</term>
7675
<term name="letter">خطاب</term>
7776
<term name="no date">دون تاريخ</term>
7877
<term name="no date" form="short">د.ت</term>
@@ -96,9 +95,9 @@
9695
<term name="article-magazine">magazine article</term>
9796
<term name="article-newspaper">newspaper article</term>
9897
<term name="bill">bill</term>
99-
<term name="book">book</term>
98+
<!-- book is in the list of locator terms -->
10099
<term name="broadcast">broadcast</term>
101-
<term name="chapter">book chapter</term>
100+
<!-- chapter is in the list of locator terms -->
102101
<term name="classic">classic</term>
103102
<term name="collection">collection</term>
104103
<term name="dataset">dataset</term>
@@ -110,7 +109,7 @@
110109
<!-- figure is in the list of locator terms -->
111110
<term name="graphic">graphic</term>
112111
<term name="hearing">hearing</term>
113-
<term name="interview">interview</term>
112+
<term name="interview">مقابلة</term>
114113
<term name="legal_case">legal case</term>
115114
<term name="legislation">legislation</term>
116115
<term name="manuscript">manuscript</term>
@@ -141,8 +140,8 @@
141140
<term name="article-journal" form="short">journal art.</term>
142141
<term name="article-magazine" form="short">mag. art.</term>
143142
<term name="article-newspaper" form="short">newspaper art.</term>
144-
<term name="book" form="short">bk.</term>
145-
<term name="chapter" form="short">bk. chap.</term>
143+
<!-- book is in the list of locator terms -->
144+
<!-- chapter is in the list of locator terms -->
146145
<term name="document" form="short">doc.</term>
147146
<!-- figure is in the list of locator terms -->
148147
<term name="graphic" form="short">graph.</term>
@@ -300,39 +299,39 @@
300299
</term>
301300

302301
<!-- SHORT LOCATOR FORMS -->
303-
<term name="appendix">
302+
<term name="appendix" form="short">
304303
<single>app.</single>
305304
<multiple>apps.</multiple>
306305
</term>
307-
<term name="article-locator">
306+
<term name="article-locator" form="short">
308307
<single>art.</single>
309308
<multiple>arts.</multiple>
310309
</term>
311-
<term name="elocation">
310+
<term name="elocation" form="short">
312311
<single>loc.</single>
313312
<multiple>locs.</multiple>
314313
</term>
315-
<term name="equation">
314+
<term name="equation" form="short">
316315
<single>eq.</single>
317316
<multiple>eqs.</multiple>
318317
</term>
319-
<term name="rule">
318+
<term name="rule" form="short">
320319
<single>r.</single>
321320
<multiple>rr.</multiple>
322321
</term>
323-
<term name="scene">
322+
<term name="scene" form="short">
324323
<single>sc.</single>
325324
<multiple>scs.</multiple>
326325
</term>
327-
<term name="table">
326+
<term name="table" form="short">
328327
<single>tbl.</single>
329328
<multiple>tbls.</multiple>
330329
</term>
331-
<term name="timestamp"> <!-- generally blank -->
330+
<term name="timestamp" form="short"> <!-- generally blank -->
332331
<single></single>
333332
<multiple></multiple>
334333
</term>
335-
<term name="title-locator">
334+
<term name="title-locator" form="short">
336335
<single>tit.</single>
337336
<multiple>tits.</multiple>
338337
</term>

0 commit comments

Comments
 (0)