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

Use dialog for external changes #1309

Merged
merged 46 commits into from
Jul 9, 2023
Merged

Use dialog for external changes #1309

merged 46 commits into from
Jul 9, 2023

Commits on Mar 23, 2023

  1. Ignore external changes after "Continue"

    Jeremy Wootten committed Mar 23, 2023
    Configuration menu
    Copy the full SHA
    0987e69 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2023

  1. Reload or Overwrite options

    Jeremy Wootten committed Mar 24, 2023
    Configuration menu
    Copy the full SHA
    3cc29cf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into fix-external-edit

    Jeremy Wootten authored Mar 24, 2023
    Configuration menu
    Copy the full SHA
    d3fdc67 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2023

  1. Merge branch 'master' into fix-external-edit 

    # Conflicts:
#	src/Services/Document.vala
    Jeremy Wootten committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    9db86e1 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. Merge branch 'master' into fix-external-edit

    Jeremy Wootten authored Mar 28, 2023
    Configuration menu
    Copy the full SHA
    34cb3f2 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. Add AskSaveDialog.vala

    Jeremy Wootten committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    d6d16f4 View commit details
    Browse the repository at this point in the history

  2. Introduce "locked" document state

    Jeremy Wootten committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    e9f3e3a View commit details
    Browse the repository at this point in the history

  3. Lock document during loading; unlock after if writable

    Jeremy Wootten committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    3cedc1f View commit details
    Browse the repository at this point in the history

  4. Stop some functions if locked

    Jeremy Wootten committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    88c2bbf View commit details
    Browse the repository at this point in the history

  5. Modify save and save as functions for locked

    Jeremy Wootten committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    bad0f37 View commit details
    Browse the repository at this point in the history

  6. Make some funcs private

    Jeremy Wootten committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    3c821f2 View commit details
    Browse the repository at this point in the history

  7. Modify check file status function for locked

    Jeremy Wootten committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    0d35093 View commit details
    Browse the repository at this point in the history

  8. Rewrite ask save location for dialog and locked

    Jeremy Wootten committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    d3e300e View commit details
    Browse the repository at this point in the history

  9. Compile dialog

    Jeremy Wootten committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    eef32ab View commit details
    Browse the repository at this point in the history

  10. Minor improvements

    Jeremy Wootten committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    453ccc4 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Start unlocked after loading

    Jeremy Wootten committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    2411124 View commit details
    Browse the repository at this point in the history

  2. Handle closing changed locked documents

    Jeremy Wootten committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    3826760 View commit details
    Browse the repository at this point in the history

  3. Update saved status when locked status changes

    Jeremy Wootten committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    ee5cbdb View commit details
    Browse the repository at this point in the history

  4. Amend tab tooltip when locked

    Jeremy Wootten committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    a2c3a6d View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2023

  1. Merge branch 'master' into fix-external-edit

    @zeebok
    zeebok authored Apr 15, 2023
    Configuration menu
    Copy the full SHA
    984f97b View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2023

  1. Merge branch 'fix-external-edit' into ask-savelocation-dialog 

    # Conflicts:
#	src/Services/Document.vala
    Jeremy Wootten committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    4658618 View commit details
    Browse the repository at this point in the history

  2. Rework external changes with dialog

    Jeremy Wootten committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    fb3e173 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into ask-savelocation-dialog

    Jeremy Wootten authored Apr 16, 2023
    Configuration menu
    Copy the full SHA
    9e2bc94 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'ask-savelocation-dialog' into asksave-externalchange-di… 

    …alog
    Jeremy Wootten committed Apr 16, 2023
    Configuration menu
    Copy the full SHA
    31c6c66 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Connect focus-in handler with focus-out handler

    Jeremy Wootten committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    56aa99f View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Merge branch 'master' into asksave-externalchange-dialog 

    # Conflicts:
#	src/Services/Document.vala
    Jeremy Wootten committed May 25, 2023
    Configuration menu
    Copy the full SHA
    e8bc76f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Merge branch 'master' into asksave-externalchange-dialog

    Jeremy Wootten committed May 31, 2023
    Configuration menu
    Copy the full SHA
    d984c2d View commit details
    Browse the repository at this point in the history

  2. Fix focus in and overwrite

    Jeremy Wootten committed May 31, 2023
    Configuration menu
    Copy the full SHA
    4b87600 View commit details
    Browse the repository at this point in the history

  3. Inline AskExternalChanges dialog

    Jeremy Wootten committed May 31, 2023
    Configuration menu
    Copy the full SHA
    b4ae35b View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2023

  1. Merge branch 'master' into asksave-externalchange-dialog

    Jeremy Wootten authored Jun 3, 2023
    Configuration menu
    Copy the full SHA
    4e3bc10 View commit details
    Browse the repository at this point in the history

  2. Do not throw dialog if there are no unsaved internal edits

    Jeremy Wootten committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    070314a View commit details
    Browse the repository at this point in the history

  3. Remove unused class

    Jeremy Wootten committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    7e17654 View commit details
    Browse the repository at this point in the history

  4. Move some code back to original position

    Jeremy Wootten committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    9534e3b View commit details
    Browse the repository at this point in the history

  5. Update last_save_content after loading external changes

    Jeremy Wootten committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    3b141f9 View commit details
    Browse the repository at this point in the history

  6. Check for external changes even when internal changes

    Jeremy Wootten committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    694bd94 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Only save deleted file if there are unsaved changes

    Jeremy Wootten committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    22710cc View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2023

  1. Merge branch 'master' into asksave-externalchange-dialog

    Jeremy Wootten authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    206a752 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2023

  1. Merge branch 'master' into asksave-externalchange-dialog

    @zeebok
    zeebok authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    8432737 View commit details
    Browse the repository at this point in the history

  2. Update src/Services/Document.vala 

    Fix typo

Co-authored-by: Ryan Kornheisl <[email protected]>
    @zeebok
    Jeremy Wootten and zeebok authored Jul 3, 2023
    Configuration menu
    Copy the full SHA
    1a51238 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2023

  1. Merge branch 'master' into asksave-externalchange-dialog

    @zeebok
    zeebok authored Jul 6, 2023
    Configuration menu
    Copy the full SHA
    50db488 View commit details
    Browse the repository at this point in the history

  2. Use copy paste to autoload changed text

    Jeremy Wootten committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    7c214f6 View commit details
    Browse the repository at this point in the history

  3. Flag as not loaded while replacing text

    Jeremy Wootten committed Jul 6, 2023
    Configuration menu
    Copy the full SHA
    a80ad16 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2023

  1. Merge branch 'master' into asksave-externalchange-dialog

    @zeebok
    zeebok authored Jul 7, 2023
    Configuration menu
    Copy the full SHA
    77251d4 View commit details
    Browse the repository at this point in the history

  2. No undo on autoload

    Jeremy Wootten committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    04e428d View commit details
    Browse the repository at this point in the history

  3. Lose unused infobar

    Jeremy Wootten committed Jul 7, 2023
    Configuration menu
    Copy the full SHA
    f5008b0 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2023

  1. Merge branch 'master' into asksave-externalchange-dialog

    @zeebok
    zeebok authored Jul 9, 2023
    Configuration menu
    Copy the full SHA
    7b6187a View commit details
    Browse the repository at this point in the history