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.

Sign up for GitHub

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

Jump to bottom

"Set up general fields" character check not correct & alphabetical ordering #5034

Merged
merged 5 commits into from
Jun 7, 2019
Merged

"Set up general fields" character check not correct & alphabetical ordering #5034

merged 5 commits into from
Jun 7, 2019

Conversation

yurickyh
Copy link
Contributor

@yurickyh yurickyh commented Jun 5, 2019 •
edited by Siedlerchr
Loading

As asked, the character '-' was included on the error message, also we included other characters that were not being mentioned on the message. We tried to remove the character '-' from KEY_ILLEGAL_CHARACTERS and KEY_UNWANTED_CHARACTERS on BibtexKeyGenerator.java, but we did not know if it would be a good idea because it violates some tests.
About the order of the tabs, we removed the alphabetical ordering so now it is following the order defined when the tabs are created on the "Set up general fields" option.

hyphen
order

This PR fixes #5019.

  • 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?)

yurickyh and others added 5 commits June 5, 2019 19:15
@yurickyh
Change TreeMap for LinkedHashMap on create function.
c612072 
The reason for changing the type of the object is because TreeMap automatically orders by the key.

Signed-off-by: kaiquekk <kaique.komata@gmail.com>
Signed-off-by: yurickyh <yurickyussuke@hotmail.com>
@yurickyh
Remove the character '-' on KEY_ILLEGAL_CHARACTERS and KEY_UNWANTED_C…
d78997c 
…HARACTERS constants.

The character '-' was removed because it was not able to use it when defining a new field.

Signed-off-by: kaiquekk <kaique.komata@gmail.com>
Signed-off-by: yurickyh <yurickyussuke@hotmail.com>
@kaiquekk
Add changes in CHANGELOG.
ad6e549 
Signed-off-by: kaiquekk <kaique.komata@gmail.com>
@kaiquekk
Fix checkstyle error.
c527f71 
Signed-off-by: kaiquekk <kaique.komata@gmail.com>
@kaiquekk
Remove option to name a field with hyphen.
57782e4 
Remove the option to name a custom general field containing a hyphen and
update the error message to be more clear about it.

Signed-off-by: kaiquekk <kaique.komata@gmail.com>
@Siedlerchr Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jun 6, 2019
tobiasdiez
tobiasdiez approved these changes Jun 6, 2019
View reviewed changes
Copy link
Member

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks for your contribution!

@Siedlerchr
Copy link
Member

LGTM! Thank you very much for your contribution Would you please add a note on the allowed chars in the help?
http://help.jabref.org/en/GeneralFields (At the bottom click "Edit this page")

@Siedlerchr Siedlerchr merged commit 2e808c2 into JabRef:master Jun 7, 2019
github-actions bot pushed a commit to dimitra-karadima/jabref that referenced this pull request Nov 15, 2020
Squashed 'src/main/resources/csl-styles/' changes from 5297abd..55200d0
188e1e3 
55200d0 Create computational-intelligence.csl (JabRef#5102)
6d2efc3 Merge branch 'master' of github.com:citation-style-language/styles
60ab0fb Add Steinbeis SMI
d5e0130 Add AAQR Style
d964f9b Create bitonline-publikationen.csl (JabRef#5090)
0dc1a56 Add "APA 7th edition" to Norsk APA style titles (JabRef#5098)
3b6aaf7 Update norsk-apa-manual.csl (JabRef#5095)
0139c63 Create technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl (JabRef#5034)
fdc4497 Update universidade-estadual-de-alagoas-abnt (JabRef#5085)
afdc2ea Create revista-espanola-de-nutricion-humana-y-dietetica.csl (JabRef#5082)
939189d Create citation-compass-apa-note-no.csl (JabRef#5060)
414f5e6  brazilian-journal-of-veterinary-research: add bib sorting (JabRef#5091)
dbae9d7 Add DOI to Thieme German
f4399aa APA: match="any" bugfixes (JabRef#5092)
d0cc2c4 Add APA numeric and update BioEssays (JabRef#5089)
5c376b8 Create karlstad-universitet-kau-harvard-swedish.csl (JabRef#5083)
6a62c24 Create ucl-institute-of-education-harvard.csl (JabRef#5084)
4d1bbb0 Update ferdinand-porsche-fern-fachhochschule.csl (JabRef#5073)
3a9f494 Update cureus.csl (JabRef#5087)
181c0dd Create apa-no.csl (JabRef#5059)
651ce48 Some fixes for Advanced Functional Materials (JabRef#5080)
4e3297a Acta Zoologica Hungarica: Don't demote nd particles
c659df7 Create medicina-delle-dipendenze-italian-journal-of-the-addictions.csl (JabRef#5078)
d243055 Update geografia-fisica-e-dinamica-quaternaria.csl (JabRef#5079)
1ee3809 Update mcgill-en.csl (JabRef#5076)
949cdc6 Update mcgill-fr.csl (JabRef#5075)
ee7d4e1 Create chem-catalysis.csl (JabRef#5074)
ec9faec Switch Molecular Therapy to Cell (JabRef#5070)
cf6034c Switch Elsevier to their own ad-vancouver (JabRef#5072)
78cca13 Updates in research-institute-for-nature-and-forest.csl (JabRef#4958)
68b7478 Update journal-of-neolithic-archaeology.csl (JabRef#5065)
524ba93 Create offa.csl (JabRef#5066)
9713a82 Update associacao-brasileira-de-normas-tecnicas-ufrgs-note-initials-with-ibid (JabRef#5067)
44449df Uodate associacao-brasileira-de-normas-tecnicas-ufrgs-initials.csl (JabRef#5061)
baf9efa Create İstanbul Üniversitesi Sosyal Bilimler Enstitüsü Ali Ekber Çına… (JabRef#5064)
c5c3531 Fix CORR
853a804 Major Update mcgill-fr.csl to 9th ed. (JabRef#5057)
d3e2cd9 Update mcgill-en.csl (JabRef#5056)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 55200d0
github-actions bot pushed a commit that referenced this pull request Nov 15, 2020
Squashed 'src/main/resources/csl-styles/' changes from f4399aa..55200d0
32761d9 
55200d0 Create computational-intelligence.csl (#5102)
6d2efc3 Merge branch 'master' of github.com:citation-style-language/styles
60ab0fb Add Steinbeis SMI
d5e0130 Add AAQR Style
d964f9b Create bitonline-publikationen.csl (#5090)
0dc1a56 Add "APA 7th edition" to Norsk APA style titles (#5098)
3b6aaf7 Update norsk-apa-manual.csl (#5095)
0139c63 Create technische-universitat-dresden-betriebswirtschaftslehre-rechnungswesen-controlling.csl (#5034)
fdc4497 Update universidade-estadual-de-alagoas-abnt (#5085)
afdc2ea Create revista-espanola-de-nutricion-humana-y-dietetica.csl (#5082)
939189d Create citation-compass-apa-note-no.csl (#5060)
414f5e6  brazilian-journal-of-veterinary-research: add bib sorting (#5091)
dbae9d7 Add DOI to Thieme German

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

@tobiasdiez tobiasdiez tobiasdiez approved these changes

@Siedlerchr Siedlerchr Siedlerchr approved these changes

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.

"Set up general fields" character check not correct & alphabetical ordering
4 participants
@yurickyh @Siedlerchr @tobiasdiez @kaiquekk