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

Add submodule pull to circle ci and fix theme loading css #4443

Merged
merged 5 commits into from
Nov 1, 2018
Merged

Add submodule pull to circle ci and fix theme loading css #4443

merged 5 commits into from
Nov 1, 2018

Conversation

Siedlerchr
Copy link
Member

@Siedlerchr Siedlerchr commented Oct 31, 2018 •
edited
Loading

Fixes #4438

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

tobiasdiez
tobiasdiez approved these changes Oct 31, 2018
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.

Thanks for the quick fix. Looks good to me.

Probably we need to add the submodule checkout also to the "getting started" documentation. ?!

@Siedlerchr
Copy link
Member Author

Yeah, I will add it. Unfortunately the CSS theme loading still throws that exception. (not relevant to the csl stuff)

@Siedlerchr Siedlerchr changed the title Add submodule pull to circle ci Add submodule pull to circle ci and fix theme loading css Nov 1, 2018
@Siedlerchr Siedlerchr merged commit 11ddb8c into master Nov 1, 2018
@Siedlerchr Siedlerchr deleted the fixsubmodule branch November 1, 2018 10:46
Siedlerchr added a commit that referenced this pull request Nov 1, 2018
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into docbookfive
231b1eb 
* upstream/master:
  Add submodule pull to circle ci and fix theme loading css (#4443)
  fix groups drag and drop (#4439)
  Convert merge entries dialog to JavaFX (#4410)
  Fix ArrayIndexOutOfBoundsException on second pdf import (#4426)
  Fix radiobuttons in preference menu (#4409)
  Add citation styles as git submodule (#4431)
  Fix highlight color of selected text and progress bar (#4420)
  Fix two new issues
  Fix Violations of Always Use Braces (#4400)
  Delete PreferencesService.java.orig
  Add JabRef icon to installer and change watermark to JabRef (#4421)
  Checkstyle: force braces around code blocks
Siedlerchr added a commit that referenced this pull request Nov 3, 2018
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into improveFetcher
f340eec 
* upstream/master:
  New Crowdin translations (#4454)
  Fix error in l10n file: Toogle -> Toggle (#4453)
  Remove depandabot
  Bump junit-pioneer from 0.2.2 to 0.3.0 (#4451)
  Add Depandabot badge
  Emphasize that users should try out the newest version before reporting a bug
  Add a preference to add files in entry editor (#4408)
  Add submodule pull to circle ci and fix theme loading css (#4443)
  fix groups drag and drop (#4439)
Siedlerchr added a commit that referenced this pull request Nov 3, 2018
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into ooPanel
f9765fc 
* upstream/master:
  New Crowdin translations (#4454)
  Fix error in l10n file: Toogle -> Toggle (#4453)
  Remove depandabot
  Bump junit-pioneer from 0.2.2 to 0.3.0 (#4451)
  Add Depandabot badge
  Emphasize that users should try out the newest version before reporting a bug
  Add a preference to add files in entry editor (#4408)
  Add submodule pull to circle ci and fix theme loading css (#4443)
  fix groups drag and drop (#4439)
  Convert merge entries dialog to JavaFX (#4410)
  Fix ArrayIndexOutOfBoundsException on second pdf import (#4426)
  Fix radiobuttons in preference menu (#4409)
  Add citation styles as git submodule (#4431)
  Fix highlight color of selected text and progress bar (#4420)
  Fix two new issues
  Fix Violations of Always Use Braces (#4400)
  Delete PreferencesService.java.orig
  Add JabRef icon to installer and change watermark to JabRef (#4421)
  Checkstyle: force braces around code blocks
Siedlerchr added a commit that referenced this pull request Dec 11, 2019
@Siedlerchr
Squashed 'src/main/resources/csl-styles/' changes from f71cd32..49a1841
96c2e99 
49a1841 Update queen-margaret-university-harvard.csl (#4443)
f841560 Create uni-bern-institut-fur-musikwissenschaft-note.csl (#4401)
6ee503c Create harvard-cite-them-right-all-authors.csl (#4416)
3eceec4 Create harvard-queen-margaret-university.csl (#4441)
3c2299d JEMS.csl (#4436)
bb2f60f Create open-window.csl (#4430)
a908ab4 Nutrition Research Reviews (#4434)
208b693 Bump nokogiri from 1.10.3 to 1.10.4 (#4439)
122a3bb Create nmfs-west-coast-region-national-environmental-policy-act.csl (#4426)
3565fc2 Update tissue-engineering.csl (#4435)
981044e Create transposition.csl (#4375)
73ef6f3 Update tissue-engineering.csl (#4431)
7c4a4cf Update r-and-d-management.csl (#4432)
8628afb Create china-national-standard-gb-t-7714-2015-numeric.csl (#4065)
6ce148c removed spaces in harvard-gesellschaft-fur-bildung-und-forschung-in-europa.csl (#4422)
2af1c6f Create japanese-journal-of-applied-physics.csl (#4425)
fc16579 Add Presses universitaires de Strasbourg style (#4411)
01e58fb Correct spacing issues and documentation link (#4423)
d97cf3f Update geistes-und-kulturwissenschaften-heilmann.csl (#4421)
017947d Update ens-de-lyon-centre-d-ingenierie-documentaire.csl (#4413)
bffe57e Create instituto-de-pesquisas-energeticas-e-nucleares-sp.csl (#4368)
18686d1 Update and rename zeitschrift-fuer-digitale-geisteswissenschaften.csl… (#4410)
bd3a5f6 Final fix for journal article cit plus other updates - uniwersytet-im-adama-mickiewicza-w-poznaniu-wydzial-anglistyki (#4417)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 49a1841
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

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Siedlerchr @tobiasdiez