diff --git a/LICENSE.md b/LICENSE.md index f73c3cc1..44618573 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,7 @@ MIT License Copyright (c) 2018 Scientific Toolworks, Inc. +Copyright (c) 2021 Gittyup contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +19,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/README.md b/README.md index 7501f78a..20a16b00 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,30 @@ -[![Actions Status](https://github.com/gitahead/gitahead/workflows/GitAhead%20%28master%29/badge.svg)](https://github.com/gitahead/gitahead/actions) [![Actions Status](https://github.com/gitahead/gitahead/workflows/GitAhead%20%28stage%29/badge.svg)](https://github.com/gitahead/gitahead/actions) +[![Actions Status](https://github.com/Murmele/gitahead/workflows/GitAhead%20%28master%29/badge.svg)](https://github.com/Murmele/gitahead/actions) [![Actions Status](https://github.com/Murmele/gitahead/workflows/GitAhead%20%28stage%29/badge.svg)](https://github.com/Murmele/gitahead/actions) -GitAhead - Understand Your History +Gittyup ================================== -GitAhead is a graphical Git client designed to help you understand +Gittyup is a graphical Git client designed to help you understand and manage your source code history. It's available as a [pre-built binary for Windows, Linux, and macOS](https://gitahead.github.io/gitahead.com/), or can be built from source by following the directions below. +Gittyup is a continuation of the [GitAhead](https://github.com/gitahead/gitahead) client. + How to Get Help --------------- -Ask questions about building or using GitAhead on +Ask questions about building or using Gittyup on [Stack Overflow](http://stackoverflow.com/questions/tagged/gitahead) by including the `gitahead` tag. Remember to search for existing questions before creating a new one. -Report bugs in GitAhead by opening an issue in the -[issue tracker](https://github.com/gitahead/gitahead/issues). +Report bugs in Gittyup by opening an issue in the +[issue tracker](https://github.com/Murmele/gitahead/issues). Remember to search for existing issues before creating a new one. -If you still need help, email us at -[support@gitahead.com](mailto:support@gitahead.com). +If you still need help, check out our Matrix channel +[GitAheadFork:martix.org](https://matrix.to/#/#GitAheadFork:matrix.org). Build Environment ----------------- @@ -65,7 +67,7 @@ How to Build **Build OpenSSL** - # Start from root of gitahead repo. + # Start from root of gittyup repo. cd dep/openssl/openssl Win: @@ -85,7 +87,7 @@ Linux: **Configure Build** - # Start from root of gitahead repo. + # Start from root of gittyup repo. mkdir -p build/release cd build/release cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ../.. @@ -98,17 +100,17 @@ where `` points to the Qt install directory that contains **Build** ninja - + How to Install ----------------- **Linux** -The easies way to install GitAhead is by using [Flatpak](https://www.flatpak.org/) +The easies way to install Gittyup is by using [Flatpak](https://www.flatpak.org/) Ubuntu: apt-get install flatpak flatpak-builder -1) Download flatpak manifest located in the repository at `gitahead/pack/flatpak/io.github.gitahead.gitahead.json` -2) Build and install flatpak package (must be executed as root): +1) Download flatpak manifest located in the repository at `gittyup/pack/flatpak/io.github.gittyup.gittyup.json` +2) Build and install flatpak package (must be executed as root): - flatpak-builder --force-clean --install ./build io.github.gitahead.gitahead.json + flatpak-builder --force-clean --install ./build io.github.gittyup.gittyup.json How to Contribute ----------------- @@ -127,4 +129,4 @@ great commit message. License ------- -GitAhead is licensed under the MIT license. See LICENSE.md for details. +Gittyup and its predecessor GitAhead are licensed under the MIT license. See LICENSE.md for details. diff --git a/pack/flatpak/io.github.gitahead.gitahead.json b/pack/flatpak/io.github.gitahead.gitahead.json deleted file mode 100644 index 40e55ca9..00000000 --- a/pack/flatpak/io.github.gitahead.gitahead.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "app-id": "io.github.gitahead.gitahead", - "runtime": "org.kde.Platform", - "runtime-version": "5.15", - "sdk": "org.kde.Sdk", - "command": "GitAhead", - "finish-args": [ - "--socket=wayland", - "--socket=x11", - "--share=network", - "--filesystem=home" - ], - "rename-icon":"gitahead", /*Image will renamed to match the app-id konvention*/ - "modules": [ - { - "name": "GitAhead", - "buildsystem": "cmake", - "config-opts" : ["-DCMAKE_INSTALL_PREFIX=/app/bin"], - "builddir": true, - "build-commands": [ - "desktop-file-install --dir=/app/share/applications ../rsrc/linux/io.github.gitahead.gitahead.desktop", - "install -Dm755 ../rsrc/linux/io.github.gitahead.gitahead.appdata.xml /app/share/appdata/io.github.gitahead.gitahead.appdata.xml", /* one folder up, because of builddir: true */ - "install -Dm755 ../rsrc/GitAhead.iconset/icon_16x16.png /app/share/icons/hicolor/16x16/apps/gitahead.png", - "install -Dm755 ../rsrc/GitAhead.iconset/icon_16x16@2x.png /app/share/icons/hicolor/16x16@2x/apps/gitahead.png", - "install -Dm755 ../rsrc/GitAhead.iconset/icon_32x32.png /app/share/icons/hicolor/32x32/apps/gitahead.png", - "install -Dm755 ../rsrc/GitAhead.iconset/icon_32x32@2x.png /app/share/icons/hicolor/32x32@2x/apps/gitahead.png", - "install -Dm755 ../rsrc/GitAhead.iconset/icon_64x64.png /app/share/icons/hicolor/64x64/apps/gitahead.png", - "install -Dm755 ../rsrc/GitAhead.iconset/icon_64x64@2x.png /app/share/icons/hicolor/64x64@2x/apps/gitahead.png", - "install -Dm755 ../rsrc/GitAhead.iconset/icon_128x128.png /app/share/icons/hicolor/128x128/apps/gitahead.png", - "install -Dm755 ../rsrc/GitAhead.iconset/icon_128x128@2x.png /app/share/icons/hicolor/128x128@2x/apps/gitahead.png", - "install -Dm755 ../rsrc/GitAhead.iconset/icon_256x256.png /app/share/icons/hicolor/256x256/apps/gitahead.png", - "install -Dm755 ../rsrc/GitAhead.iconset/icon_256x256@2x.png /app/share/icons/hicolor/256x256@2x/apps/gitahead.png", - "install -Dm755 ../rsrc/GitAhead.iconset/icon_512x512.png /app/share/icons/hicolor/512x512/apps/gitahead.png" - ], - "sources": [ - { - "type": "git", - "branch": "master", - "url": "https://github.com/Murmele/gitahead" - } - ] - } - ] -} diff --git a/pack/flatpak/io.github.gittyup.gittyup.json b/pack/flatpak/io.github.gittyup.gittyup.json new file mode 100644 index 00000000..03ba40f9 --- /dev/null +++ b/pack/flatpak/io.github.gittyup.gittyup.json @@ -0,0 +1,44 @@ +{ + "app-id": "io.github.gittyup.gittyup", + "runtime": "org.kde.Platform", + "runtime-version": "5.15", + "sdk": "org.kde.Sdk", + "command": "Gittyup", + "finish-args": [ + "--socket=wayland", + "--socket=x11", + "--share=network", + "--filesystem=home" + ], + "rename-icon":"gittyup", /*Image will renamed to match the app-id konvention*/ + "modules": [ + { + "name": "Gittyup", + "buildsystem": "cmake", + "config-opts" : ["-DCMAKE_INSTALL_PREFIX=/app/bin"], + "builddir": true, + "build-commands": [ + "desktop-file-install --dir=/app/share/applications ../rsrc/linux/io.github.gittyup.gittyup.desktop", + "install -Dm755 ../rsrc/linux/io.github.gittyup.gittyup.appdata.xml /app/share/appdata/io.github.gittyup.gittyup.appdata.xml", /* one folder up, because of builddir: true */ + "install -Dm755 ../rsrc/Gittyup.iconset/icon_16x16.png /app/share/icons/hicolor/16x16/apps/gittyup.png", + "install -Dm755 ../rsrc/Gittyup.iconset/icon_16x16@2x.png /app/share/icons/hicolor/16x16@2x/apps/gittyup.png", + "install -Dm755 ../rsrc/Gittyup.iconset/icon_32x32.png /app/share/icons/hicolor/32x32/apps/gittyup.png", + "install -Dm755 ../rsrc/Gittyup.iconset/icon_32x32@2x.png /app/share/icons/hicolor/32x32@2x/apps/gittyup.png", + "install -Dm755 ../rsrc/Gittyup.iconset/icon_64x64.png /app/share/icons/hicolor/64x64/apps/gittyup.png", + "install -Dm755 ../rsrc/Gittyup.iconset/icon_64x64@2x.png /app/share/icons/hicolor/64x64@2x/apps/gittyup.png", + "install -Dm755 ../rsrc/Gittyup.iconset/icon_128x128.png /app/share/icons/hicolor/128x128/apps/gittyup.png", + "install -Dm755 ../rsrc/Gittyup.iconset/icon_128x128@2x.png /app/share/icons/hicolor/128x128@2x/apps/gittyup.png", + "install -Dm755 ../rsrc/Gittyup.iconset/icon_256x256.png /app/share/icons/hicolor/256x256/apps/gittyup.png", + "install -Dm755 ../rsrc/Gittyup.iconset/icon_256x256@2x.png /app/share/icons/hicolor/256x256@2x/apps/gittyup.png", + "install -Dm755 ../rsrc/Gittyup.iconset/icon_512x512.png /app/share/icons/hicolor/512x512/apps/gittyup.png" + ], + "sources": [ + { + "type": "git", + "branch": "master", + "url": "https://github.com/Murmele/gitahead" + } + ] + } + ] +} diff --git a/rsrc/Gittyup.icns b/rsrc/Gittyup.icns new file mode 100644 index 00000000..9e305b02 Binary files /dev/null and b/rsrc/Gittyup.icns differ diff --git a/rsrc/Gittyup.iconset/icon_128x128.png b/rsrc/Gittyup.iconset/icon_128x128.png new file mode 100644 index 00000000..0b8bfb05 Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_128x128.png differ diff --git a/rsrc/Gittyup.iconset/icon_128x128@2x.png b/rsrc/Gittyup.iconset/icon_128x128@2x.png new file mode 100644 index 00000000..1545412b Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_128x128@2x.png differ diff --git a/rsrc/Gittyup.iconset/icon_16x16.png b/rsrc/Gittyup.iconset/icon_16x16.png new file mode 100644 index 00000000..7631a6a7 Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_16x16.png differ diff --git a/rsrc/Gittyup.iconset/icon_16x16@2x.png b/rsrc/Gittyup.iconset/icon_16x16@2x.png new file mode 100644 index 00000000..c36c0fce Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_16x16@2x.png differ diff --git a/rsrc/Gittyup.iconset/icon_256x256.png b/rsrc/Gittyup.iconset/icon_256x256.png new file mode 100644 index 00000000..97245867 Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_256x256.png differ diff --git a/rsrc/Gittyup.iconset/icon_256x256@2x.png b/rsrc/Gittyup.iconset/icon_256x256@2x.png new file mode 100644 index 00000000..a8b000f6 Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_256x256@2x.png differ diff --git a/rsrc/Gittyup.iconset/icon_32x32.png b/rsrc/Gittyup.iconset/icon_32x32.png new file mode 100644 index 00000000..8ddb6dc6 Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_32x32.png differ diff --git a/rsrc/Gittyup.iconset/icon_32x32@2x.png b/rsrc/Gittyup.iconset/icon_32x32@2x.png new file mode 100644 index 00000000..ef05ad4b Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_32x32@2x.png differ diff --git a/rsrc/Gittyup.iconset/icon_512x512.png b/rsrc/Gittyup.iconset/icon_512x512.png new file mode 100644 index 00000000..f6941c47 Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_512x512.png differ diff --git a/rsrc/Gittyup.iconset/icon_512x512@2x.png b/rsrc/Gittyup.iconset/icon_512x512@2x.png new file mode 100644 index 00000000..894f6d36 Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_512x512@2x.png differ diff --git a/rsrc/Gittyup.iconset/icon_64x64.png b/rsrc/Gittyup.iconset/icon_64x64.png new file mode 100644 index 00000000..ef05ad4b Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_64x64.png differ diff --git a/rsrc/Gittyup.iconset/icon_64x64@2x.png b/rsrc/Gittyup.iconset/icon_64x64@2x.png new file mode 100644 index 00000000..0b8bfb05 Binary files /dev/null and b/rsrc/Gittyup.iconset/icon_64x64@2x.png differ diff --git a/rsrc/linux/io.github.gitahead.gitahead.appdata.xml b/rsrc/linux/io.github.gittyup.gittyup.appdata.xml similarity index 90% rename from rsrc/linux/io.github.gitahead.gitahead.appdata.xml rename to rsrc/linux/io.github.gittyup.gittyup.appdata.xml index 2da0033f..d8dd31fe 100644 --- a/rsrc/linux/io.github.gitahead.gitahead.appdata.xml +++ b/rsrc/linux/io.github.gittyup.gittyup.appdata.xml @@ -1,9 +1,9 @@ - io.github.gitahead.gitahead + io.github.gittyup.gittyup FSFAP MIT License - GitAhead + Gittyup Graphical Git client designed to help you understand and manage your source code history @@ -13,7 +13,7 @@ - io.github.gitahead.gitahead.desktop + io.github.gittyup.gittyup.desktop @@ -22,11 +22,11 @@ - https://gitahead.github.io/gitahead.com/ + https://github.com/Murmele/gitahead - GitAhead - io.github.gitahead.gitahead + Gittyup + io.github.gittyup.gittyup @@ -66,6 +66,6 @@ none none - + diff --git a/rsrc/linux/io.github.gitahead.gitahead.desktop b/rsrc/linux/io.github.gittyup.gittyup.desktop similarity index 62% rename from rsrc/linux/io.github.gitahead.gitahead.desktop rename to rsrc/linux/io.github.gittyup.gittyup.desktop index 6b26edcb..91847180 100644 --- a/rsrc/linux/io.github.gitahead.gitahead.desktop +++ b/rsrc/linux/io.github.gittyup.gittyup.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -Name=GitAhead +Name=Gittyup Comment=Graphical Git client for Windows, Linux and macOS -Exec=GitAhead -StartupWMClass=gitahead -Icon=gitahead +Exec=Gittyup +StartupWMClass=gittyup +Icon=gittyup Terminal=false Type=Application Categories=Development; X-Desktop-File-Install-Version=0.1 -Name[de_DE]=GitAhead +Name[de_DE]=io.github.gittyup.gittyup.desktop diff --git a/rsrc/resources.qrc b/rsrc/resources.qrc index c0dbc702..418b0fc5 100644 --- a/rsrc/resources.qrc +++ b/rsrc/resources.qrc @@ -1,13 +1,13 @@ - GitAhead.iconset/icon_128x128.png - GitAhead.iconset/icon_128x128@2x.png - GitAhead.iconset/icon_16x16.png - GitAhead.iconset/icon_16x16@2x.png - GitAhead.iconset/icon_32x32.png - GitAhead.iconset/icon_32x32@2x.png - GitAhead.iconset/icon_64x64.png - GitAhead.iconset/icon_64x64@2x.png + Gittyup.iconset/icon_128x128.png + Gittyup.iconset/icon_128x128@2x.png + Gittyup.iconset/icon_16x16.png + Gittyup.iconset/icon_16x16@2x.png + Gittyup.iconset/icon_32x32.png + Gittyup.iconset/icon_32x32@2x.png + Gittyup.iconset/icon_64x64.png + Gittyup.iconset/icon_64x64@2x.png beanstalk.png bitbucket.png branches.png