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

Remove help suffix at help pages #2004

Merged
merged 1 commit into from
Sep 17, 2016
Merged

Remove help suffix at help pages #2004

merged 1 commit into from
Sep 17, 2016

Conversation

koppor
Copy link
Member

@koppor koppor commented Sep 17, 2016

@koppor koppor added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Sep 17, 2016
@Siedlerchr Siedlerchr merged commit 3441766 into master Sep 17, 2016
@Siedlerchr Siedlerchr deleted the remove_help_suffix branch September 17, 2016 11:11
Siedlerchr added a commit that referenced this pull request Sep 17, 2016
* upstream/master: (103 commits)
  add id fetcher in biblatexmode (#2006)
  Check available help languages when opening specific help page (#2005)
  Remove help suffix at help pages (#2004)
  French localization: Jabref_fr: empty strings translated + correction of a glitch (#2000)
  Disable gradle daemon - maybe, this brings back the integration tests
  French localization: Menu: update (#1999)
  Introduce convienent interface for ID-based fetcher (#1998)
  Updated dependencies (#1994)
  Some minor code cleanups (#1991)
  Add missing calls to showEntryEditor (which ensures that currentEditor is right)
  Remove obsolete adjustSplitter calls
  Remove FocusRequester as it is not executed threaded
  Rename variable "form" to "editor"
  use JabRefPreferences.getInstance() to fix ci
  simplify code
  always use fetcherexception's message for output
  Quickfix: Time limit for integration tests
  Fix Exception when Close Dialog with 'X'
  Enable tests at CircleCI build to ensure that only binary passing the basic tests are released.
  Fix japanese language files
  ...

# Conflicts:
#	src/main/java/net/sf/jabref/logic/cleanup/RenamePdfCleanup.java
zesaro pushed a commit to zesaro/jabref that referenced this pull request Nov 22, 2016
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