Merge dev fixes#1055

Closed

jeremypw wants to merge 175 commits intomasterfrom

merge-dev-fixes

Commits on Jun 25, 2020

experimenting with diff line numbers
jorgemanzo
committed

Commits on Jun 26, 2020

Saving progress sgr
jorgemanzo
committed

Commits on Jun 27, 2020

Gutter is colored more or less well enough
jorgemanzo
committed
Fixed bug in colors
jorgemanzo
committed
Reload when switching between different files
jorgemanzo
committed
Some cleanup of class properties
jorgemanzo
committed
Cleanup + color improvements
jorgemanzo
committed
Renamed the class
jorgemanzo
committed

Commits on Jun 28, 2020

Cleaning up the renderer
jorgemanzo
committed

Commits on Jun 30, 2020

Merge branch 'master' into gtkSourceGutterRenderer
cassidyjames
authored

Commits on Jul 22, 2020

Merge branch 'master' into gtkSourceGutterRenderer
jorgemanzo
committed

Commits on Dec 3, 2020

Merge branch 'master' into git-diff
Jeremy Wootten
committed

Commits on Dec 10, 2020

Get repo from sidebar for each document
Jeremy Wootten
committed
Merge branch 'master' into git-diff
Jeremy Wootten
committed
Fix construct Document
Jeremy Wootten
committed

Commits on Dec 11, 2020

Code-style improvement
Jeremy Wootten
committed

Commits on Jan 19, 2021

Merge branch 'master' into git-diff
cassidyjames
authored

Commits on Feb 16, 2021

Merge branch 'master' into git-diff
Jeremy Wootten
authored

Commits on May 2, 2021

Merge branch 'master' into git-diff
Jeremy Wootten
committed
Merge branch 'master' into git-diff
Jeremy Wootten
committed

Commits on May 3, 2021

Move git stuff to MonitoredRepository
Jeremy Wootten
committed
Improve diff parsing; add OTHER VCStatus
Jeremy Wootten
committed
Fix lint
Jeremy Wootten
committed
Fix process_diff_line; only refresh when file content changes
Jeremy Wootten
committed
Reinstate some needed code and other improvements
Jeremy Wootten
committed
Merge branch 'master' into git-diff
Jeremy Wootten
authored
Minor code cleanup
Jeremy Wootten
committed
Fix showing modified block
Jeremy Wootten
committed

Commits on May 4, 2021

No need to recreate Ggit.Diff object each time
Jeremy Wootten
committed
Fix long line
Jeremy Wootten
committed
Show unmodified lines that replace a deleted line with blue
Jeremy Wootten
committed
Looks like we do need to recreate Diff object
Jeremy Wootten
committed
Fix whitespace. Only redraw gutter when diff refreshes
Jeremy Wootten
committed
Merge branch 'master' into git-diff
Jeremy Wootten
authored

Commits on May 5, 2021

Revert making source_view a property
Jeremy Wootten
committed
Merge branch 'master' into git-diff
Jeremy Wootten
authored
Merge branch 'master' into git-diff
Jeremy Wootten
authored
Merge branch 'master' into git-diff
cassidyjames
authored

Commits on May 6, 2021

Merge branch 'master' into git-diff
Jeremy Wootten
committed
Merge branch 'git-diff' of https://github.com/elementary/code into git-diff
Jeremy Wootten
committed

Commits on May 7, 2021

Initial implementation of project-diff action.
Jeremy Wootten
committed

Commits on May 8, 2021

Switch only if no uncommitted, force checkout
Jeremy Wootten
committed
Remove outdated comment
Jeremy Wootten
committed

Commits on May 19, 2021

Merge branch 'master' into git-diff
Jeremy Wootten
committed

Commits on May 20, 2021

Merge branch 'master' into git-diff
Jeremy Wootten
authored

Commits on May 21, 2021

Make background actually transparent as intended
Jeremy Wootten
committed

Commits on May 22, 2021

Show outline in document not sidebar
Jeremy Wootten
committed
Use paned; fix activate/deactivate
Jeremy Wootten
committed
Set outline object as doc data
Jeremy Wootten
committed

Commits on May 23, 2021

Use selected or searchentry text for global search
Jeremy Wootten
committed
Add global search button to search bar
Jeremy Wootten
committed
Search term from focused widget
Jeremy Wootten
committed
Fallback to searchentry when no focused selected text
Jeremy Wootten
committed

Commits on May 25, 2021

Merge branch 'master' into git-diff
danirabbit
authored

Commits on May 26, 2021

src/Widgets/SourceGutterRenderer.vala: Inline namespace

Jeremy Wootten
and
danirabbit
authored
Merge branch 'master' into git-diff
Jeremy Wootten
committed
Minor cleanups
Jeremy Wootten
committed
Merge branch 'master' into git-diff
Jeremy Wootten
authored

Commits on May 31, 2021

Merge branch 'show-diff-action' into merge-dev-fixes
Jeremy Wootten
committed
Merge branch 'fix-switch-branch-simple' into merge-dev-fixes
Jeremy Wootten
committed
Merge branch 'global-search-selected' into merge-dev-fixes
Jeremy Wootten
committed
Merge branch 'symbolpane-on-right' into merge-dev-fixes
Jeremy Wootten
committed

Commits on Jul 1, 2021

Commits on Jul 18, 2021

Merge branch 'master' into merge-dev-fixes
Jeremy Wootten
committed

Commits on Sep 7, 2021

Merge branch 'master' into merge-dev-fixes
Jeremy Wootten
authored

Commits on Sep 22, 2021

Snippets plugin: initial version.
igordsm
committed

Commits on Sep 28, 2021

Merge branch 'master' into elementary-styles
cassidyjames
authored

Commits on Oct 5, 2021

Commits on Oct 6, 2021

Commits on Oct 9, 2021

Hide non-active documents when project manually chosen
jeremypw
committed

Commits on Oct 12, 2021

Merge branch 'master' into elementary-styles
Jeremy Wootten
authored
Merge branch 'master' into merge-dev-fixes
Jeremy Wootten
authored
Merge branch 'hide-docs-when-not-active' into merge-dev-fixes
jeremypw
committed

Commits on Oct 13, 2021

Merge branch 'master' into merge-dev-fixes
jeremypw
committed

Commits on Oct 16, 2021

Commits on Oct 17, 2021

Merge branch 'master' into elementary-styles
meisenzahl
authored

Commits on Oct 28, 2021

Merge branch 'master' into snippets
igordsm
authored

Commits on Nov 3, 2021

Merge branch 'master' into merge-dev-fixes
Jeremy Wootten
authored
Merge branch 'master' into elementary-styles
Jeremy Wootten
authored
Merge branch 'master' into snippets
Jeremy Wootten
authored

Commits on Dec 2, 2021

Merge branch 'master' into merge-dev-fixes
jeremypw
committed

Commits on Dec 4, 2021

Commits on Dec 5, 2021

Merge branch 'edit-point-history' into merge-dev-fixes
jeremypw
committed

Commits on Dec 6, 2021

Commits on Dec 7, 2021

Commits on Dec 8, 2021

Commits on Dec 13, 2021

Commits on Dec 16, 2021

Commits on Dec 29, 2021

Merge branch 'master' into merge-dev-fixes
Jeremy Wootten
authored

Commits on Jan 5, 2022