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.

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

Use GitHub Pages for the Diffuse website #193

Merged
merged 4 commits into from
Apr 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<h1 align="center">
<img src="data/icons/hicolor/scalable/apps/io.github.mightycreak.Diffuse.svg" alt="Diffuse" width="192" height="192"/><br/>
Diffuse
</h1>

<p align="center" style="margin-top: 2em">
Expand Down Expand Up @@ -61,6 +60,9 @@ is licensed under the [FSF-AP](https://www.gnu.org/prep/maintain/html_node/Licen
license.

Copyright (C) 2006-2019 Derrick Moser <[email protected]>
Copyright (C) 2015-2021 Romain Failliot <[email protected]>
Copyright (C) 2015-2023 Romain Failliot <[email protected]>

Icon made by [@jimmac](https://github.com/jimmac).

This repository is a fork of the original project on SourceForge, which doesn't
seem to be maintained anymore: <https://sourceforge.net/projects/diffuse/>.
2 changes: 2 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
remote_theme: pages-themes/[email protected]
title: Diffuse
13 changes: 11 additions & 2 deletions data/io.github.mightycreak.Diffuse.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
Diffuse is a graphical tool for comparing and merging text files. It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories.
</p>
</description>
<supports>
<control>pointing</control>
<control>keyboard</control>
<control>console</control>
</supports>

<metadata_license>FSFAP</metadata_license>
<project_license>GPL-2.0-or-later</project_license>
Expand All @@ -18,8 +23,12 @@

<screenshots>
<screenshot type="default">
<caption>Main window: diff between two files</caption>
<image>https://mightycreak.github.io/diffuse/docs/images/screenshot_v0.7.0.png</image>
<image type="source">https://mightycreak.github.io/diffuse/docs/images/screenshot_v0.7.7_main_window.png</image>
<caption>Main window</caption>
</screenshot>
<screenshot>
<image type="source">https://mightycreak.github.io/diffuse/docs/images/screenshot_v0.7.7_about_window.png</image>
<caption>About window</caption>
</screenshot>
</screenshots>

Expand Down
Binary file added docs/images/screenshot_v0.7.7_about_window.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/screenshot_v0.7.7_main_window.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/diffuse/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

APP_NAME: Final[str] = 'Diffuse'
COPYRIGHT: Final[str] = '''{copyright} © 2006-2019 Derrick Moser
{copyright} © 2015-2021 Romain Failliot'''.format(copyright=_("Copyright"))
{copyright} © 2015-2023 Romain Failliot'''.format(copyright=_("Copyright"))
WEBSITE: Final[str] = 'https://mightycreak.github.io/diffuse/'

# Constants are set in main()
Expand Down