branch and ownership information update

.github/settings.yml

@@ -23,7 +23,7 @@ repository:
 #  has_downloads: true
 
   # Updates the default branch for this repository.
-#  default_branch: master
+#  default_branch: main
 
   # Either `true` to allow squash-merging pull requests, or `false` to prevent
   # squash-merging.

.github/workflows/RELEASE_TEMPLATE.md

@@ -5,11 +5,10 @@
 - #xxx
 
 ## Counter
-![downloaded](https://img.shields.io/github/downloads/OllisGit/OctoPrint-FilamentManager/xxx/total)
+![downloaded](https://img.shields.io/github/downloads/dojohnso/OctoPrint-FilamentManager/xxx/total)
 
-## Support my Efforts
+## *NOTE: this plugin has been abandoned by the original creator and adopted here by a new maintainer*
 
-This plugin, as well as my [other plugins](https://github.com/OllisGit/) were developed in my spare time.
-If you like it, I would be thankful about a cup of coffee :)
+**This plugin is under new management** and will focus on critical bug fixes to start. Please bear with me as I get acclimated to this new plugin. If you would like to support these new efforts, please consider buying me a coffee or two. Thank you!
 
-[![More coffee, more code](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6SW5R6ZUKLB5E&source=url)
+<a href="https://www.buymeacoffee.com/djohnson.tech" target="_blank"><img src="https://djohnson.tech/images/white-button.png" width=300 /></a>

.github/workflows/github-release-actions.yml

@@ -21,7 +21,7 @@ jobs:
       - run: echo "Plugin Version  $PLUGIN_VERSION ${PLUGIN_VERSION}"
 
       - run: echo "Build ZIP"
-      - run: zip -r master.zip * -i '\octoprint_*' 'translations' 'README.md' 'requirements.txt' 'setup.py'
+      - run: zip -r main.zip * -i '\octoprint_*' 'translations' 'README.md' 'requirements.txt' 'setup.py'
       - name: List files in the repository
         run: |
           ls ${{ github.workspace }}
@@ -59,26 +59,26 @@ jobs:
             - #xxx
 
             ## Counter
-            ![downloaded](https://img.shields.io/github/downloads/OllisGit/${{ steps.branch.outputs.repo_name }}/${{ steps.version.outputs.version }}/total)
+            ![downloaded](https://img.shields.io/github/downloads/dojohnso/${{ steps.branch.outputs.repo_name }}/${{ steps.version.outputs.version }}/total)
 
-            ## Support my Efforts
-            This plugin, as well as my [other plugins](https://github.com/OllisGit/) were developed in my spare time.
-            If you like it, I would be thankful about a cup of coffee :)
+            ## *NOTE: this plugin has been abandoned by the original creator and adopted here by a new maintainer*
 
-            [![More coffee, more code](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6SW5R6ZUKLB5E&source=url)
+            **This plugin is under new management** and will focus on critical bug fixes to start. Please bear with me as I get acclimated to this new plugin. If you would like to support these new efforts, please consider buying me a coffee or two. Thank you!
+
+            <a href="https://www.buymeacoffee.com/djohnson.tech" target="_blank"><img src="https://djohnson.tech/images/white-button.png" width=300 /></a>
 #          body_path: RELEASE_TEMPLATE.md
 
-      - name: upload master.zip to release
+      - name: upload main.zip to release
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: master.zip
-          asset_name: master.zip
+          asset_path: main.zip
+          asset_name: main.zip
           asset_content_type: application/gzip
 
-      - name: download master.zip
-        run: curl -O -J -L -v https://github.com/OllisGit/${{ steps.branch.outputs.repo_name }}/releases/download/${{ steps.version.outputs.version }}/master.zip
+      - name: download main.zip
+        run: curl -O -J -L -v https://github.com/dojohnso/${{ steps.branch.outputs.repo_name }}/releases/download/${{ steps.version.outputs.version }}/main.zip
 
       - run: echo "🍏 This job's status is ${{ job.status }}."

README.md

@@ -1,19 +1,17 @@
 # OctoPrint-PrintJobHistory
 
-[![Version](https://img.shields.io/badge/dynamic/json.svg?color=brightgreen&label=version&url=https://api.github.com/repos/OllisGit/OctoPrint-PrintJobHistory/releases&query=$[0].name)]()
-[![Released](https://img.shields.io/badge/dynamic/json.svg?color=brightgreen&label=released&url=https://api.github.com/repos/OllisGit/OctoPrint-PrintJobHistory/releases&query=$[0].published_at)]()
-![GitHub Releases (by Release)](https://img.shields.io/github/downloads/OllisGit/OctoPrint-PrintJobHistory/latest/total.svg)
+[![Version](https://img.shields.io/badge/dynamic/json.svg?color=brightgreen&label=version&url=https://api.github.com/repos/dojohnso/OctoPrint-PrintJobHistory/releases&query=$[0].name)]()
+[![Released](https://img.shields.io/badge/dynamic/json.svg?color=brightgreen&label=released&url=https://api.github.com/repos/dojohnso/OctoPrint-PrintJobHistory/releases&query=$[0].published_at)]()
+![GitHub Releases (by Release)](https://img.shields.io/github/downloads/dojohnso/OctoPrint-PrintJobHistory/latest/total.svg)
 
-The OctoPrint-Plugin stores all print-job informations of a print in a local database.
-These informations were collected from OctoPrint itself, but also from other plugins. See [below](#Optional-Plugins) for more information about these plugins.
+The OctoPrint-Plugin stores all print-job information of a print in a local database.
+This information is collected from OctoPrint itself, but also from other plugins. See [below](#Optional-Plugins) for more information about these plugins.
 
-#### Support my Efforts
+#### *NOTE: this plugin has been abandoned by the original creator and adopted here by a new maintainer*
 
-This plugin, as well as my [other plugins](https://github.com/OllisGit/) were developed in my spare time.
-If you like it, I would be thankful about a cup of coffee :)
-
-[![More coffee, more code](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=6SW5R6ZUKLB5E&source=url)
+**This plugin is under new management** and will focus on critical bug fixes to start. Please bear with me as I get acclimated to this new plugin. If you would like to support these new efforts, please consider buying me a coffee or two. Thank you!
 
+<a href="https://www.buymeacoffee.com/djohnson.tech" target="_blank"><img src="https://djohnson.tech/images/white-button.png" width=300 /></a>
 
 ## Included features
 
@@ -30,7 +28,7 @@ If you like it, I would be thankful about a cup of coffee :)
 - [x] Used/Calculated length
 - [x] Used weight
 - [x] Filament cost
-- [x] Slicer Settings (look [here](https://github.com/OllisGit/OctoPrint-PrintJobHistory/wiki/Slicer-Settings) for "how to use it")
+- [x] Slicer Settings (look [here](https://github.com/dojohnso/OctoPrint-PrintJobHistory/wiki/Slicer-Settings) for "how to use it")
 - [x] Export all data from PrintHistory-Plugin as CSV
 
 ### UI features
@@ -80,7 +78,7 @@ If you like it, I would be thankful about a cup of coffee :)
 Install via the bundled [Plugin Manager](http://docs.octoprint.org/en/master/bundledplugins/pluginmanager.html)
 or manually using this URL:
 
-    https://github.com/OllisGit/OctoPrint-PrintJobHistory/releases/latest/download/master.zip
+    https://github.com/dojohnso/OctoPrint-PrintJobHistory/releases/latest/download/main.zip
 
 After installation, you can listen on three release channels (since 1.6.0).
 What does this mean: Each channel has its own release-version and each release has a different kind of functionality and stability.
@@ -102,10 +100,10 @@ At the meantime you need to uninstall and install the version you like from the
 
 ## Roadmap
 
-see [Planning-Board](https://github.com/OllisGit/OctoPrint-PrintJobHistory/projects/1)
+TBD. Critical bug fixes for starters. Submit issues to the repo [here](https://github.com/dojohnso/OctoPrint-PrintJobHistory/issues).
 
 ## Versions
 
-see [Release-Overview](https://github.com/OllisGit/OctoPrint-PrintJobHistory/releases/)
+see [Release-Overview](https://github.com/dojohnso/OctoPrint-PrintJobHistory/releases/)
 
 

extras/PrintJobHistory.md

@@ -4,15 +4,15 @@ layout: plugin
 id: PrintJobHistory
 title: PrintJobHistory
 description: TODO
-author: OllisGit
+author: dojohnso
 license: AGPLv3
 
 # TODO
 date: today's date in format YYYY-MM-DD, e.g. 2015-04-21
 
-homepage: https://github.com/OllisGit/OctoPrint-PrintJobHistory
-source: https://github.com/OllisGit/OctoPrint-PrintJobHistory
-archive: https://github.com/OllisGit/OctoPrint-PrintJobHistory/archive/master.zip
+homepage: https://github.com/dojohnso/OctoPrint-PrintJobHistory
+source: https://github.com/dojohnso/OctoPrint-PrintJobHistory
+archive: https://github.com/dojohnso/OctoPrint-PrintJobHistory/archive/main.zip
 
 # TODO
 # Set this to true if your plugin uses the dependency_links setup parameter to include

octoprint_PrintJobHistory/__init__.py

@@ -1465,30 +1465,30 @@ def get_update_information(self):
 				# version check: github repository
 				type="github_release",
 
-				user="OllisGit",
+				user="dojohnso",
 				repo="OctoPrint-PrintJobHistory",
 				current=self._plugin_version,
 
 				stable_branch=dict(
 					name="Only Release",
-					branch="master",
-					comittish=["master"]
+					branch="main",
+					comittish=["main"]
 				),
 				prerelease_branches=[
+					# dict(
+					# 	name="Release & Candidate",
+					# 	branch="pre-release",
+					# 	comittish=["pre-release", "main"],
+					# ),
 					dict(
-						name="Release & Candidate",
-						branch="pre-release",
-						comittish=["pre-release", "master"],
-					),
-					dict(
-						name="Release & Candidate & in development",
-						branch="development",
-						comittish=["development", "pre-release", "master"],
+						name="Release & in development",
+						branch="dev",
+						comittish=["dev", "main"],
 					)
 				],
 
 				# update method: pip
-				pip="https://github.com/OllisGit/OctoPrint-PrintJobHistory/releases/download/{target_version}/master.zip"
+				pip="https://github.com/dojohnso/OctoPrint-PrintJobHistory/releases/download/{target_version}/main.zip"
 			)
 		)
 

octoprint_PrintJobHistory/static/js/PrintJobHistory.js

@@ -1,7 +1,7 @@
 /*
  * View model for PrintJobHistory
  *
- * Author: OllisGit
+ * Author: dojohnso
  * License: AGPLv3
  */
 $(function() {

setup.py

@@ -14,20 +14,20 @@
 plugin_name = "Print Job History"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.17.0"
+plugin_version = "1.17.1"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module
 plugin_description = """Collects all print jobs and stores the job data into a database"""
 
 # The plugin's author. Can be overwritten within OctoPrint's internal data via __plugin_author__ in the plugin module
-plugin_author = "OllisGit"
+plugin_author = "dojohnso"
 
 # The plugin's author's mail address.
-plugin_author_email = "[email protected]"
+plugin_author_email = "[email protected]"
 
 # The plugin's homepage URL. Can be overwritten within OctoPrint's internal data via __plugin_url__ in the plugin module
-plugin_url = "https://github.com/OllisGit/OctoPrint-PrintJobHistory"
+plugin_url = "https://github.com/dojohnso/OctoPrint-PrintJobHistory"
 
 # The plugin's license. Can be overwritten within OctoPrint's internal data via __plugin_license__ in the plugin module
 plugin_license = "AGPLv3"