Skip to content

Convert merge shared entries to javafx#5042

Merged
Siedlerchr merged 3 commits into
masterfrom
mergeSharedentrytofx
Jun 8, 2019
Merged

Convert merge shared entries to javafx#5042
Siedlerchr merged 3 commits into
masterfrom
mergeSharedentrytofx

Conversation

@Siedlerchr

@Siedlerchr Siedlerchr commented Jun 8, 2019 •
edited
Loading

Copy link
Copy Markdown
Member

Last "big" dialog for conversion to javafx
Refs #4894

Remove old dialog

Use the already created merge dialog

Now it looks like this:
grafik

Before:
jabref+updateRefusedOld

One odd thing I noticed and this refs probably #4461 is that whenever I paste an entry in the shared database it gets duplicated multiple time.
This looks oddly familiar. I remember that this was having to do with the subscribers and the event bus system.

  • Change in CHANGELOG.md described
  • Tests created for changes
  • Manually tested changed features in running JabRef
  • Screenshots added in PR description (for bigger UI changes)
  • Ensured that the git commit message is a good one
  • Check documentation status (Issue created for outdated help page at help.jabref.org?)

Siedlerchr added 2 commits June 8, 2019 19:20
@Siedlerchr
Convert merge shared entries to javafx
8044a22 
Remove old dialog
Use the defined dialog
@Siedlerchr
Fix l10n
ea8f4b5
@Siedlerchr Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jun 8, 2019
tobiasdiez
tobiasdiez reviewed Jun 8, 2019
View reviewed changes

@tobiasdiez tobiasdiez left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Codewise this looks good to me. I'm wondering however why we don't show the MergeEntries dialog directly?

Comment thread src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java Outdated
message.append("\r\n");
message.append(Localization.lang("Local version: %0", String.valueOf(localBibEntry.getSharedBibEntryData().getVersion())));
message.append("\r\n");
message.append(Localization.lang("Please merge the shared entry with yours and press \"Merge entries\" to resolve this problem."));

@tobiasdiez tobiasdiez Jun 8, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be something like "Press "Merge entries" to resolve the merge conflict." ?

@Siedlerchr Siedlerchr Jun 8, 2019

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. Fixed the wording

