-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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
Add disable/enable calculation of items in group (2) #6244
Closed
Closed
Changes from 6 commits
Commits
Show all changes
84 commits
Select commit
Hold shift + click to select a range
72c022e
Adjusted GroupNodeViewModel.java.
Gena928 1f4e4ad
Adjusted GroupNodeViewModel.
Gena928 ebd6284
Update GroupNodeViewModel.java
Gena928 c0990dc
Injected PreferencesService using a constructor call.
Gena928 1b5d16d
Merge branch 'master' into 6042(2)
tobiasdiez f6c12f4
Update GroupNodeViewModel.java
tobiasdiez 3f368e9
Fixed an issue where a new entry is not shown in the library if a fil…
nsmt09 c8da256
Partial fix for issue 5891
ce33357
Added more tests
3df1342
Added more tests
5454a09
Added more tests
e066958
Merge branch 'fix-for-issue-5891' of https://github.com/silverhorse/j…
40541ad
Small update to resolve GIT conflict
Gena928 9287490
Return true in action helper if file is online link
Siedlerchr d4f23fa
fix checkstyle
Siedlerchr b1e899a
Adjusted fix by using StateManager for clearing search bar
nsmt09 a9eeb05
Merge branch 'master' into fix-for-issue-6297
Siedlerchr 7748940
Update ActionHelper.java
tobiasdiez c8344be
Merge branch 'master' into 6042(2)
tobiasdiez dffcf78
Merge pull request #6511 from JabRef/fixActionHelperWithOnlineLink
Siedlerchr 2c1a69e
Refactored tableColumnsTab and tableTab, changed to PreferencesService
calixtus 9882c6d
Fix help file tests
tobiasdiez e277c0c
Remove Grobid also from tests
tobiasdiez e76a92c
Extend the bib file for better screenshots
tobiasdiez 03e3663
Refactor externalprefs (#6509)
calixtus 3e96170
Merge pull request #6513 from JabRef/fetcherHelp
Siedlerchr 737af75
Add javadoc and fix the preview update issue
leitianjian 2a5717c
Merged entry table tabs
calixtus ab50ca8
Refactored MainTableNameFormatter
calixtus cb6804e
CHANGELOG.md
calixtus fa5f879
Merge pull request #6514 from JabRef/extendBib
Siedlerchr c8949bd
Added cache and comments
calixtus ead191e
Merge remote-tracking branch 'upstream/master' into refactor_tableprefs
calixtus 8d468cb
Bump flexmark-ext-gfm-tasklist from 0.61.30 to 0.61.32
dependabot-preview[bot] 4f75f57
Bump flexmark from 0.61.30 to 0.61.32
dependabot-preview[bot] 196f937
Bump archunit-junit5-api from 0.13.1 to 0.14.1
dependabot-preview[bot] 20c70a9
Merge pull request #6520 from JabRef/dependabot/gradle/com.vladsch.fl…
Siedlerchr 7d3bd7b
Merge pull request #6521 from JabRef/dependabot/gradle/com.vladsch.fl…
Siedlerchr 59361fc
Bump flexmark-ext-gfm-strikethrough from 0.61.30 to 0.61.32
dependabot-preview[bot] 43262c3
Merge pull request #6522 from JabRef/dependabot/gradle/com.vladsch.fl…
Siedlerchr bc1e341
Merge pull request #6523 from JabRef/dependabot/gradle/com.tngtech.ar…
Siedlerchr d01f370
Fixed main table refresh
calixtus b86800c
Revert to old switch expression for checkstyle compatibility
calixtus 0bd2fd2
Revert more switch expressions for checkstyle compatibility
calixtus 25bd506
CHANGELOG.md
calixtus 6f34de3
Merge pull request #6407 from nsmt09/fix-for-issue-6297
Siedlerchr 86b04a7
Merge pull request #6516 from leitianjian/entry-preview-content-update
Siedlerchr 0d7156b
Fixes missing library properties context menu on library tab (#6508)
Oltman-B 861e61e
Allow entrytype as sorting criterion
Siedlerchr 56b0cee
update changelog
Siedlerchr 104f697
checkstyle argh
Siedlerchr bb19d29
Merge pull request #6531 from JabRef/fixEntryTypeMissing
Siedlerchr 47846bf
Enable users to simultaneously search all SearchBasedFetchers (#6504)
DominikVoigt c119ca2
Add markdown checks (and fix some markdown issues) (#6524)
koppor 4b997f8
updating text for checkbox
5668049
reverting change from other properties files
62a6961
Merge branch 'master' of https://github.com/JabRef/jabref into fix-fo…
08eccb6
Fixes generated bibtex key and display of institute authors (#6479)
k3KAW8Pnf7mkmdSMPHz27 62f3038
Merge remote-tracking branch 'upstream/master' into refactor_tableprefs
calixtus 3135197
Extracted JabRefPrefences out of PersistenceVisualStateTable
calixtus 526ba89
Fix links in the readme
tobiasdiez 0ce7c8f
updating text
6a1940f
updating text
ffa07cd
Merge pull request #6451 from silverhorse/fix-for-issue-5891
Siedlerchr d43bcfa
Switch to upstream version of markdow-lint (#6544)
koppor c1867e5
Fixed merge error
calixtus 41678ce
Merge pull request #6518 from JabRef/refactor_tableprefs
Siedlerchr ad8ac9d
Bump flexmark from 0.61.32 to 0.62.0
dependabot-preview[bot] 4eb2316
Bump flexmark-ext-gfm-tasklist from 0.61.32 to 0.62.0
dependabot-preview[bot] cab28ab
Bump bcprov-jdk15on from 1.65 to 1.65.01
dependabot-preview[bot] 8ff20f1
Merge pull request #6550 from JabRef/dependabot/gradle/org.bouncycast…
Siedlerchr a852963
Merge pull request #6547 from JabRef/dependabot/gradle/com.vladsch.fl…
Siedlerchr 5cb139c
Merge pull request #6548 from JabRef/dependabot/gradle/com.vladsch.fl…
Siedlerchr 8b35b69
Restructure first paragraph
koppor 2c30f20
Fix html
koppor 9742ee1
Bump flexmark-ext-gfm-strikethrough from 0.61.32 to 0.62.0 (#6546)
dependabot-preview[bot] 53e8c36
Add authors
koppor 68f90c0
Merge branch '6042(2)' of git://github.com/Gena928/jabref into Gena92…
calixtus 684abf6
Adjusted GroupNodeViewModel.java.
Gena928 58e5492
Adjusted GroupNodeViewModel.
Gena928 2155917
Update GroupNodeViewModel.java
Gena928 30cb675
Injected PreferencesService using a constructor call.
Gena928 5c1998f
Update GroupNodeViewModel.java
tobiasdiez 2da0d06
Merge branch '6042(2)' of https://github.com/Gena928/jabref into 6042(2)
calixtus File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this duplication of the code is a result from a merge conflict?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like yes, this is a conflict.
the second
BackgroundTask
is not mine. My code is:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I haven't worked with conflicts yet.
Looks like this is your correction as of 11.04.2020. Can I do something to resolve this GIT conflict?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No problem! I also often have problems with git ;-)
Here the solution is relatively simple. Just edit the code and remove the part that is duplicated / not correct. Then commit and push.