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

Conversion of Preferences/TableColumnsTab to mvvm #5185

Merged
merged 41 commits into from
Sep 8, 2019
Merged

Conversion of Preferences/TableColumnsTab to mvvm #5185

merged 41 commits into from
Sep 8, 2019

Commits on Aug 10, 2019

  1. Initial

    @calixtus
    calixtus committed Aug 10, 2019
    Configuration menu
    Copy the full SHA
    3d891ca View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2019

  1. Added contents of the list and bindings

    @calixtus
    calixtus committed Aug 11, 2019
    Configuration menu
    Copy the full SHA
    90c4444 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into preferences_mvvm_… 

    …tablecolumns
    @calixtus
    calixtus committed Aug 11, 2019
    Configuration menu
    Copy the full SHA
    eace48d View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2019

  1. Initial

    @calixtus
    calixtus committed Aug 18, 2019
    Configuration menu
    Copy the full SHA
    f5645ae View commit details
    Browse the repository at this point in the history

  2. Added contents of the list and bindings

    @calixtus
    calixtus committed Aug 18, 2019
    Configuration menu
    Copy the full SHA
    c0cfaba View commit details
    Browse the repository at this point in the history

  3. Refactored specialFields

    @calixtus
    calixtus committed Aug 18, 2019
    Configuration menu
    Copy the full SHA
    1ea512c View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/master' into preferences_mvvm_… 

    …tablecolumns

# Conflicts:
#	src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
    @calixtus
    calixtus committed Aug 18, 2019
    Configuration menu
    Copy the full SHA
    51a412d View commit details
    Browse the repository at this point in the history

  5. Added checking, storing and specialFields

    @calixtus
    calixtus committed Aug 18, 2019
    Configuration menu
    Copy the full SHA
    79ff2f6 View commit details
    Browse the repository at this point in the history

  6. Fix specialField, l10n

    @calixtus
    calixtus committed Aug 18, 2019
    Configuration menu
    Copy the full SHA
    146fe74 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2019

  1. Added add and remove custom column, refactor

    @calixtus
    calixtus committed Aug 22, 2019
    Configuration menu
    Copy the full SHA
    d66383a View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2019

  1. Fixes unintentional sorting, added moving columns up and down

    @calixtus
    calixtus committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    1a7a44d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into preferences_mvvm_… 

    …tablecolumns
    @calixtus
    calixtus committed Aug 23, 2019
    Configuration menu
    Copy the full SHA
    b4b11f2 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2019

  1. Refactoring, added update of MainTable

    @calixtus
    calixtus committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    0b6fcda View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into preferences_mvvm_… 

    …tablecolumns
    @calixtus
    calixtus committed Aug 24, 2019
    Configuration menu
    Copy the full SHA
    9c15843 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2019

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

    …tablecolumns
    @calixtus
    calixtus committed Aug 25, 2019
    Configuration menu
    Copy the full SHA
    7b6179e View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2019

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

    …tablecolumns
    @calixtus
    calixtus committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    0c77201 View commit details
    Browse the repository at this point in the history

  2. Refactored to TableView, Added ComboBox

    @calixtus
    calixtus committed Aug 26, 2019
    Configuration menu
    Copy the full SHA
    9282a82 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2019

  1. Fixed bug in ui update

    @calixtus
    calixtus committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    6992688 View commit details
    Browse the repository at this point in the history

  2. Refactor and rewording to clean up

    @calixtus
    calixtus committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    b640388 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into preferences_mvvm_… 

    …tablecolumns
    @calixtus
    calixtus committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    0412168 View commit details
    Browse the repository at this point in the history

  4. Changed table order reload icon

    @calixtus
    calixtus committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    4b5b607 View commit details
    Browse the repository at this point in the history

  5. Refactor to save special fields column order, rewording

    @calixtus
    calixtus committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    b6f728c View commit details
    Browse the repository at this point in the history

  6. Refactor mvvm

    @calixtus
    calixtus committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    1f03afa View commit details
    Browse the repository at this point in the history

  7. Removed now superfluous restart message

    @calixtus
    calixtus committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    4790442 View commit details
    Browse the repository at this point in the history

  8. l10n

    @calixtus
    calixtus committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    e5759e4 View commit details
    Browse the repository at this point in the history

  9. Refactor for order

    @calixtus
    calixtus committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    043858a View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2019

  1. Merge branch 'preferences_mvvm_tablecolumns' of https://github.com/ca… 

    …lixtus/jabref into preferences_mvvm_tablecolumns
    @calixtus
    calixtus committed Aug 31, 2019
    Configuration menu
    Copy the full SHA
    74c4e42 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into preferences_mvvm_… 

    …tablecolumns
    @calixtus
    calixtus committed Aug 31, 2019
    Configuration menu
    Copy the full SHA
    f1198f4 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2019

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

    …tablecolumns
    @calixtus
    calixtus committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    551740a View commit details
    Browse the repository at this point in the history

  2. Added validation, cleanup, and minor fix

    @calixtus
    calixtus committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    b368698 View commit details
    Browse the repository at this point in the history

  3. Refactored FieldsUtil for reuse

    @calixtus
    calixtus committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    dd79607 View commit details
    Browse the repository at this point in the history

  4. Resdolved merge errors

    @calixtus
    calixtus committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    4e78ae1 View commit details
    Browse the repository at this point in the history

  5. Refactored FieldsUtil for reuse

    @calixtus
    calixtus committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    fbfa701 View commit details
    Browse the repository at this point in the history

  6. Fixes and cleanups

    @calixtus
    calixtus committed Sep 3, 2019
    Configuration menu
    Copy the full SHA
    a5721cc View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2019

  1. Refactor and cleanups

    @calixtus
    calixtus committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    787896b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into preferences_mvvm_… 

    …tablecolumns

# Conflicts:
#	src/main/java/org/jabref/gui/util/FieldsUtil.java
#	src/main/resources/l10n/JabRef_en.properties
    @calixtus
    calixtus committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    e766834 View commit details
    Browse the repository at this point in the history

  3. Refactor to streams

    @calixtus
    calixtus committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    a599372 View commit details
    Browse the repository at this point in the history

  4. l10n

    @calixtus
    calixtus committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    dadd99a View commit details
    Browse the repository at this point in the history

  5. l10n again

    @calixtus
    calixtus committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    6832901 View commit details
    Browse the repository at this point in the history

  6. Cleanups

    @calixtus
    calixtus committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    651f3c2 View commit details
    Browse the repository at this point in the history

  7. Fix sorting bug

    @calixtus
    calixtus committed Sep 4, 2019
    Configuration menu
    Copy the full SHA
    5c8b76d View commit details
    Browse the repository at this point in the history