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

Post change conflict resolution dialog #8989

Merged
merged 50 commits into from
Jan 25, 2019
Merged

Post change conflict resolution dialog #8989

merged 50 commits into from
Jan 25, 2019

Commits on Jan 16, 2019

  1. added new PostsList status line with isConflicted status

    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    7b9e13c View commit details
    Browse the repository at this point in the history

  2. added post conflict resolution dialog

    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    5f52325 View commit details
    Browse the repository at this point in the history

  3. fixed tapping outside dialog has different meaning than negative butt… 

    …on click for conflict resolution dialog
    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    3b4fc9d View commit details
    Browse the repository at this point in the history

  4. removed empty line

    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    967184d View commit details
    Browse the repository at this point in the history

  5. udpated fluxc hash

    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    b3d5998 View commit details
    Browse the repository at this point in the history

  6. fixed merge conflict

    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    c20e57e View commit details
    Browse the repository at this point in the history

  7. changed label to Conflict instead of Conflicted

    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    6407037 View commit details
    Browse the repository at this point in the history

  8. changed label to more precise Version Conflict

    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    480b002 View commit details
    Browse the repository at this point in the history

  9. updated FluxC hash

    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    9379a3e View commit details
    Browse the repository at this point in the history

  10. added ic_gridicons_notice_outline

    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    bd87b46 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'develop' into issue/5984-post-change-conflict-resolution

    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    b40ce3a View commit details
    Browse the repository at this point in the history

  12. changed Posts list to check on lastModified and remoteLastModified fi… 

    …elds for conflict status
    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    cfffa2d View commit details
    Browse the repository at this point in the history

  13. added customMessageString support in DialogHolder for BasicDialog and… 

    … adjusted strings
    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    e0d6a0a View commit details
    Browse the repository at this point in the history

  14. moved unused getDate() method from MediaUtils to getFormattedDateForL… 

    …astModified() in PostUtils
    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    6c730bf View commit details
    Browse the repository at this point in the history

  15. fixed hour format

    @mzorz
    mzorz committed Jan 16, 2019
    Configuration menu
    Copy the full SHA
    8c2d9dc View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2019

  1. changed Cloud for web wording, and lowe case in Version conflict

    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    e4cbce5 View commit details
    Browse the repository at this point in the history

  2. added fixed viewportHeight/width for ic_gridicons_notice_outline

    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    8b33718 View commit details
    Browse the repository at this point in the history

  3. showing Local and Web sync dates separated in new lines

    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    d390a09 View commit details
    Browse the repository at this point in the history

  4. capitalized word Saved

    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    afad235 View commit details
    Browse the repository at this point in the history

  5. adding toast at start and snackbar at end of load remote post option

    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    0516716 View commit details
    Browse the repository at this point in the history

  6. removed empty line

    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    3297bf3 View commit details
    Browse the repository at this point in the history

  7. removed unused imports

    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    a634296 View commit details
    Browse the repository at this point in the history

  8. added desscription in release notes

    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    d0ba040 View commit details
    Browse the repository at this point in the history

  9. changed ic_gridicons_notice_outline icon for ic_gridicons_notice (fil… 

    …led) icon
    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    45470af View commit details
    Browse the repository at this point in the history

  10. changed strings and behavior to make conflict resolution discard loca… 

    …l or web version instead of keeping one or the other, and also added snackbar UNDO behavior
    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    73232fb View commit details
    Browse the repository at this point in the history

  11. removed unnecessary semicolon

    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    6c77914 View commit details
    Browse the repository at this point in the history

  12. removed unused string resource

    @mzorz
    mzorz committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    7fb776e View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2019

  1. now showing snackbar and only doing post upload when snackbar is dism… 

    …issed, to allow time for UNDO
    @mzorz
    mzorz committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    63a79bf View commit details
    Browse the repository at this point in the history

  2. fixed merge conflict

    @mzorz
    mzorz committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    7b6eae5 View commit details
    Browse the repository at this point in the history

  3. removed unnecessary semicolon

    @mzorz
    mzorz committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    8d724df View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2019

  1. fixed merge conflict

    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    8fe63c4 View commit details
    Browse the repository at this point in the history

  2. changed getFormattedDateForLastModified to use current Locale

    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    3c056cc View commit details
    Browse the repository at this point in the history

  3. changed variable name 'ms' in favor of more descriptive one 'timeSinc… 

    …eLastModified'
    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    c8bf650 View commit details
    Browse the repository at this point in the history

  4. removed misleading comment

    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    7a47a54 View commit details
    Browse the repository at this point in the history

  5. nullifying localPostIdForConflictResolutionDialog before action as it… 

    …'s not needed anymore
    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    9494851 View commit details
    Browse the repository at this point in the history

  6. renamed loadPostFromRemote() to updateConflictedPostWithItsRemoteVers… 

    …ion()
    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    4c92554 View commit details
    Browse the repository at this point in the history

  7. removed unnecessary nullifier and else statement

    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    b3bcec0 View commit details
    Browse the repository at this point in the history

  8. renamed method savePostFromLocal() to updateConflictedPostWithItsLoca… 

    …lVersion()
    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    77b8abd View commit details
    Browse the repository at this point in the history

  9. removed unnecessary nullifier call

    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    9a38333 View commit details
    Browse the repository at this point in the history

  10. Update WordPress/src/main/java/org/wordpress/android/viewmodel/posts/… 

    …PostListViewModel.kt

Co-Authored-By: mzorz <mariozorz@gmail.com>
    @oguzkocer @mzorz
    oguzkocer and mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    bc31729 View commit details
    Browse the repository at this point in the history

  11. removed unnecessary null check

    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    2aa2f97 View commit details
    Browse the repository at this point in the history

  12. bring null setters back to where they were

    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    fd320bc View commit details
    Browse the repository at this point in the history

  13. removed nonsense comment

    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    80abdf7 View commit details
    Browse the repository at this point in the history

  14. fixed merge conflict

    @mzorz
    mzorz committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    c649b84 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2019

  1. Simplify the undo logic for keeping local version of conflicted post

    @oguzkocer
    oguzkocer committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    fdde7d2 View commit details
    Browse the repository at this point in the history

  2. Post reference for conflict resolution dialog nullified early

    @oguzkocer
    oguzkocer committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    b65e851 View commit details
    Browse the repository at this point in the history

  3. Remote post conflict resolution uses OnPostChanged

    @oguzkocer
    oguzkocer committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    9f64fa7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #9107 from wordpress-mobile/issue/suggestions-for-… 

    …8989

Suggestions for the Post Conflict Resolution PR: 8989
    @mzorz
    mzorz committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    1844abf View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/develop' into issue/5984-post-ch… 

    …ange-conflict-resolution
    @oguzkocer
    oguzkocer committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    ac81971 View commit details
    Browse the repository at this point in the history

  6. Remove an unintended release note addition which was most likely caus… 

    …ed by a merge
    @oguzkocer
    oguzkocer committed Jan 24, 2019
    Configuration menu
    Copy the full SHA
    9896f85 View commit details
    Browse the repository at this point in the history