Skip to content

Conversation

@tobiasdiez
Copy link
Member

Fixes #3189.

@tobiasdiez tobiasdiez added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Dec 23, 2018
Copy link
Member

@Siedlerchr Siedlerchr left a comment

Choose a reason for hiding this comment

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

Lgtm

@tobiasdiez tobiasdiez merged commit 2606f9a into master Dec 24, 2018
@tobiasdiez tobiasdiez deleted the fixGroupCounter branch December 24, 2018 09:32
Siedlerchr added a commit that referenced this pull request Dec 28, 2018
* upstream/master: (49 commits)
  improve styling of preferences side menu (#4556)
  Cleanup interfaces (#4553)
  Bump fontbox from 2.0.12 to 2.0.13 (#4552)
  Bump pdfbox from 2.0.12 to 2.0.13 (#4551)
  Bump wiremock from 2.19.0 to 2.20.0 (#4550)
  Fixes that renaming a group did not change the group name in the interface (#4549)
  Bump applicationinsights-logging-log4j2 from 2.2.1 to 2.3.0 (#4540)
  Bump antlr4-runtime from 4.7.1 to 4.7.2 (#4542)
  Bump applicationinsights-core from 2.2.1 to 2.3.0 (#4541)
  Bump antlr4 from 4.7.1 to 4.7.2 (#4543)
  Fix journal name "Astronomy Journal" to "Astronomical Journal"
  fix-for-issue-4489 (#4538)
  Sorting of read-status isn't working as expected #4521 (#4536)
  Add preselect last used export format in export to clipboard dialog (#4533)
  fixed 4365 put html in clipboard (#4519)
  [WIP] Convert Exporter Customization Dialog to javafx (#4394)
  Fixes #4437 (#4531)
  Bump checkstyle from 8.14 to 8.15 (#4528)
  Correct PNAS abbrev. (#4524)
  Create test (#4518)
  ...
Siedlerchr added a commit that referenced this pull request Dec 28, 2018
* upstream/master:
  improve styling of preferences side menu (#4556)
  Cleanup interfaces (#4553)
  Bump fontbox from 2.0.12 to 2.0.13 (#4552)
  Bump pdfbox from 2.0.12 to 2.0.13 (#4551)
  Bump wiremock from 2.19.0 to 2.20.0 (#4550)
  Fixes that renaming a group did not change the group name in the interface (#4549)
Siedlerchr added a commit that referenced this pull request Jan 10, 2019
* upstream/master:
  Bump fontbox from 2.0.12 to 2.0.13 (#4552)
  Bump pdfbox from 2.0.12 to 2.0.13 (#4551)
  Bump wiremock from 2.19.0 to 2.20.0 (#4550)
  Fixes that renaming a group did not change the group name in the interface (#4549)
Siedlerchr added a commit that referenced this pull request Jan 20, 2019
* upstream/master: (583 commits)
  update jfoenix and gradle plugins Replace outdated transformer log4j2 with official new one
  Update journalList.txt
  Fix for Issue #4437 - Some bugs in preference->Entry table columns (#4546)
  Don't set column sort type at startup (#4577)
  Add uncaught exception message (#4565)
  Converts integrity check dialog to JavaFX (#4559)
  Do not extract file ending from Urls (#4547)
  Bump checkstyle from 8.15 to 8.16 (#4562)
  Bump xmpbox from 2.0.12 to 2.0.13 (#4561)
  Delete the deprecated BibEntry Constructor (#4560)
  Refactor BibEntry deprecated method (#4554)
  Added extra stats to be sent with MrDLib recommendations (#4452)
  improve styling of preferences side menu (#4556)
  Cleanup interfaces (#4553)
  Bump fontbox from 2.0.12 to 2.0.13 (#4552)
  Bump pdfbox from 2.0.12 to 2.0.13 (#4551)
  Bump wiremock from 2.19.0 to 2.20.0 (#4550)
  Fixes that renaming a group did not change the group name in the interface (#4549)
  Bump applicationinsights-logging-log4j2 from 2.2.1 to 2.3.0 (#4540)
  Bump antlr4-runtime from 4.7.1 to 4.7.2 (#4542)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/JabRefFrame.java
#	src/main/java/org/jabref/model/entry/BibtexString.java
github-actions bot pushed a commit to ddunig2/jabref that referenced this pull request Feb 6, 2020
e106215 Create annales-de-demographie-historique.csl (JabRef#4512)
4dd974e Create lauterbornia.csl (JabRef#4525)
e5277ae Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4551)
f9cfe40 Add new IOP dependents (JabRef#4549)
daff985 Create brazilian-journal-of-veterinary-research-and-animal-science.csl (JabRef#4544)
10c6fa8 Update ens-de-lyon-centre-d-ingenierie-documentaire.csl (JabRef#4545)
c531528 create mcgill9-en.csl, Canadian McGill legal style (JabRef#4532)
e2416fa Update clinical-and-experimental-optometry.csl (JabRef#4538)
e71363e Create geriatrie-et-psychologie-neuropsychiatrie-du-vieillissement.csl (JabRef#4543)
cdd973e APA: Add "personal communication" localization (JabRef#4539)
77bdb6f Create eksploatacja-i-niezawodnosc (JabRef#4531)
7858966 Ready: Update psychological-medicine.csl (JabRef#4536)
264141a Create south-african-actuarial-journal.csl (JabRef#4534)
1fde301 Create pakistan-journal-of-agricultural-sciences.csl (JabRef#4535)
3020eb3 Update hochschule-fur-soziale-arbeit-fhnw.csl (JabRef#4533)
57c8122 Update john-benjamins-publishing-company-linguistik-aktuell-linguistics-today.csl (JabRef#4530)
17c178f Update zeitschrift-fur-internationale-beziehungen.csl (JabRef#4527)
14cf589 Update john-benjamins-publishing-company-linguistik-aktuell-linguistics-today.csl (JabRef#4528)
ca60d6e Update john-benjamins-publishing-company-linguistik-aktuell-linguistics-today.csl (JabRef#4524)
74c5ae9 Update groupe-danthropologie-et-darcheologie-funeraire.csl (JabRef#4526)
999e124 Update associacao-brasileira-de-normas-tecnicas-ufrgs.csl (JabRef#4521)
caabe36 Fix psychiatric services
f50e6f0 Add files via upload (JabRef#4519)
c728658 Create harvard-lancaster-university.csl (JabRef#4520)
11e9ac9 Update instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abn… (JabRef#4511)
101b81c Update agriculturae-conspectus-scientificus.csl (JabRef#4510)
615377e Create international-journal-of-population-data-science.csl (JabRef#4517)
fe7cb69 Update university-of-york-apa.csl
f0c7374 Fix AGLC Subsequents
6a8ec90 More Uni Gottingen fixes
9c0f5c6 Update associacao-brasileira-de-normas-tecnicas-ufrgs.csl (JabRef#4460)
22ef83d Update Universitatsmedizin Gottingen
d2f90c9 Create drying-technology.csl (JabRef#4515)
01e339b Create terrorism-and-political-violence.csl (JabRef#4514)
6414c15 Create international-journal-of-hyperthermia.csl (JabRef#4513)
f80b38c Create Sciences Po - Ecole doctorale (note, French) (JabRef#4486)
6a22929 Update instituto-brasileiro-de-informacao-em-ciencia-e-tecnologia-abn… (JabRef#4508)
19c89f5 Create citation-compass-apa-note.csl (JabRef#4500)
fe72590 Chicago fixes & add no-ibid variant (JabRef#4503)
d602477 Update agriculturae-conspectus-scientificus.csl (JabRef#4505)
8a8911b Create mediterranean-journal-of-chemistry.csl (JabRef#4506)
ce77b28 Create conservation-and-society.csl (JabRef#4507)
25a5092 Add IMS journals (JabRef#4496)
a39430e Create rmit-university-harvard.csl (JabRef#4504)
830aa7b Update john-benjamins-publishing-company-collective-volumes.csl (JabRef#4444)
43e9216 Create PHBern IVP (JabRef#4427)
a052fd6 Create Publications du Groupe d'anthropologie et d'archéologie funéra… (JabRef#4499)
a7e12e1 Further improve legal cites for BJPS (JabRef#4497)
744a507 Update agriculturae-conspectus-scientificus.csl (JabRef#4498)
bfffaed APA: Fix sort order for in-text citations (JabRef#4495)
c48d08b Add "Blood Cancer Discovery" for AACR (JabRef#4492)
f628cb2 Medizinische Fakultät Mannheim - Numerisch (JabRef#4490)
77876a4 Improve legal cites for british-journal-of-political-science (JabRef#4488)
3c0c4ee Create apa-with-abstract.csl (JabRef#4487)
a26fa95 Update afte-journal.csl (JabRef#4489)
a7bf678 Create agriculturae-conspectus-scientificus.csl (JabRef#4491)
bb01625 Make ET&C dependent of CSE (JabRef#4483)
b4418ef Create ahmad-ibrahim-kulliyyah-of-laws-international-islamic-universi… (JabRef#4482)
22872d2 APA: Use "et al." in Dutch (JabRef#4484)
5f6c080 Update weed-research.csl (JabRef#4485)
b2fbe15 APA 7th edition (JabRef#4419)
c236ade Create BFCN.csl (JabRef#4481)
25d40cd Update iso690-full-note-cs.csl (JabRef#4480)
5de3904 Update budownictwo-i-architektura-pl.csl (JabRef#4479)
9d9c1da Add files via upload (JabRef#4478)
96200b0 Create instituto-alberto-luiz-coimbra-de-pos-graduacao-e-pesquisa-de-… (JabRef#4476)
8aa9cb0 Update APA journal styles (JabRef#4475)
8549afa Update in-text citation for legal_case for BJPS (JabRef#4470)
71c9e4d Update surgical-neurology-international.csl (JabRef#4472)
a9dac17 Create FUNDING.yml
633e864 Create helsingin-yliopisto-teologinen-tiedekunta-teologian-tyyli.csl (JabRef#4303)
8797c01 Create romanian-iso-690-full-note-with-ibid-romanian.csl (JabRef#4465)
c1519e1 Create assosiation-of-firearms-and-toolmark-examiners.csl (JabRef#4468)
c974e30 Update ieee.csl (JabRef#4467)
a1b7386 Update stale.yml (JabRef#4466)
db549dd Update ruhr-universitat-bochum-lehrstuhl-fur-industrial-sales-and-ser… (JabRef#4462)
2822437 Update .travis.yml (JabRef#4463)
3d72c62 WIP: Adding deprecation notice to DIN1505-2 saying it has been superseded by ISO 690 (JabRef#4454)
1928c2b Fix links after KI update
fad65b7 Turn Kidney International into AMA dependent
6357af5 Update association-for-computing-machinery.csl (JabRef#4459)
eab02ea Create berlin-school-of-economics-and-law-international-marketing-man… (JabRef#3774)
a3e3d97 One more metadata fix
e7d5071 Some Sheldon metadata fixes
3ad4260 Create jurnal-sains-farmasi-dan-klinis.csl (JabRef#4455)
46370dc Add "AIMS Press" journals (JabRef#4458)
57fca07 Update association-for-computing-machinery.csl (JabRef#4456)
6fa90ed Add "Muséum national d'Histoire naturelle" journal styles (JabRef#4457)
7faf0b0 Bundle update
e3c1f85 Create cryptogamie, bryologie (JabRef#4350)
525bba5 Create iso690-full-note-cs.csl (JabRef#4414)
932fad5 Create iso690-author-date-de.csl (JabRef#4344)
ab23108 Create mbts-fullnote-bibliography.csl (JabRef#4363)
c163008 Create associacao-brasileira-de-normas-tecnicas-ibict-full.csl (JabRef#4202)
5586bbc Create associacao-brasileira-de-normas-tecnicas-ibict-initials.csl (JabRef#4203)
483efcb Update ruhr-universitat-bochum-lehrstuhl-fur-industrial-sales-and-service-engineering.csl (JabRef#4442)
92f437d Create independent style for molecular-nutrition-and-food-research.csl… (JabRef#4342)
0d7f481 Update taylor-and-francis-council-of-science-editors-author-date.csl (JabRef#4385)
2b2786b Create ritid-timarit-hugvisindastofnunnar.csl (JabRef#4315)
9534999 Create jsbm.csl (JabRef#4371)
b390657 Changed term on access macro, added rules for bill (JabRef#4407)
95c24f9 Create ecausp-abnt.csl (JabRef#4420)
66ca962 Reindent/reorder
91fefee Create materials-express.csl (JabRef#4445)
ea5d50b Create institut-catholique-de-paris.csl (JabRef#4450)
a4c07e2 Create institut-catholique-de-paris.csl (JabRef#4374)
8a17ae0 Update canadian-geotechnical-journal.csl (JabRef#4447)
7165db0 Update ens-de-lyon-centre-d-ingenierie-documentaire.csl (JabRef#4448)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: e106215
github-actions bot pushed a commit to zeabin/jabref that referenced this pull request Feb 7, 2020
e106215 Create annales-de-demographie-historique.csl (JabRef#4512)
4dd974e Create lauterbornia.csl (JabRef#4525)
e5277ae Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4551)
f9cfe40 Add new IOP dependents (JabRef#4549)
daff985 Create brazilian-journal-of-veterinary-research-and-animal-science.csl (JabRef#4544)
10c6fa8 Update ens-de-lyon-centre-d-ingenierie-documentaire.csl (JabRef#4545)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: e106215
github-actions bot pushed a commit to NikodemKch/jabref-1 that referenced this pull request Feb 12, 2020
059ea33 Small capitals and categories (JabRef#4556)
97b8c84 Create CSL Styles: estudios_hispanicos.csl (JabRef#4557)
57e0f9d Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4552)
f481ea3 Create ipb-ppki-3.csl (JabRef#4550)
899d302 Update journal-of-neolithic-archaeology.csl (JabRef#4553)
e106215 Create annales-de-demographie-historique.csl (JabRef#4512)
4dd974e Create lauterbornia.csl (JabRef#4525)
e5277ae Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4551)
f9cfe40 Add new IOP dependents (JabRef#4549)
daff985 Create brazilian-journal-of-veterinary-research-and-animal-science.csl (JabRef#4544)
10c6fa8 Update ens-de-lyon-centre-d-ingenierie-documentaire.csl (JabRef#4545)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 059ea33
github-actions bot pushed a commit to CaptainDaVinci/jabref that referenced this pull request Feb 15, 2020
9e81857 Update marine-ornithology.csl (JabRef#4566)
938537e Update government-and-opposition.csl (JabRef#4564)
50d0635 Update annales-de-demographie-historique.csl (JabRef#4560)
42b54d9 Create marine-ornithology.csl (JabRef#4559)
eff41bb Create dermatology-online.csl (JabRef#4558)
3911696 Update journal-of-forensic-sciences.csl (JabRef#4554)
059ea33 Small capitals and categories (JabRef#4556)
97b8c84 Create CSL Styles: estudios_hispanicos.csl (JabRef#4557)
57e0f9d Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4552)
f481ea3 Create ipb-ppki-3.csl (JabRef#4550)
899d302 Update journal-of-neolithic-archaeology.csl (JabRef#4553)
e106215 Create annales-de-demographie-historique.csl (JabRef#4512)
4dd974e Create lauterbornia.csl (JabRef#4525)
e5277ae Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4551)
f9cfe40 Add new IOP dependents (JabRef#4549)
daff985 Create brazilian-journal-of-veterinary-research-and-animal-science.csl (JabRef#4544)
10c6fa8 Update ens-de-lyon-centre-d-ingenierie-documentaire.csl (JabRef#4545)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 9e81857
github-actions bot pushed a commit that referenced this pull request Feb 15, 2020
9e81857 Update marine-ornithology.csl (#4566)
938537e Update government-and-opposition.csl (#4564)
50d0635 Update annales-de-demographie-historique.csl (#4560)
42b54d9 Create marine-ornithology.csl (#4559)
eff41bb Create dermatology-online.csl (#4558)
3911696 Update journal-of-forensic-sciences.csl (#4554)
059ea33 Small capitals and categories (#4556)
97b8c84 Create CSL Styles: estudios_hispanicos.csl (#4557)
57e0f9d Update sciences-po-ecole-doctorale-note-french.csl (#4552)
f481ea3 Create ipb-ppki-3.csl (#4550)
899d302 Update journal-of-neolithic-archaeology.csl (#4553)
e106215 Create annales-de-demographie-historique.csl (#4512)
4dd974e Create lauterbornia.csl (#4525)
e5277ae Update sciences-po-ecole-doctorale-note-french.csl (#4551)
f9cfe40 Add new IOP dependents (#4549)
daff985 Create brazilian-journal-of-veterinary-research-and-animal-science.csl (#4544)
10c6fa8 Update ens-de-lyon-centre-d-ingenierie-documentaire.csl (#4545)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 9e81857
github-actions bot pushed a commit to abepolk/jabref that referenced this pull request Feb 15, 2020
9e81857 Update marine-ornithology.csl (JabRef#4566)
938537e Update government-and-opposition.csl (JabRef#4564)
50d0635 Update annales-de-demographie-historique.csl (JabRef#4560)
42b54d9 Create marine-ornithology.csl (JabRef#4559)
eff41bb Create dermatology-online.csl (JabRef#4558)
3911696 Update journal-of-forensic-sciences.csl (JabRef#4554)
059ea33 Small capitals and categories (JabRef#4556)
97b8c84 Create CSL Styles: estudios_hispanicos.csl (JabRef#4557)
57e0f9d Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4552)
f481ea3 Create ipb-ppki-3.csl (JabRef#4550)
899d302 Update journal-of-neolithic-archaeology.csl (JabRef#4553)
e106215 Create annales-de-demographie-historique.csl (JabRef#4512)
4dd974e Create lauterbornia.csl (JabRef#4525)
e5277ae Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4551)
f9cfe40 Add new IOP dependents (JabRef#4549)
daff985 Create brazilian-journal-of-veterinary-research-and-animal-science.csl (JabRef#4544)
10c6fa8 Update ens-de-lyon-centre-d-ingenierie-documentaire.csl (JabRef#4545)
c531528 create mcgill9-en.csl, Canadian McGill legal style (JabRef#4532)
e2416fa Update clinical-and-experimental-optometry.csl (JabRef#4538)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 9e81857
github-actions bot pushed a commit to calixtus/jabref that referenced this pull request Feb 17, 2020
aa52aaa Encrypt Travis CI notification email addresses (JabRef#4570)
d8f2843 Update ayer.csl (JabRef#4569)
448e67e Create ayer.csl (JabRef#4565)
bf1ddae Update springer-basic-author-date.csl (JabRef#4562)
db525ac Update american-journal-of-physical-anthropology.csl (JabRef#4567)
9e81857 Update marine-ornithology.csl (JabRef#4566)
938537e Update government-and-opposition.csl (JabRef#4564)
50d0635 Update annales-de-demographie-historique.csl (JabRef#4560)
42b54d9 Create marine-ornithology.csl (JabRef#4559)
eff41bb Create dermatology-online.csl (JabRef#4558)
3911696 Update journal-of-forensic-sciences.csl (JabRef#4554)
059ea33 Small capitals and categories (JabRef#4556)
97b8c84 Create CSL Styles: estudios_hispanicos.csl (JabRef#4557)
57e0f9d Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4552)
f481ea3 Create ipb-ppki-3.csl (JabRef#4550)
899d302 Update journal-of-neolithic-archaeology.csl (JabRef#4553)
e106215 Create annales-de-demographie-historique.csl (JabRef#4512)
4dd974e Create lauterbornia.csl (JabRef#4525)
e5277ae Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4551)
f9cfe40 Add new IOP dependents (JabRef#4549)
daff985 Create brazilian-journal-of-veterinary-research-and-animal-science.csl (JabRef#4544)
10c6fa8 Update ens-de-lyon-centre-d-ingenierie-documentaire.csl (JabRef#4545)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: aa52aaa
github-actions bot pushed a commit to systemoperator/jabref that referenced this pull request Feb 26, 2020
f03dece Bump nokogiri from 1.10.7 to 1.10.8 (JabRef#4580)
31bacc1 JCL: Fix formatting & space before locator
adfc9b0 Add The Journal of Comparative Law (JabRef#4576)
599d39c Create uni-freiburg-geschichte.csl (JabRef#4561)
3ad8d40 Add Begell House styles (JabRef#4575)
223527b Create begell-apa.csl (JabRef#4574)
d73b9a9 Update journal-of-neolithic-archaeology.csl (JabRef#4572)
5b2810c Create anatomical-sciences-education.csl (JabRef#4573)
9454897 Update ASA style
b3c6efd Reorder/reindent (JabRef#4571)
aa52aaa Encrypt Travis CI notification email addresses (JabRef#4570)
d8f2843 Update ayer.csl (JabRef#4569)
448e67e Create ayer.csl (JabRef#4565)
bf1ddae Update springer-basic-author-date.csl (JabRef#4562)
db525ac Update american-journal-of-physical-anthropology.csl (JabRef#4567)
9e81857 Update marine-ornithology.csl (JabRef#4566)
938537e Update government-and-opposition.csl (JabRef#4564)
50d0635 Update annales-de-demographie-historique.csl (JabRef#4560)
42b54d9 Create marine-ornithology.csl (JabRef#4559)
eff41bb Create dermatology-online.csl (JabRef#4558)
3911696 Update journal-of-forensic-sciences.csl (JabRef#4554)
059ea33 Small capitals and categories (JabRef#4556)
97b8c84 Create CSL Styles: estudios_hispanicos.csl (JabRef#4557)
57e0f9d Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4552)
f481ea3 Create ipb-ppki-3.csl (JabRef#4550)
899d302 Update journal-of-neolithic-archaeology.csl (JabRef#4553)
e106215 Create annales-de-demographie-historique.csl (JabRef#4512)
4dd974e Create lauterbornia.csl (JabRef#4525)
e5277ae Update sciences-po-ecole-doctorale-note-french.csl (JabRef#4551)
f9cfe40 Add new IOP dependents (JabRef#4549)
daff985 Create brazilian-journal-of-veterinary-research-and-animal-science.csl (JabRef#4544)
10c6fa8 Update ens-de-lyon-centre-d-ingenierie-documentaire.csl (JabRef#4545)

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

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants