diff --git a/ChangeLog b/CHANGELOG.md similarity index 69% rename from ChangeLog rename to CHANGELOG.md index a1741b7..3045d28 100644 --- a/ChangeLog +++ b/CHANGELOG.md @@ -1,23 +1,36 @@ -Diffuse 0.5.0 - 2016-07-10 -- convert to Python 3 -- convert to GTK 3 +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] +### Added - added Pedro Albuquerque's Portuguese translation - added Åke Engelbrektson's Swedish translation - added Guillaume Hoffmann's Darcs support improvements -- add support for Git submodules +- added support for Git submodules - added Akom Chotiphantawanon's Thai translation -- updated Python highlighting for Python 3 grammar - added a preference and command line option to specify the version control system search order -Diffuse 0.4.8 - 2014-07-18 +### Changed +- convert to Python 3 +- convert to GTK 3 +- updated Python highlighting for Python 3 grammar + +## [0.4.8] - 2014-07-18 +### Added - updated use of gtk.SpinButton and gtk.Entry to avoid quirks seen on some platforms -- fixed a bug that prevented Diffuse from reviewing large git merge conflicts - updated C/C++ syntax highlighting to recognise C11/C++11 keywords -- fixed a bug that prevented drag-and-drop of file paths with non-ASCII characters - improved image quality of icons - added Chi Ming and Wei-Lun Chao's Traditional Chinese translation -Diffuse 0.4.7 - 2013-05-13 +### Fixed +- fixed a bug that prevented Diffuse from reviewing large git merge conflicts +- fixed a bug that prevented drag-and-drop of file paths with non-ASCII characters + +## [0.4.7] - 2013-05-13 +### Added - added Jindřich Šesták's Czech translation - improved character editing to allow easy indenting and moving the cursor by whole words - added Miś Uszatek's Polish translation @@ -25,42 +38,55 @@ Diffuse 0.4.7 - 2013-05-13 - added "New N-Way File Merge..." menu item - added syntax highlighting for Erlang and OpenCL files -Diffuse 0.4.6 - 2011-11-02 +## [0.4.6] - 2011-11-02 +### Added - added support for Subversion 1.7 - added "Open Commit..." menu item - "-c" option now works for all supported version control systems -- fixed a bug that caused the wrong revision to be shown when working on a branch in Mercurial - Git support distinguishes between staged and unstaged files - added syntax highlighting for R files -Diffuse 0.4.5 - 2011-07-13 -- fixed a bug in CVS and Subversion support that prevented Diffuse from displaying some removed files +### Fixed +- fixed a bug that caused the wrong revision to be shown when working on a branch in Mercurial + +## [0.4.5] - 2011-07-13 +### Added - added syntax highlighting for JSON files - added menu items and keyboard shortcuts for "First Tab" and "Last Tab" - added "--line" command line option -- fixed a bug that caused deleted files to be ignored when using the '-m' option -- fixed a bug that incorrectly encoded pasted text if utf_8 was not specified in the Region Settings preferences -- state information is now stored in ~/.local/share/diffuse - Diffuse now uses a patience diff-based algorithm to align lines - added command line option to specify a label to display instead of the file name - added preference to display the right margin - added Cristian Marchi's Italian translation + +### Changed +- state information is now stored in ~/.local/share/diffuse + +### Fixed +- fixed a bug in CVS and Subversion support that prevented Diffuse from displaying some removed files +- fixed a bug that caused deleted files to be ignored when using the '-m' option +- fixed a bug that incorrectly encoded pasted text if utf_8 was not specified in the Region Settings preferences - fixed a bug that could cause "Save As..." to fail with some user specified encodings -Diffuse 0.4.4 - 2010-10-21 +## [0.4.4] - 2010-10-21 +### Added - Git support now recognises conflicts when re-applying the stash -- double clicking on text can now select full words with non-English characters - search dialog is now automatically populated with the currently selected text -- fixed a bug that prevented opening files with non-ASCII characters in their path - added Oleg Pakhtusov's Russian translation - added Kang Bundo's Korean translation - pane headers tooltips - Shift-ScrollWheel can now be used to scroll horizontally -Diffuse 0.4.3 - 2010-04-15 +### Fixed +- double clicking on text can now select full words with non-English characters +- fixed a bug that prevented opening files with non-ASCII characters in their path + +## [0.4.3] - 2010-04-15 +### Fixed - fixed a bug that prevented the "-m" option from opening a 3-way merge for Subversion and Bazaar conflicts -Diffuse 0.4.2 - 2010-04-13 +## [0.4.2] - 2010-04-13 +### Added - support for detached Git repositories - better removal of unnecessary spacer lines - added support for horizontal mouse scrolling @@ -68,38 +94,49 @@ Diffuse 0.4.2 - 2010-04-13 - RCS support - added Henri Menke's Spanish translation - "#!" interpreter lines are now used to select proper highlighting rules + +### Changed - syntax highlighting is now indicated by radio menu items -Diffuse 0.4.1 - 2009-10-12 +## [0.4.1] - 2009-10-12 +### Added - added Japanese translation - added Liu Hao's simplified Chinese translation - added a 'Dismiss All Edits' menu item -- personal configuration files are now stored in ~/.config/diffuse/ (the README file describes how to migrate old settings) - localised manuals are now supported on Windows - new command line option for specifying blank file comparison panes - new preference to enable/disable line numbers +- added "Undo Close Tab" menu item +- added new menu items and buttons for copying lines between panes + +### Changed +- personal configuration files are now stored in ~/.config/diffuse/ (the README file describes how to migrate old settings) - Diffuse now quits if no viewers were created with the -m option +- replaced "Closing last tab quits Diffuse" preference with a "Warn me when closing a tab will quit Diffuse" preference - MMB on a notebook tab now closes the tab - RMB on a notebook tab creates a popup menu to set the current page -- added "Undo Close Tab" menu item -- replaced "Closing last tab quits Diffuse" preference with a "Warn me when closing a tab will quit Diffuse" preference -- added new menu items and buttons for copying lines between panes - changed the default hotkeys for merging to reflect the direction text "moves" -Diffuse 0.4.0 - 2009-08-17 +## [0.4.0] - 2009-08-17 +### Added - added format menu with new items for changing case, sorting, and manipulating white space -- replaced 'Hide end of line characters' preference with 'Show white space characters' -- errors are now reported in a dialogue instead of printing to stderr - optimised redraws when only the cursor position has changed - input methods that use pre-editing can now be used when editing text - dead keys can now be used when editing text - updated Monotone support to use 'mtn automate inventory' - Git support now handles files flagged as 'unmerged' -- graceful handling of and non-zero exit codes from 'git status' - added version control section to the manual + +### Changed +- replaced 'Hide end of line characters' preference with 'Show white space characters' +- errors are now reported in a dialogue instead of printing to stderr + +### Fixed +- graceful handling of non-zero exit codes from 'git status' - minor bug fixes -Diffuse 0.3.4 - 2009-07-03 +## [0.3.4] - 2009-07-03 +### Added - syntax highlighting for .plist, GLSL, SConscript, and SConstruct files - status bar now explains how to navigate between modes - added labels to indicate syntax highlighting rules, encoding, and format @@ -107,15 +144,19 @@ Diffuse 0.3.4 - 2009-07-03 - added Henri Menke's German translation - added '--examplesdir=' and '--mandir=' options to install.py - renamed the '--python-interpreter=' installer option to '--pythonbin=' + +### Fixed - minor bug fixes -Diffuse 0.3.3 - 2009-04-13 +## [0.3.3] - 2009-04-13 +### Fixed - fixed a bug handling the backspace key with the cursor in the first column -Diffuse 0.3.2 - 2009-04-13 -- POSIX installer with '--destdir=' and '--files-only' options for packagers +## [0.3.2] - 2009-04-13 +### Added +- POSIX installer with `--destdir=` and `--files-only` options for packagers - vi-like keybindings for line mode -- '-m' option to open modified files in separate tabs +- `-m` option to open modified files in separate tabs - 'Merge From Left Then Right' and 'Merge From Right Then Left' menu items - drag-n-drop support - preferences for behaviour of tabs @@ -124,28 +165,41 @@ Diffuse 0.3.2 - 2009-04-13 - 'Open File In New Tab...' and 'Open Modified Files...' menu items - 'Save All' menu item - mac-style line ending support + +### Changed - new end of line display behaviour - improved organisation of menu items -- button bar no longer grabs keyboard focus -- removed dependence on urllib module - errors are now reported on stderr + +### Fixed +- button bar no longer grabs keyboard focus + +### Removed +- removed dependence on urllib module - removed TODO list + +### Fixed - minor bug fixes -Diffuse 0.3.1 - 2009-03-05 +## [0.3.1] - 2009-03-05 +### Fixed - fixed a typo that broke the 'Find...' dialogue -Diffuse 0.3.0 - 2009-03-03 +## [0.3.0] - 2009-03-03 +### Added - new Windows installer - notification on focus change when files change on disk - menu items for adjusting indentation - syntax highlighting for Objective-C++ -- '-c' option now works with CVS-style revision numbers +- `-c` option now works with CVS-style revision numbers - window title now describes current tab - search settings now persist across sessions + +### Fixed - minor bug fixes -Diffuse 0.2.15 - 2008-12-03 +## [0.2.15] - 2008-12-03 +### Added - smoother scrolling - panes and tabs can now be manually re-organised - preferences for tab key behaviour @@ -156,9 +210,12 @@ Diffuse 0.2.15 - 2008-12-03 - position of window now saved - syntax files for more file types - reading /etc/diffuserc now optional when using a personal configuration file + +### Fixed - minor bug fixes -Diffuse 0.2.14 - 2008-10-20 +## [0.2.14] - 2008-10-20 +### Added - svk support - syntax files for more file types - DOS / Unix line endings now respected in edit operations @@ -166,24 +223,35 @@ Diffuse 0.2.14 - 2008-10-20 - more robust launching of help browsers - man page - command line display options -- moved some resources to the preferences dialogue - file revisions can now be specified in the open file dialogue + +### Changed +- moved some resources to the preferences dialogue + +### Fixed - minor bug fixes -Diffuse 0.2.13 - 2008-05-16 +## [0.2.13] - 2008-05-16 +### Added - bazaar, darcs, and monotone support - configurable key bindings - persistent preference settings - optimisations + +### Fixed - minor bug fixes -Diffuse 0.2.12 - 2008-05-06 +## [0.2.12] - 2008-05-06 +### Added - alternate codecs for reading and writing files - more search options - editor support for primary selection + +### Fixed - minor bug fixes -Diffuse 0.2.11 - 2008-04-27 +## [0.2.11] - 2008-04-27 +### Added - cvs, subversion, git, mercurial support - python re-write - syntax highlighting @@ -191,5 +259,28 @@ Diffuse 0.2.11 - 2008-04-27 - customisable through configuration files - tabbed viewer panes -Diffuse 0.1.14 - 2006-01-28 +## [0.1.14] - 2006-01-28 +### Added - initial public release + +[Unreleased]: https://github.com/MightyCreak/diffuse/v0.4.8...HEAD +[0.4.8]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.4.7...v0.4.8 +[0.4.7]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.4.6...v0.4.7 +[0.4.6]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.4.5...v0.4.6 +[0.4.5]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.4.4...v0.4.5 +[0.4.4]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.4.3...v0.4.4 +[0.4.3]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.4.2...v0.4.3 +[0.4.2]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.4.1...v0.4.2 +[0.4.1]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.4.0...v0.4.1 +[0.4.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.3.4...v0.4.0 +[0.3.4]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.3.3...v0.3.4 +[0.3.3]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.3.2...v0.3.3 +[0.3.2]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.3.1...v0.3.2 +[0.3.1]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.3.0...v0.3.1 +[0.3.0]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.2.15...v0.3.0 +[0.2.15]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.2.14...v0.2.15 +[0.2.14]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.2.13...v0.2.14 +[0.2.13]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.2.12...v0.2.13 +[0.2.12]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.2.11...v0.2.12 +[0.2.11]: https://github.com/olivierlacan/keep-a-changelog/compare/v0.1.14...v0.2.11 +[0.1.14]: https://github.com/olivierlacan/keep-a-changelog/releases/tag/v0.1.14