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.

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

Fix #5862. #5868

Merged
merged 1 commit into from
Jan 25, 2020
Merged

Fix #5862. #5868

merged 1 commit into from
Jan 25, 2020

Conversation

tobiasdiez
Copy link
Member

It was indeed the throttler (at least it is working now for me)

@tobiasdiez tobiasdiez added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jan 25, 2020
@Siedlerchr Siedlerchr merged commit 24420e7 into master Jan 25, 2020
@Siedlerchr Siedlerchr deleted the fix5862 branch January 25, 2020 16:23
Siedlerchr added a commit that referenced this pull request Jan 26, 2020
# By Carl Christian Snethlage (9) and others
# Via Carl Christian Snethlage (5) and GitHub (1)
* upstream/master:
  Fixed Test
  Refactored constructors, PreferencesService and some minor improvements.
  Remove ampersand escape when writing to bib file (#5869)
  Fix #5862. It was indeed the throttler (at least it is working now for me) (#5868)
  duplicate query parameter removed (#5865)
  Minor refactoring, and changed comment
  forgotten l10n resources
  Minor visual adjustments
  Removed description, fixed ok button and added some minor improvements
  Moved GroupDescription-stuff to proper class
  Added hintTextFlow, some rewording and changed the hierarchicalContext RadioButtons to a ComboBox
  Converted GroupDialog to mvvm pattern

# Conflicts:
#	src/main/resources/l10n/JabRef_en.properties
Siedlerchr added a commit that referenced this pull request Jan 30, 2020
* master: (297 commits)
  Replace link to Workspace set-up with new one (#5896)
  Fixes making paths of linked files relative (web urls will not be touched anymore) (#5879)
  Switch to our IntelliJ config (#5881)
  Bump unirest-java from 3.4.00 to 3.4.01 (#5874)
  Bump junit-vintage-engine from 5.5.2 to 5.6.0 (#5875)
  Bump checkstyle from 8.28 to 8.29 (#5876)
  Bump junit-jupiter from 5.5.2 to 5.6.0 (#5877)
  Bump junit-platform-launcher from 1.5.2 to 1.6.0 (#5878)
  Change \ to /
  Bump byte-buddy-parent from 1.10.6 to 1.10.7 (#5873)
  Fix opening pdf with okular in linux (#5253) (#5855)
  Fixed Test
  Refactored constructors, PreferencesService and some minor improvements.
  Remove ampersand escape when writing to bib file (#5869)
  Fix #5862. It was indeed the throttler (at least it is working now for me) (#5868)
  duplicate query parameter removed (#5865)
  New Crowdin translations (#5864)
  Minor refactoring, and changed comment
  Bump antlr4 from 4.7.2 to 4.8-1 (#5852)
  Reintroducing master table index column (#5844)
  ...
koppor pushed a commit that referenced this pull request Feb 1, 2022
76f23a2 Fix the order for conference papers in APA styles (#5875)
5125c43 Fix bibliography date sorting (#5876)
873df06 Change order of publisher and publisher-place (#5874)
8066c66 Fix independent for BioScientific Review
9cc567e Add AMA brackets w 2 dependents (#5871)
c33dd24 Create medicine-publishing.csl (#5866)
9cb9cdb Fishery&wildlife journals: Remove publishers for articles (#5868)
fbd9165 Update universitatsmedizin-gottingen.csl (#5864)
c563f03 Update mla8 and mla9 (#5859)
98d6a03 [ASM] Add DOI for preprints. (#5862)
05e7071 Create current-neurology-aktualnosci-neurologiczne.csl (#5858)
78d771d Update journal-of-clinical-neurophysiology.csl (#5857)

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: 76f23a2
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.

2 participants