Commit aa95a25
committed
Merge remote-tracking branch 'upstream/main' into addRightlickToGroup
* upstream/main:
Update abbrv.jabref.org (#12365)
Bump buildres/abbrv.jabref.org from `78e1b08` to `c202741` (#12363)
Bump org.beryx.jlink from 3.1.0-rc-1 to 3.1.1 (#12362)
Bump tech.units:indriya from 2.2.1 to 2.2.2 (#12361)
Bump com.dlsc.gemsfx:gemsfx from 2.80.0 to 2.81.0 (#12360)
Bump org.mariadb.jdbc:mariadb-java-client from 2.7.9 to 2.7.12 (#12359)
Bump org.mockito:mockito-core from 5.14.2 to 5.15.2 (#12358)
Fix content not correctly parsed at pdf content importer (#12338)
Bump de.undercouch:citeproc-java from 3.1.0 to 3.2.0 (#12347)
Bump org.openrewrite.rewrite from 6.29.0 to 6.29.2 (#12345)
Improve utf8 detection (#12342)
Bump org.fxmisc.richtext:richtextfx from 0.11.3 to 0.11.4 (#12346)
Bump ai.djl:bom from 0.30.0 to 0.31.1 (#12344)
Bump com.puppycrawl.tools:checkstyle from 10.21.0 to 10.21.1 (#12343)File tree
25 files changed
+74
-65
lines changed- buildres
- src
- main/java/org/jabref
- gui
- commonfxcontrols
- externalfiletype
- groups
- preferences/websearch
- slr
- logic
- exporter
- importer
- fetcher
- fileformat
- util
- integrity
- layout
- util
- migrations
- model/database
- test
- java/org/jabref/logic
- importer/fileformat
- openoffice/oocsltext
- resources/pdfs/PdfContentImporter
25 files changed
+74
-65
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
| 17 | + | |
16 | 18 | | |
17 | 19 | | |
| 20 | + | |
| 21 | + | |
18 | 22 | | |
19 | 23 | | |
| 24 | + | |
| 25 | + | |
20 | 26 | | |
21 | 27 | | |
22 | 28 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| |||
211 | 211 | | |
212 | 212 | | |
213 | 213 | | |
214 | | - | |
| 214 | + | |
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
| |||
243 | 243 | | |
244 | 244 | | |
245 | 245 | | |
246 | | - | |
247 | | - | |
| 246 | + | |
| 247 | + | |
248 | 248 | | |
249 | 249 | | |
250 | 250 | | |
| |||
256 | 256 | | |
257 | 257 | | |
258 | 258 | | |
259 | | - | |
| 259 | + | |
260 | 260 | | |
261 | 261 | | |
262 | 262 | | |
| |||
281 | 281 | | |
282 | 282 | | |
283 | 283 | | |
284 | | - | |
| 284 | + | |
285 | 285 | | |
286 | 286 | | |
287 | 287 | | |
| |||
358 | 358 | | |
359 | 359 | | |
360 | 360 | | |
361 | | - | |
| 361 | + | |
362 | 362 | | |
363 | 363 | | |
364 | 364 | | |
| |||
383 | 383 | | |
384 | 384 | | |
385 | 385 | | |
386 | | - | |
| 386 | + | |
387 | 387 | | |
388 | 388 | | |
389 | 389 | | |
| |||
396 | 396 | | |
397 | 397 | | |
398 | 398 | | |
399 | | - | |
| 399 | + | |
400 | 400 | | |
401 | 401 | | |
402 | 402 | | |
403 | 403 | | |
404 | | - | |
| 404 | + | |
405 | 405 | | |
406 | 406 | | |
407 | 407 | | |
| |||
Submodule abbrv.jabref.org updated 9 files
- CHANGELOG.md+3-4
- journals/README.md-2
- journals/journal_abbreviations_mathematics.csv+1
- journals/journal_abbreviations_webofscience-dotless.csv-87.2k
- journals/journal_abbreviations_webofscience-dots.csv-87.2k
- scripts/combine_journal_lists_dotless.py+1-2
- scripts/combine_journal_lists_dots.py+1-2
- scripts/convert_to_comma.py-2
- scripts/delete_general_duplicates_lists.py+1-3
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
127 | | - | |
| 127 | + | |
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
30 | 30 | | |
31 | | - | |
| 31 | + | |
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
205 | 205 | | |
206 | 206 | | |
207 | 207 | | |
208 | | - | |
| 208 | + | |
209 | 209 | | |
210 | 210 | | |
211 | 211 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
403 | 403 | | |
404 | 404 | | |
405 | 405 | | |
406 | | - | |
| 406 | + | |
407 | 407 | | |
408 | 408 | | |
409 | 409 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
147 | 147 | | |
148 | 148 | | |
149 | 149 | | |
150 | | - | |
| 150 | + | |
151 | 151 | | |
152 | 152 | | |
153 | 153 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
75 | 75 | | |
76 | 76 | | |
77 | 77 | | |
78 | | - | |
| 78 | + | |
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
| |||
108 | 108 | | |
109 | 109 | | |
110 | 110 | | |
111 | | - | |
| 111 | + | |
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
98 | 98 | | |
99 | 99 | | |
100 | 100 | | |
101 | | - | |
| 101 | + | |
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
| |||
0 commit comments