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 for delete entries should ask user #10591

Merged
merged 59 commits into from
Feb 26, 2024
Merged
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
42cf53d
Implemented the feature that deleting files which linked to selected …
shawn-jj Oct 27, 2023
4bfc322
Merge branch 'main' of https://github.com/shawn-jj/jabref into fix-fo…
shawn-jj Oct 27, 2023
0435c91
The following features are implemented: 1.Initializes a pop-up dialog…
shawn-jj Oct 27, 2023
898c2b2
update CHANGELOG.md
shawn-jj Oct 27, 2023
482c24b
Add language keys to english language file
shawn-jj Oct 28, 2023
799c693
restore files in src/main/resources/csl-locales and src/main/resource…
shawn-jj Oct 28, 2023
13d9d38
Merge branch 'JabRef:main' into fix-for-issue-10509
shawn-jj Oct 28, 2023
7368fe2
Removed unnecessary comments and finxed some requested changes. Added…
shawn-jj Oct 29, 2023
7e282df
Add language keys to english language file
shawn-jj Oct 29, 2023
8d325ff
Modify language keys to english language file
shawn-jj Oct 29, 2023
1b7e17d
made deleteFileFromDisk method static
shawn-jj Nov 2, 2023
f1d50bb
Merge branch 'main' of https://github.com/shawn-jj/jabref into fix-fo…
shawn-jj Nov 2, 2023
4a4e81f
update comment of method deleteFileFromDisk
shawn-jj Nov 2, 2023
c9d7dd9
fixed coding styles
shawn-jj Nov 3, 2023
eef105a
restored unexpected code changes
shawn-jj Nov 3, 2023
c12cd63
Merge branch 'JabRef:main' into fix-for-issue-10509
shawn-jj Nov 3, 2023
97fa0c9
Merge remote-tracking branch 'upstream/main' into fix-for-issue-10509
Siedlerchr Nov 6, 2023
1a531e7
fix logic
Siedlerchr Nov 6, 2023
7ec812b
try null
Siedlerchr Nov 6, 2023
0652ceb
todo
Siedlerchr Nov 7, 2023
17c6a8f
Unify dialogs that confirmation deleting files
shawn-jj Nov 7, 2023
4119b38
Merge branch 'main' into fix-for-issue-10509
koppor Nov 16, 2023
35a95f2
Merge branch 'JabRef:main' into fix-for-issue-10509
shawn-jj Nov 29, 2023
3364671
Get around LinkedFile in LIbraryTab, Encapsulate LinkedFile into Link…
shawn-jj Nov 29, 2023
055f170
fix style
shawn-jj Nov 29, 2023
7bf040e
restore files
shawn-jj Nov 29, 2023
7324452
Unified the different dialogs when deleting entries, removerd unneces…
shawn-jj Nov 29, 2023
5c319cc
fix csl-styles
shawn-jj Nov 29, 2023
853d0ac
try to fix csl-styles
shawn-jj Nov 30, 2023
b4e770a
try to fix csl-styles again
shawn-jj Nov 30, 2023
db5206d
try to fix csl-styles again 2
shawn-jj Nov 30, 2023
d3f57bf
try to fix csl-styles again 3
shawn-jj Nov 30, 2023
c5d7755
Merge branch 'main' into fix-for-issue-10509
koppor Jan 2, 2024
29b7d6f
Merge branch 'JabRef:main' into fix-for-issue-10509
shawn-jj Jan 3, 2024
92b590c
Update prompts in en.properties
shawn-jj Jan 3, 2024
b5ae963
Merge remote-tracking branch 'upstream/main' into fix-for-issue-10509
koppor Jan 11, 2024
888d191
New features
koppor Jan 11, 2024
dfcbb0b
Merge branch 'main' into fix-for-issue-10509
koppor Jan 11, 2024
cb444e4
Fix architecture tests
koppor Jan 11, 2024
58215e2
Introduce list of files to delete
calixtus Jan 11, 2024
b4b84b6
Merge remote-tracking branch 'shawn-jj/fix-for-issue-10509' into fork…
calixtus Jan 11, 2024
09e1d6c
Streamline 1 vs. many files
koppor Jan 11, 2024
2a49780
Fix openRewrite
koppor Jan 11, 2024
cef7a2c
Merge remote-tracking branch 'upstream/main' into fix-for-issue-10509
koppor Jan 16, 2024
d9ccf84
Discard changes to src/test/resources/org/jabref/logic/search/test-li…
koppor Jan 16, 2024
65b63d9
Merge remote-tracking branch 'origin/main' into fix-for-issue-10509
koppor Jan 24, 2024
6c2ebc5
Adapt true/false logic according to expectations
koppor Jan 24, 2024
250e168
Add "Trash" to CHANGELOG.md
koppor Jan 24, 2024
f62fa7e
Fix localization
koppor Jan 24, 2024
9c9760c
Merge branch 'main' into fix-for-issue-10509
koppor Feb 6, 2024
e065dfe
Merge remote-tracking branch 'upstream/main' into fix-for-issue-10509
koppor Feb 18, 2024
74ee156
Fix JabRef_en.properties
koppor Feb 18, 2024
77bb7a0
Add some debug statements
koppor Feb 18, 2024
eee769c
Fix preferences
koppor Feb 18, 2024
1f13409
Separate log entries by empty line
koppor Feb 18, 2024
84f94d1
More refined dialog
koppor Feb 18, 2024
f6d413a
Merge remote-tracking branch 'upstream/main' into fix-for-issue-10509
koppor Feb 18, 2024
e06a631
Merge branch 'main' into fix-for-issue-10509
koppor Feb 19, 2024
cef4f9c
Merge remote-tracking branch 'upstream/main' into fix-for-issue-10509
Siedlerchr Feb 26, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'main' into fix-for-issue-10509
koppor authored Feb 6, 2024
commit 9c9760c90b5d2b48e8d847fb89397c1a5e3bd6be
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -17,6 +17,8 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
- We added a new group icon column to the main table showing the icons of the entry's groups. [#10801](https://github.com/JabRef/jabref/pull/10801)
- When deleting an entry, the files linked to the entry are now optionally deleted as well. [#10509](https://github.com/JabRef/jabref/issues/10509)
- We added support to move the file to the system trash (instead of deleting it). [#10591](https://github.com/JabRef/jabref/pull/10591)
- We added ability to jump to an entry in the command line using `-j CITATIONKEY`. [koppor#540](https://github.com/koppor/jabref/issues/540)
- We added a new boolean to the style files for Openoffice/Libreoffice integration to switch between ZERO_WIDTH_SPACE (default) and no space. [#10843](https://github.com/JabRef/jabref/pull/10843)

### Changed

17 changes: 16 additions & 1 deletion src/main/resources/l10n/JabRef_en.properties
Original file line number Diff line number Diff line change
@@ -347,6 +347,12 @@ Manage\ field\ names\ &\ content=Manage field names & content

Field\ to\ group\ by=Field to group by

File=File
file=file
File\ directory\ is\ not\ set\ or\ does\ not\ exist\!=File directory is not set or does not exist!
File\ exists=File exists
File\ not\ found=File not found

Filter=Filter
Filter\ groups=Filter groups

@@ -384,7 +390,16 @@ Format\ string=Format string

Formatter\ name=Formatter name

found\ in\ AUX\ file=found in AUX file
found\ in\ AUX\








found in AUX file

Fulltext\ for=Fulltext for

You are viewing a condensed version of this merge commit. You can view the full changes here.