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

Refactor main table preferences #6518

Merged
merged 13 commits into from
May 28, 2020
Merged

Refactor main table preferences #6518

merged 13 commits into from
May 28, 2020

Commits on May 22, 2020

  1. Configuration menu
    Copy the full SHA
    2c1a69e View commit details
    Browse the repository at this point in the history

Commits on May 24, 2020

  1. Merged entry table tabs

    calixtus committed May 24, 2020
    Configuration menu
    Copy the full SHA
    2a5717c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ab50ca8 View commit details
    Browse the repository at this point in the history
  3. CHANGELOG.md

    calixtus committed May 24, 2020
    Configuration menu
    Copy the full SHA
    cb6804e View commit details
    Browse the repository at this point in the history
  4. Added cache and comments

    calixtus committed May 24, 2020
    Configuration menu
    Copy the full SHA
    c8949bd View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'upstream/master' into refactor_tableprefs

    # Conflicts:
    #	src/main/java/org/jabref/preferences/JabRefPreferences.java
    #	src/main/java/org/jabref/preferences/PreferencesService.java
    calixtus committed May 24, 2020
    Configuration menu
    Copy the full SHA
    ead191e View commit details
    Browse the repository at this point in the history

Commits on May 25, 2020

  1. Fixed main table refresh

    calixtus committed May 25, 2020
    Configuration menu
    Copy the full SHA
    d01f370 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b86800c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0bd2fd2 View commit details
    Browse the repository at this point in the history
  4. CHANGELOG.md

    calixtus committed May 25, 2020
    Configuration menu
    Copy the full SHA
    25bd506 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Merge remote-tracking branch 'upstream/master' into refactor_tableprefs

    # Conflicts:
    #	src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
    #	src/main/java/org/jabref/gui/maintable/MainTableNameFormatter.java
    calixtus committed May 28, 2020
    Configuration menu
    Copy the full SHA
    62f3038 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3135197 View commit details
    Browse the repository at this point in the history
  3. Fixed merge error

    calixtus committed May 28, 2020
    Configuration menu
    Copy the full SHA
    c1867e5 View commit details
    Browse the repository at this point in the history