@Siedlerchr Siedlerchr merged commit 3f89897 into master Jun 8, 2019
@Siedlerchr Siedlerchr deleted the mergeSharedentrytofx branch June 8, 2019 18:57
github-actions Bot pushed a commit to CaptainDaVinci/jabref that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
cc84be0 
6fab78b Create physiologia-plantarum.csl (JabRef#5040)
58d65fd Create cureus.csl (JabRef#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (JabRef#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (JabRef#5041)
39a3fbb Create finance-and-society.csl (JabRef#5043)
cf39e19 Create canadian-biosystems-engineering-journal (JabRef#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (JabRef#5024)
776002d create new independent style for deutsches-arzteblatt.csl (JabRef#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (JabRef#5036)
13e0a0b Update iso690-full-note-cs.csl (JabRef#5033)
3af2034 Create acta-medica-peruana.csl (JabRef#5037)
dcbe494 Create historia-scribere.csl (JabRef#5038)
2174323 make addiction-biology.csl an AMA dependent (JabRef#5028)
b01aea8 Update ios-press-books.csl (JabRef#5030)
ae6d0e2 add doi for article-journal for ASA.csl (JabRef#5031)
d537025 Create organised-sound.csl (JabRef#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (JabRef#5026)
3dc5157 Update amerindia.csl (JabRef#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (JabRef#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (JabRef#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
github-actions Bot pushed a commit to RamonG92/jabref that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
aa36208 
6fab78b Create physiologia-plantarum.csl (JabRef#5040)
58d65fd Create cureus.csl (JabRef#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (JabRef#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (JabRef#5041)
39a3fbb Create finance-and-society.csl (JabRef#5043)
cf39e19 Create canadian-biosystems-engineering-journal (JabRef#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (JabRef#5024)
776002d create new independent style for deutsches-arzteblatt.csl (JabRef#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (JabRef#5036)
13e0a0b Update iso690-full-note-cs.csl (JabRef#5033)
3af2034 Create acta-medica-peruana.csl (JabRef#5037)
dcbe494 Create historia-scribere.csl (JabRef#5038)
2174323 make addiction-biology.csl an AMA dependent (JabRef#5028)
b01aea8 Update ios-press-books.csl (JabRef#5030)
ae6d0e2 add doi for article-journal for ASA.csl (JabRef#5031)
d537025 Create organised-sound.csl (JabRef#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (JabRef#5026)
3dc5157 Update amerindia.csl (JabRef#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (JabRef#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (JabRef#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
github-actions Bot pushed a commit to dimitra-karadima/jabref that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
4be8347 
6fab78b Create physiologia-plantarum.csl (JabRef#5040)
58d65fd Create cureus.csl (JabRef#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (JabRef#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (JabRef#5041)
39a3fbb Create finance-and-society.csl (JabRef#5043)
cf39e19 Create canadian-biosystems-engineering-journal (JabRef#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (JabRef#5024)
776002d create new independent style for deutsches-arzteblatt.csl (JabRef#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (JabRef#5036)
13e0a0b Update iso690-full-note-cs.csl (JabRef#5033)
3af2034 Create acta-medica-peruana.csl (JabRef#5037)
dcbe494 Create historia-scribere.csl (JabRef#5038)
2174323 make addiction-biology.csl an AMA dependent (JabRef#5028)
b01aea8 Update ios-press-books.csl (JabRef#5030)
ae6d0e2 add doi for article-journal for ASA.csl (JabRef#5031)
d537025 Create organised-sound.csl (JabRef#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (JabRef#5026)
3dc5157 Update amerindia.csl (JabRef#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (JabRef#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (JabRef#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
github-actions Bot pushed a commit to Xuanxuan-Zou/jabref that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
0c6d13c 
6fab78b Create physiologia-plantarum.csl (JabRef#5040)
58d65fd Create cureus.csl (JabRef#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (JabRef#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (JabRef#5041)
39a3fbb Create finance-and-society.csl (JabRef#5043)
cf39e19 Create canadian-biosystems-engineering-journal (JabRef#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (JabRef#5024)
776002d create new independent style for deutsches-arzteblatt.csl (JabRef#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (JabRef#5036)
13e0a0b Update iso690-full-note-cs.csl (JabRef#5033)
3af2034 Create acta-medica-peruana.csl (JabRef#5037)
dcbe494 Create historia-scribere.csl (JabRef#5038)
2174323 make addiction-biology.csl an AMA dependent (JabRef#5028)
b01aea8 Update ios-press-books.csl (JabRef#5030)
ae6d0e2 add doi for article-journal for ASA.csl (JabRef#5031)
d537025 Create organised-sound.csl (JabRef#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (JabRef#5026)
3dc5157 Update amerindia.csl (JabRef#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (JabRef#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (JabRef#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
github-actions Bot pushed a commit to felixbohnacker/jabref that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
1e60860 
6fab78b Create physiologia-plantarum.csl (JabRef#5040)
58d65fd Create cureus.csl (JabRef#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (JabRef#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (JabRef#5041)
39a3fbb Create finance-and-society.csl (JabRef#5043)
cf39e19 Create canadian-biosystems-engineering-journal (JabRef#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (JabRef#5024)
776002d create new independent style for deutsches-arzteblatt.csl (JabRef#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (JabRef#5036)
13e0a0b Update iso690-full-note-cs.csl (JabRef#5033)
3af2034 Create acta-medica-peruana.csl (JabRef#5037)
dcbe494 Create historia-scribere.csl (JabRef#5038)
2174323 make addiction-biology.csl an AMA dependent (JabRef#5028)
b01aea8 Update ios-press-books.csl (JabRef#5030)
ae6d0e2 add doi for article-journal for ASA.csl (JabRef#5031)
d537025 Create organised-sound.csl (JabRef#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (JabRef#5026)
3dc5157 Update amerindia.csl (JabRef#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (JabRef#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (JabRef#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
github-actions Bot pushed a commit to ShikunXiong/jabref that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
b64689e 
6fab78b Create physiologia-plantarum.csl (JabRef#5040)
58d65fd Create cureus.csl (JabRef#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (JabRef#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (JabRef#5041)
39a3fbb Create finance-and-society.csl (JabRef#5043)
cf39e19 Create canadian-biosystems-engineering-journal (JabRef#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (JabRef#5024)
776002d create new independent style for deutsches-arzteblatt.csl (JabRef#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (JabRef#5036)
13e0a0b Update iso690-full-note-cs.csl (JabRef#5033)
3af2034 Create acta-medica-peruana.csl (JabRef#5037)
dcbe494 Create historia-scribere.csl (JabRef#5038)
2174323 make addiction-biology.csl an AMA dependent (JabRef#5028)
b01aea8 Update ios-press-books.csl (JabRef#5030)
ae6d0e2 add doi for article-journal for ASA.csl (JabRef#5031)
d537025 Create organised-sound.csl (JabRef#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (JabRef#5026)
3dc5157 Update amerindia.csl (JabRef#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (JabRef#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (JabRef#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
github-actions Bot pushed a commit to eetian/jabref that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
ccc78c9 
6fab78b Create physiologia-plantarum.csl (JabRef#5040)
58d65fd Create cureus.csl (JabRef#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (JabRef#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (JabRef#5041)
39a3fbb Create finance-and-society.csl (JabRef#5043)
cf39e19 Create canadian-biosystems-engineering-journal (JabRef#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (JabRef#5024)
776002d create new independent style for deutsches-arzteblatt.csl (JabRef#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (JabRef#5036)
13e0a0b Update iso690-full-note-cs.csl (JabRef#5033)
3af2034 Create acta-medica-peruana.csl (JabRef#5037)
dcbe494 Create historia-scribere.csl (JabRef#5038)
2174323 make addiction-biology.csl an AMA dependent (JabRef#5028)
b01aea8 Update ios-press-books.csl (JabRef#5030)
ae6d0e2 add doi for article-journal for ASA.csl (JabRef#5031)
d537025 Create organised-sound.csl (JabRef#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (JabRef#5026)
3dc5157 Update amerindia.csl (JabRef#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (JabRef#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (JabRef#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
github-actions Bot pushed a commit to dextep/jabref that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
57ddda7 
6fab78b Create physiologia-plantarum.csl (JabRef#5040)
58d65fd Create cureus.csl (JabRef#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (JabRef#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (JabRef#5041)
39a3fbb Create finance-and-society.csl (JabRef#5043)
cf39e19 Create canadian-biosystems-engineering-journal (JabRef#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (JabRef#5024)
776002d create new independent style for deutsches-arzteblatt.csl (JabRef#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (JabRef#5036)
13e0a0b Update iso690-full-note-cs.csl (JabRef#5033)
3af2034 Create acta-medica-peruana.csl (JabRef#5037)
dcbe494 Create historia-scribere.csl (JabRef#5038)
2174323 make addiction-biology.csl an AMA dependent (JabRef#5028)
b01aea8 Update ios-press-books.csl (JabRef#5030)
ae6d0e2 add doi for article-journal for ASA.csl (JabRef#5031)
d537025 Create organised-sound.csl (JabRef#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (JabRef#5026)
3dc5157 Update amerindia.csl (JabRef#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (JabRef#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (JabRef#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
github-actions Bot pushed a commit that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
dbe92ad 
6fab78b Create physiologia-plantarum.csl (#5040)
58d65fd Create cureus.csl (#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (#5041)
39a3fbb Create finance-and-society.csl (#5043)
cf39e19 Create canadian-biosystems-engineering-journal (#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (#5024)
776002d create new independent style for deutsches-arzteblatt.csl (#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (#5036)
13e0a0b Update iso690-full-note-cs.csl (#5033)
3af2034 Create acta-medica-peruana.csl (#5037)
dcbe494 Create historia-scribere.csl (#5038)
2174323 make addiction-biology.csl an AMA dependent (#5028)
b01aea8 Update ios-press-books.csl (#5030)
ae6d0e2 add doi for article-journal for ASA.csl (#5031)
d537025 Create organised-sound.csl (#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (#5026)
3dc5157 Update amerindia.csl (#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
github-actions Bot pushed a commit to graffaner/jabref that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
6a208fe 
6fab78b Create physiologia-plantarum.csl (JabRef#5040)
58d65fd Create cureus.csl (JabRef#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (JabRef#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (JabRef#5041)
39a3fbb Create finance-and-society.csl (JabRef#5043)
cf39e19 Create canadian-biosystems-engineering-journal (JabRef#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (JabRef#5024)
776002d create new independent style for deutsches-arzteblatt.csl (JabRef#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (JabRef#5036)
13e0a0b Update iso690-full-note-cs.csl (JabRef#5033)
3af2034 Create acta-medica-peruana.csl (JabRef#5037)
dcbe494 Create historia-scribere.csl (JabRef#5038)
2174323 make addiction-biology.csl an AMA dependent (JabRef#5028)
b01aea8 Update ios-press-books.csl (JabRef#5030)
ae6d0e2 add doi for article-journal for ASA.csl (JabRef#5031)
d537025 Create organised-sound.csl (JabRef#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (JabRef#5026)
3dc5157 Update amerindia.csl (JabRef#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (JabRef#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (JabRef#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
github-actions Bot pushed a commit to NikodemKch/jabref-1 that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
bd9e288 
6fab78b Create physiologia-plantarum.csl (JabRef#5040)
58d65fd Create cureus.csl (JabRef#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (JabRef#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (JabRef#5041)
39a3fbb Create finance-and-society.csl (JabRef#5043)
cf39e19 Create canadian-biosystems-engineering-journal (JabRef#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (JabRef#5024)
776002d create new independent style for deutsches-arzteblatt.csl (JabRef#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (JabRef#5036)
13e0a0b Update iso690-full-note-cs.csl (JabRef#5033)
3af2034 Create acta-medica-peruana.csl (JabRef#5037)
dcbe494 Create historia-scribere.csl (JabRef#5038)
2174323 make addiction-biology.csl an AMA dependent (JabRef#5028)
b01aea8 Update ios-press-books.csl (JabRef#5030)
ae6d0e2 add doi for article-journal for ASA.csl (JabRef#5031)
d537025 Create organised-sound.csl (JabRef#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (JabRef#5026)
3dc5157 Update amerindia.csl (JabRef#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (JabRef#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (JabRef#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
github-actions Bot pushed a commit to joe9111/jabref that referenced this pull request Oct 1, 2020
Squashed 'src/main/resources/csl-styles/' changes from 26265bf..6fab78b
538fa2e 
6fab78b Create physiologia-plantarum.csl (JabRef#5040)
58d65fd Create cureus.csl (JabRef#5048)
5b68591 Create institut-de-recherches-archeologiques-preventives.csl (JabRef#5042)
e238ca2 Create method-and-theory-in-the-study-of-religion.csl (JabRef#5041)
39a3fbb Create finance-and-society.csl (JabRef#5043)
cf39e19 Create canadian-biosystems-engineering-journal (JabRef#5046)
3d12b8f Create cardiff-university-biosi-and-carbs-only-harvard.csl (JabRef#5024)
776002d create new independent style for deutsches-arzteblatt.csl (JabRef#5035)
b167cd6 Create revista-peruana-de-medicina-experimental-y-salud-publica.csl (JabRef#5036)
13e0a0b Update iso690-full-note-cs.csl (JabRef#5033)
3af2034 Create acta-medica-peruana.csl (JabRef#5037)
dcbe494 Create historia-scribere.csl (JabRef#5038)
2174323 make addiction-biology.csl an AMA dependent (JabRef#5028)
b01aea8 Update ios-press-books.csl (JabRef#5030)
ae6d0e2 add doi for article-journal for ASA.csl (JabRef#5031)
d537025 Create organised-sound.csl (JabRef#5032)
ef4d15e Create independent EMBO Press
640fdac Create forensic-anthropology.csl (JabRef#5026)
3dc5157 Update amerindia.csl (JabRef#5027)
fca38a2 Create journal-of-the-botanical-research-institute-of-texas.csl (JabRef#5029)
facc3f9 Aging &Disease: remove unused macros
661e9fa Sort aging and disease by cite number
8746709 show issue numbers in springer basic author-date style (JabRef#4854)
c358b17 Update Journal of Universal Computer Science

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 6fab78b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tobiasdiez tobiasdiez tobiasdiez left review comments

Assignees

No one assigned

Labels

status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@Siedlerchr @tobiasdiez