Skip to content

Conversation

@koppor
Copy link
Member

@koppor koppor commented Mar 31, 2018

This enables on OAI2HandlerFetcherTest

@koppor koppor mentioned this pull request Mar 31, 2018
8 tasks
}

@Test
@Disabled
Copy link
Member

Choose a reason for hiding this comment

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

Why not fix the test instead disabling it?

@koppor
Copy link
Member Author

koppor commented Mar 31, 2018 via email

@Siedlerchr Siedlerchr merged commit 0b2db53 into maintable-beta Mar 31, 2018
@Siedlerchr Siedlerchr deleted the exchange-ignore-by-disabled branch March 31, 2018 21:04
Siedlerchr added a commit that referenced this pull request Apr 1, 2018
…drop

* upstream/maintable-beta:
  Fix checkstyle
  Exchange Ignore by Disabled (#3912)
  Remove all @author comments and empty method/class comments
Siedlerchr added a commit that referenced this pull request Apr 1, 2018
…gsjavafx

* upstream/maintable-beta: (188 commits)
  Fix checkstyle
  Exchange Ignore by Disabled (#3912)
  Remove all @author comments and empty method/class comments
  Clean unused imports
  Fix missing icons and wrong package for custom icons
  Consistent FX color scheme for JabRef (#3839)
  javafx replacement for file dialog (#3005)
  Reenable closing of entry preview by pressing Esc (#3883)
  Load all field editors using ViewLoader
  Use JabRef icons in FXML
  Move icon stuff to new package gui.icon
  Load EntryEditor using new ViewLoader
  Improve tooltip tests
  Fix import thread problem
  Don't use null as parameter in DialogService
  Make it easier to create FXML dialogs (#3880)
  update slf4j from 1.8.0-beta1 -> 1.8.0-beta2
  New translations JabRef_en.properties (Tagalog)
  New translations JabRef_en.properties (Italian)
  New translations Menu_en.properties (Italian)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/JabRefFrame.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants