From 4b236e3c6a0b44e1069d9410e2e814664bc5f780 Mon Sep 17 00:00:00 2001 From: matmair Date: Wed, 11 Jan 2023 01:02:24 +0000 Subject: [PATCH 01/33] [Bot] Updated the stats --- _data/general/stats.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 06dcc187..0f51ac40 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,16 +1,16 @@ stats: - name: Docker pulls - number: 2192006 + number: 2194918 icon: fa-brands fa-docker - name: GitHub Stars - number: 2262 + number: 2267 icon: fa-solid fa-star - name: Forks number: 354 icon: fa-solid fa-code-branch - name: Contributors number: 52 - icon: fa-solids fa-hands-helping + icon: fa-solid fa-hands-helping - name: Languages number: 26 icon: fa-solid fa fa-language From f2e54293d4468ecc406435eb5ec4ab71c44ded42 Mon Sep 17 00:00:00 2001 From: matmair Date: Thu, 12 Jan 2023 01:03:43 +0000 Subject: [PATCH 02/33] [Bot] Updated the stats --- _data/general/stats.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 0f51ac40..85795336 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,12 +1,12 @@ stats: - name: Docker pulls - number: 2194918 + number: 2196956 icon: fa-brands fa-docker - name: GitHub Stars - number: 2267 + number: 2271 icon: fa-solid fa-star - name: Forks - number: 354 + number: 353 icon: fa-solid fa-code-branch - name: Contributors number: 52 From ce0fe67251c1bfc392af57872a976af91d50ed9c Mon Sep 17 00:00:00 2001 From: matmair Date: Fri, 13 Jan 2023 01:02:56 +0000 Subject: [PATCH 03/33] [Bot] Updated the stats --- _data/general/stats.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 85795336..9afdb8e1 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,12 +1,12 @@ stats: - name: Docker pulls - number: 2196956 + number: 2198989 icon: fa-brands fa-docker - name: GitHub Stars - number: 2271 + number: 2279 icon: fa-solid fa-star - name: Forks - number: 353 + number: 354 icon: fa-solid fa-code-branch - name: Contributors number: 52 From 21714c348101cb8b3e6735e6ae7f7d376f9ddb57 Mon Sep 17 00:00:00 2001 From: matmair Date: Sat, 14 Jan 2023 00:58:25 +0000 Subject: [PATCH 04/33] [Bot] Updated the stats --- _data/general/stats.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 9afdb8e1..95b19e0a 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,12 +1,12 @@ stats: - name: Docker pulls - number: 2198989 + number: 2200967 icon: fa-brands fa-docker - name: GitHub Stars - number: 2279 + number: 2280 icon: fa-solid fa-star - name: Forks - number: 354 + number: 355 icon: fa-solid fa-code-branch - name: Contributors number: 52 From 5974b4a021bbdc668641f938a069c72bcb3a70bf Mon Sep 17 00:00:00 2001 From: matmair Date: Sun, 15 Jan 2023 01:05:11 +0000 Subject: [PATCH 05/33] [Bot] Updated the stats --- _data/general/stats.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 95b19e0a..78b5b775 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,9 +1,9 @@ stats: - name: Docker pulls - number: 2200967 + number: 2203033 icon: fa-brands fa-docker - name: GitHub Stars - number: 2280 + number: 2283 icon: fa-solid fa-star - name: Forks number: 355 From 2f06c9d2cb106cc95c2fd7a0ea837bde9d476d6c Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sun, 15 Jan 2023 14:21:53 +0100 Subject: [PATCH 06/33] update links to use umami (#90) --- _config.yml | 4 ++-- _layouts/default.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index e00eef80..7031f5d3 100644 --- a/_config.yml +++ b/_config.yml @@ -23,8 +23,8 @@ baseurl: "" url: "" # Analytics -analytics-domain: offen.inventree.org -analytics-id: 2c8697da-bb92-441b-82ee-ece2622295b2 +analytics-domain: umami.invenhost.com/umami.js +analytics-id: c713a5e9-25cf-4bb6-9e84-ceb041a53986 # Rendering settings - do not touch collections: diff --git a/_layouts/default.html b/_layouts/default.html index f58d8184..8d97d77f 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,7 +3,7 @@ {% include base/head.html %} - + From a00826ec9f9ccfddeaa494ae89cd8dfbe5d9e638 Mon Sep 17 00:00:00 2001 From: matmair Date: Mon, 16 Jan 2023 01:00:55 +0000 Subject: [PATCH 07/33] [Bot] Updated the stats --- _data/general/stats.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 78b5b775..f81c4165 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,12 +1,12 @@ stats: - name: Docker pulls - number: 2203033 + number: 2205045 icon: fa-brands fa-docker - name: GitHub Stars - number: 2283 + number: 2285 icon: fa-solid fa-star - name: Forks - number: 355 + number: 356 icon: fa-solid fa-code-branch - name: Contributors number: 52 From c326cc37818ce714d344421ee711186e2da283cb Mon Sep 17 00:00:00 2001 From: matmair Date: Tue, 17 Jan 2023 01:01:12 +0000 Subject: [PATCH 08/33] [Bot] Updated the stats --- _data/general/stats.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index f81c4165..b24709e7 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,12 +1,12 @@ stats: - name: Docker pulls - number: 2205045 + number: 2207090 icon: fa-brands fa-docker - name: GitHub Stars - number: 2285 + number: 2287 icon: fa-solid fa-star - name: Forks - number: 356 + number: 358 icon: fa-solid fa-code-branch - name: Contributors number: 52 From ce3b8c187822a80468fe4b376279df766a818046 Mon Sep 17 00:00:00 2001 From: matmair Date: Wed, 18 Jan 2023 01:04:55 +0000 Subject: [PATCH 09/33] [Bot] Updated the stats --- _data/general/stats.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index b24709e7..1165dc65 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,9 +1,9 @@ stats: - name: Docker pulls - number: 2207090 + number: 2209115 icon: fa-brands fa-docker - name: GitHub Stars - number: 2287 + number: 2288 icon: fa-solid fa-star - name: Forks number: 358 From 3667d6c52b6305fac4ecaac87bfd6e835183afc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 22:23:57 +0100 Subject: [PATCH 10/33] Bump activesupport from 7.0.2.3 to 7.0.4.1 (#91) Bumps [activesupport](https://github.com/rails/rails) from 7.0.2.3 to 7.0.4.1. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v7.0.4.1/activesupport/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v7.0.2.3...v7.0.4.1) --- updated-dependencies: - dependency-name: activesupport dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 099fadfe..ad845f00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.2.3) + activesupport (7.0.4.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -20,7 +20,7 @@ GEM activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.10.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) jekyll (4.2.2) addressable (~> 2.4) @@ -61,7 +61,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - minitest (5.15.0) + minitest (5.17.0) nokogiri (1.13.10-x86_64-linux) racc (~> 1.4) pathutil (0.16.2) @@ -78,7 +78,7 @@ GEM ffi (~> 1.9) terminal-table (2.0.0) unicode-display_width (~> 1.1, >= 1.1.1) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) unicode-display_width (1.8.0) webrick (1.7.0) From bca89596ec3c6239acb7e774f4305b51ee4211dd Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Wed, 18 Jan 2023 23:50:19 +0100 Subject: [PATCH 11/33] add events to deploy methods (#92) --- demo.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/demo.md b/demo.md index e9967d0e..5ee03b26 100644 --- a/demo.md +++ b/demo.md @@ -2,7 +2,7 @@ title: InvenTree Demo --- -Want to take InvenTree for a spin? A working demo of InvenTree is available online at **[https://demo.inventree.org](https://demo.inventree.org)** +Want to take InvenTree for a spin? A working demo of InvenTree is available online at https://demo.inventree.org ### Login Details @@ -10,10 +10,10 @@ Multiple default accounts are provided, as detailed below. Each account is affor | Username | Password | Description | Login | | --- | --- | --- | --- | -| allaccess | nolimits | View / create / edit all pages and items | [log in](https://demo.inventree.org/accounts/login/?login=allaccess&password=nolimits) | -| reader | readonly | Can view all pages but cannot create, edit or delete database records | [log in](https://demo.inventree.org/accounts/login/?login=reader&password=readonly) | -| engineer | partsonly | Can manage parts, view stock, but no access to purchase orders or sales orders | [log in](https://demo.inventree.org/accounts/login/?login=engineer&password=partsonly) | -| admin | inventree | Superuser account, access all areas plus administrator actions | [log in](https://demo.inventree.org/accounts/login/?login=admin&password=inventree) | +| allaccess | nolimits | View / create / edit all pages and items | log in | +| reader | readonly | Can view all pages but cannot create, edit or delete database records | log in | +| engineer | partsonly | Can manage parts, view stock, but no access to purchase orders or sales orders | log in | +| admin | inventree | Superuser account, access all areas plus administrator actions | log in | ### Data Persistence From 23afc61dd049c5a5a0a53eab0badf7e09b173871 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 19 Jan 2023 22:16:21 +0100 Subject: [PATCH 12/33] Add netlify badge to Readme (#99) netlify is now enabled for PRs - show them some love in the readme. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 94709d2b..8cc77294 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # InvenTree website This project contains the source for InvenTree's website. -It is built on Jekyll and GitHub pages for backend / hosting and tailtwindcss for frontend. +It is built on Jekyll and GitHub pages for backend / hosting, tailtwindcss for design and Netlify for preview builds. + +[![Netlify Status](https://api.netlify.com/api/v1/badges/f84340d0-bc2f-4f7f-ad4c-877c50b33a27/deploy-status)](https://app.netlify.com/sites/inventree-org-preview/deploys) ## Architecture From 92c445f1ad6bb09be4f4ea08cce99091dbe55d54 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 19 Jan 2023 22:23:05 +0100 Subject: [PATCH 13/33] Fix stats section hitting API limit (#100) Fixes #95 Use GH token to not hit the API limit --- .github/get_stats.py | 4 ++-- .github/workflows/get_stats.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/get_stats.py b/.github/get_stats.py index 67d32789..1c7d08b5 100644 --- a/.github/get_stats.py +++ b/.github/get_stats.py @@ -33,11 +33,11 @@ def get_data(url, key=None, default=0, mode: ReturnMode=ReturnMode.data, auth=No return data docker = get_data(f'https://hub.docker.com/v2/repositories/{github_project}', 'pull_count') -gh_data = get_data(f'https://api.github.com/repos/{github_project}') +gh_data = get_data(f'https://api.github.com/repos/{github_project}', auth=os.environ.get('GITHUB_TOKEN')) stars = gh_data.get('stargazers_count', 0) forks = gh_data.get('forks_count', 0) # See https://stackoverflow.com/a/60458265/17860466 # to enabble anon add `&anon=true` -link = get_data(f'https://api.github.com/repos/{github_project}/contributors?per_page=1', mode=ReturnMode.header).get('Link') +link = get_data(f'https://api.github.com/repos/{github_project}/contributors?per_page=1', mode=ReturnMode.header, auth=os.environ.get('GITHUB_TOKEN')).get('Link') contributors = link.split('page=')[-1].split('>')[0] # Crowdin crowdin_data = get_data(f'https://api.crowdin.com/api/v2/projects/{crowdin_projet_id}?limit=1000', 'data', auth=os.environ.get('CROWDIN_TOKEN')) diff --git a/.github/workflows/get_stats.yml b/.github/workflows/get_stats.yml index 168b1c7b..6f045a8a 100644 --- a/.github/workflows/get_stats.yml +++ b/.github/workflows/get_stats.yml @@ -9,7 +9,7 @@ jobs: build: runs-on: ubuntu-latest - + permissions: {} steps: - uses: actions/checkout@v2 with: @@ -18,6 +18,7 @@ jobs: run: python .github/get_stats.py env: CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: stefanzweifel/git-auto-commit-action@v4 with: commit_message: "[Bot] Updated the stats" From b49ceb1362d82a7b71e60eb0217c398429b125d0 Mon Sep 17 00:00:00 2001 From: matmair Date: Thu, 19 Jan 2023 21:23:58 +0000 Subject: [PATCH 14/33] [Bot] Updated the stats --- _data/general/stats.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 1165dc65..bf9c54d7 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,9 +1,9 @@ stats: - name: Docker pulls - number: 2209115 + number: 2212836 icon: fa-brands fa-docker - name: GitHub Stars - number: 2288 + number: 2304 icon: fa-solid fa-star - name: Forks number: 358 From fd41f9c3b4551eb8bc0e235a1b8011b25823bfbd Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 19 Jan 2023 22:30:13 +0100 Subject: [PATCH 15/33] Respect users DNT settings (#101) Fixes #96 --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 8d97d77f..f35adf13 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,7 +3,7 @@ {% include base/head.html %} - + From ef19e9e4d942efec1c826d0c9379b7af4b76b526 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 19 Jan 2023 23:38:56 +0100 Subject: [PATCH 16/33] Update deps to fix issue with current version of ruby (#104) --- Gemfile.lock | 57 +++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ad845f00..8ea9b19b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,8 +6,8 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) colorator (1.1.0) concurrent-ruby (1.1.10) em-websocket (0.5.3) @@ -16,35 +16,37 @@ GEM eventmachine (1.2.7) ffi (1.15.5) forwardable-extended (2.6.0) - html-pipeline (2.14.1) + google-protobuf (3.21.12) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) i18n (1.12.0) concurrent-ruby (~> 1.0) - jekyll (4.2.2) + jekyll (4.3.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 2.3) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (~> 3.0) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - terminal-table (~> 2.0) - jekyll-feed (0.16.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) + jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-postcss-v2 (1.0.1) - jekyll-sass-converter (2.2.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) @@ -52,38 +54,43 @@ GEM jekyll-watch (2.2.1) listen (~> 3.0) jekyll_custom_permalink (0.0.1) - kramdown (2.3.2) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - listen (3.7.1) + liquid (4.0.4) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) minitest (5.17.0) - nokogiri (1.13.10-x86_64-linux) + nokogiri (1.14.0-arm64-darwin) + racc (~> 1.4) + nokogiri (1.14.0-x86_64-linux) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.7) - racc (1.6.1) - rb-fsevent (0.11.1) + public_suffix (5.0.1) + racc (1.6.2) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rexml (3.2.5) - rouge (3.28.0) + rouge (4.0.1) safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) + sass-embedded (1.57.1-arm64-darwin) + google-protobuf (~> 3.21) + sass-embedded (1.57.1-x86_64-linux-gnu) + google-protobuf (~> 3.21) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - unicode-display_width (1.8.0) + unicode-display_width (2.4.2) webrick (1.7.0) PLATFORMS + arm64-darwin-22 x86_64-linux DEPENDENCIES From bfcc61f789869415a68054c1e9f8667d99635896 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 19 Jan 2023 23:43:53 +0100 Subject: [PATCH 17/33] Fix publisher section (#103) * fix logo size and margin * make heading a bit smaller * fix posts not showing up * switch to the more uniform auhtor * fix team page to use the main text block * fix reference for oliver * Change verbage * Add team member badge * Add icon Fix publisher section Fixes #102 --- _data/team.yml | 2 +- _layouts/publisher.html | 21 ++++++++++++++------- _repo/shopify.md | 2 +- about/team.html | 33 +++++++++++++++++++++++++++++++++ about/team.md | 29 ----------------------------- 5 files changed, 49 insertions(+), 38 deletions(-) create mode 100644 about/team.html delete mode 100644 about/team.md diff --git a/_data/team.yml b/_data/team.yml index f6e95fad..8daa4cce 100644 --- a/_data/team.yml +++ b/_data/team.yml @@ -1,6 +1,6 @@ text: InvenTree has had 40+ contributors since the project started in March 2017. Here are some of the currently most active devs. team: - - tag: oliver + - tag: SchrodingersGat name: Oliver text: Oliver is an Australian EE. He started InvenTree in 2017 and is the maintainer. links: diff --git a/_layouts/publisher.html b/_layouts/publisher.html index d0a85e27..c7f06210 100644 --- a/_layouts/publisher.html +++ b/_layouts/publisher.html @@ -2,14 +2,16 @@ layout: content notitle: true --- -

-
+

+
{% if page.github %} - mdo +
+ mdo +
{% endif %} {{ page.name }}
-

+

{% if page.github %} @@ -17,7 +19,12 @@ notitle: true {% endif %} {% if page.website %} -Official Website +Website +{% endif %} + +{% assign filtered_team = site.data.team.team | where: 'tag', page.short_name %} +{% if filtered_team and filtered_team.size != 0 %} +Team Member {% endif %}
@@ -25,7 +32,7 @@ notitle: true {{ content }} -{% assign filtered_posts = site.posts | where: 'publisher', page.short_name %} +{% assign filtered_posts = site.posts | where: 'author', page.short_name %} {% if filtered_posts and filtered_posts.size != 0 %}

Posts

    @@ -35,7 +42,7 @@ notitle: true
{% endif %} -{% assign filtered_plugins = site.repo | where: 'publisher', page.short_name %} +{% assign filtered_plugins = site.repo | where: 'author', page.short_name %} {% if filtered_plugins and filtered_plugins.size != 0 %}

Plugins

    diff --git a/_repo/shopify.md b/_repo/shopify.md index 0d395825..6bb88767 100644 --- a/_repo/shopify.md +++ b/_repo/shopify.md @@ -1,6 +1,6 @@ --- name: ShopifyIntegrationPlugin org -publisher: matmair +author: matmair website: https://mjmair.com github: https://github.com/matmair/ShopifyIntegrationPlugin categories: diff --git a/about/team.html b/about/team.html new file mode 100644 index 00000000..1a20c703 --- /dev/null +++ b/about/team.html @@ -0,0 +1,33 @@ +--- +title: Team +--- + +{{site.data.team.text}} +
    + +

    Maintainer

    + +

    SchrodingersGat

    +

    Oliver is an Australian EE. He started InvenTree in 2017 and is the maintainer. + GitHub +

    + +

    Active Team

    + +{% for item in site.data.team.team %} +

    {{ item.tag }}

    +

    {{ item.text }} + + {% for link in item.links %} + {{ link.text }} + {% endfor %} + +

    +{% endfor %} + +

    Contributors

    +

    ToDo / Looking for suggestions.

    + + +

    Disclaimer

    +

    The list is in no way complete and only contains the most active devs when the website was created. If you feel someone is missing feel free to open an issue in the GitHub repo.

    \ No newline at end of file diff --git a/about/team.md b/about/team.md deleted file mode 100644 index 87afef75..00000000 --- a/about/team.md +++ /dev/null @@ -1,29 +0,0 @@ ---- -title: Team ---- - -InvenTree has had 40+ contributors since the project started in March 2017. - -### Maintainer - -#### SchrodingersGat -Oliver is an Australian EE. He started InvenTree in 2017 and is the maintainer. -[GitHub](https://github.com/SchrodingersGat) - -### Active Team - -#### eeintech -Francois is an EE. He is part of the core team and the maintainer of [Ki-nTree](https://github.com/sparkmicro/Ki-nTree). -[GitHub](https://github.com/eeintech) - -#### matmair -Matthias is an Austrian developer. He is part of the core team and focuses on `enterprise` enhancement. -[GitHub](https://github.com/matmair) - -### Contributors -ToDo / Looking for suggestions. - - -### Disclaimer -The list is in no way complete and only contains the most active devs when the website was created. If you feel someone is missing feel free to open an issue in the GitHub repo. - From 5361e9e2839b7f17b16af23ff2cf7d4c453ac66b Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 19 Jan 2023 23:52:23 +0100 Subject: [PATCH 18/33] Add avatars to team section Fixes #55 --- _includes/block/team.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/_includes/block/team.html b/_includes/block/team.html index 167147fe..b9bd5b10 100644 --- a/_includes/block/team.html +++ b/_includes/block/team.html @@ -10,8 +10,15 @@
    -

    {{ item.tag }}

    -

    {{ item.name }}

    +
    +
    + mdo +
    +
    +

    {{ item.tag }}

    +

    {{ item.name }}

    +
    +

    {{ item.text }}

    {% for link in item.links %} From dc159306beaf04fea069f29b87f6799e8db7503b Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 19 Jan 2023 23:54:06 +0100 Subject: [PATCH 19/33] Add link to team section --- _includes/block/team.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_includes/block/team.html b/_includes/block/team.html index b9bd5b10..0846c370 100644 --- a/_includes/block/team.html +++ b/_includes/block/team.html @@ -1,9 +1,11 @@
    +

    OUR TEAM

    {{ include.data.text }}

    +
    {% for item in include.data.team %} From 4f743fe6e4070c4c2d2f1ef2cfb78216271a0b6d Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 19 Jan 2023 23:29:58 +0000 Subject: [PATCH 20/33] reset deps --- Gemfile.lock | 9 ++------- package-lock.json | 2 -- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8ea9b19b..87eb84d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,7 +16,7 @@ GEM eventmachine (1.2.7) ffi (1.15.5) forwardable-extended (2.6.0) - google-protobuf (3.21.12) + google-protobuf (3.21.12-x86_64-linux) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) @@ -64,8 +64,6 @@ GEM rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) minitest (5.17.0) - nokogiri (1.14.0-arm64-darwin) - racc (~> 1.4) nokogiri (1.14.0-x86_64-linux) racc (~> 1.4) pathutil (0.16.2) @@ -78,8 +76,6 @@ GEM rexml (3.2.5) rouge (4.0.1) safe_yaml (1.0.5) - sass-embedded (1.57.1-arm64-darwin) - google-protobuf (~> 3.21) sass-embedded (1.57.1-x86_64-linux-gnu) google-protobuf (~> 3.21) terminal-table (3.0.2) @@ -90,7 +86,6 @@ GEM webrick (1.7.0) PLATFORMS - arm64-darwin-22 x86_64-linux DEPENDENCIES @@ -104,4 +99,4 @@ DEPENDENCIES webrick (~> 1.7) BUNDLED WITH - 2.3.11 + 2.3.26 diff --git a/package-lock.json b/package-lock.json index c4eca19e..b3a6e0b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -435,7 +435,6 @@ "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", - "fsevents": "~2.3.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -1306,7 +1305,6 @@ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, "dependencies": { - "graceful-fs": "^4.1.6", "universalify": "^2.0.0" }, "optionalDependencies": { From 94929159e46cefa3cd4522a7c5ce986555915857 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 19 Jan 2023 23:40:17 +0000 Subject: [PATCH 21/33] drop sass-embedded version --- Gemfile.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 87eb84d8..e15b8e2c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,8 +76,7 @@ GEM rexml (3.2.5) rouge (4.0.1) safe_yaml (1.0.5) - sass-embedded (1.57.1-x86_64-linux-gnu) - google-protobuf (~> 3.21) + sass-embedded (1.54) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.5) From b3629d7b4b9fbe04f0015c4c80ba8d8112273c09 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 19 Jan 2023 23:42:08 +0000 Subject: [PATCH 22/33] maybe remove it? --- Gemfile.lock | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e15b8e2c..5c382e4b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,6 @@ GEM rexml (3.2.5) rouge (4.0.1) safe_yaml (1.0.5) - sass-embedded (1.54) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.5) From b5e1cf59e56b927ad321f33bc486e2a4f0f7d3aa Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Thu, 19 Jan 2023 23:46:16 +0000 Subject: [PATCH 23/33] pin jekyll-sass-converter down --- Gemfile.lock | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5c382e4b..50e896b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -45,8 +45,8 @@ GEM html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-postcss-v2 (1.0.1) - jekyll-sass-converter (3.0.0) - sass-embedded (~> 1.54) + jekyll-sass-converter (2.2.0) + sassc (> 2.0.1, < 3.0) jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) @@ -76,6 +76,8 @@ GEM rexml (3.2.5) rouge (4.0.1) safe_yaml (1.0.5) + sassc (2.4.0) + ffi (~> 1.9) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.5) From 78d23fd1d6b453075dc442299dd79e86c55bf001 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 20 Jan 2023 00:59:10 +0100 Subject: [PATCH 24/33] use links without html --- _includes/block/team.html | 2 +- _layouts/publisher.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/block/team.html b/_includes/block/team.html index 0846c370..96f6fe4d 100644 --- a/_includes/block/team.html +++ b/_includes/block/team.html @@ -1,6 +1,6 @@
    - +

    OUR TEAM

    {{ include.data.text }}

    diff --git a/_layouts/publisher.html b/_layouts/publisher.html index c7f06210..27c88e2d 100644 --- a/_layouts/publisher.html +++ b/_layouts/publisher.html @@ -24,7 +24,7 @@ notitle: true {% assign filtered_team = site.data.team.team | where: 'tag', page.short_name %} {% if filtered_team and filtered_team.size != 0 %} -    Team Member +Team Member {% endif %}
    From f4969b4cfe6c72a1c6982b50ec148131316c7213 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Fri, 20 Jan 2023 00:59:31 +0100 Subject: [PATCH 25/33] Move lookup and link to partials (#106) --- _includes/partial/publisher_link.html | 3 +++ _layouts/collection/collection_base.html | 5 +---- _layouts/collection/collection_index.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 _includes/partial/publisher_link.html diff --git a/_includes/partial/publisher_link.html b/_includes/partial/publisher_link.html new file mode 100644 index 00000000..1dd51881 --- /dev/null +++ b/_includes/partial/publisher_link.html @@ -0,0 +1,3 @@ +{% assign pub_small = include.pub | downcase %} +{% assign publisher_ref = site.publishers | where: 'short_name', pub_small | first %} +{{ publisher_ref.name }} \ No newline at end of file diff --git a/_layouts/collection/collection_base.html b/_layouts/collection/collection_base.html index 4cc6a965..dd89bf54 100644 --- a/_layouts/collection/collection_base.html +++ b/_layouts/collection/collection_base.html @@ -15,10 +15,7 @@ layout: default

    {{ page.title }}

    {{ page.date | date_to_string }} - {% assign publisher = site.publishers | where: 'short_name', page.author | first %} - {% if publisher %} - - {{ publisher.name }} - {% endif %} + {% include partial/publisher_link.html pub= page.author %}

    {{ content }} \ No newline at end of file diff --git a/_layouts/collection/collection_index.html b/_layouts/collection/collection_index.html index 684d52fd..927ac218 100644 --- a/_layouts/collection/collection_index.html +++ b/_layouts/collection/collection_index.html @@ -14,7 +14,7 @@ layout: default {{ item.title }} {{ item.excerpt | strip_html | strip_newlines | truncate: 156 }} - {{ item.date | date_to_string }} | {{ item.author }} + {{ item.date | date_to_string }} | {% include partial/publisher_link.html pub=item.author %}
    {% endfor %}
    From 33c730e31649010f3137723ddd11d7df675dc739 Mon Sep 17 00:00:00 2001 From: matmair Date: Fri, 20 Jan 2023 01:02:49 +0000 Subject: [PATCH 26/33] [Bot] Updated the stats --- _data/general/stats.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index bf9c54d7..0d8a6606 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,9 +1,9 @@ stats: - name: Docker pulls - number: 2212836 + number: 2213137 icon: fa-brands fa-docker - name: GitHub Stars - number: 2304 + number: 2306 icon: fa-solid fa-star - name: Forks number: 358 From eb2d4415c9e059eedf81ca167c5dd28fb3c2f478 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Sat, 21 Jan 2023 00:12:31 +0100 Subject: [PATCH 27/33] Add cups plugin (#109) --- extend/plugin/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/extend/plugin/index.md b/extend/plugin/index.md index 431496c7..0ef3ff6a 100644 --- a/extend/plugin/index.md +++ b/extend/plugin/index.md @@ -11,6 +11,7 @@ You can read more about the plugin architecture, including information on develo Add *native printing capabilities* for your network connected printers to the webinterface and apps. There are plugins for: - [Brother QL](https://pypi.org/project/inventree-brother-plugin/) - [Zebra](https://github.com/SergeoLacruz/inventree-zebra-plugin) +- [Cups](https://github.com/wolflu05/inventree-cups-plugin) ### Plugin repo From 5519674a7866b2a406d3aadef70e767f0bfe1d30 Mon Sep 17 00:00:00 2001 From: matmair Date: Sat, 21 Jan 2023 01:01:58 +0000 Subject: [PATCH 28/33] [Bot] Updated the stats --- _data/general/stats.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 0d8a6606..afe5f13f 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,12 +1,12 @@ stats: - name: Docker pulls - number: 2213137 + number: 2215119 icon: fa-brands fa-docker - name: GitHub Stars - number: 2306 + number: 2334 icon: fa-solid fa-star - name: Forks - number: 358 + number: 365 icon: fa-solid fa-code-branch - name: Contributors number: 52 From d9f09b3bd87c24a16f6802c6ac25071b6d890fbc Mon Sep 17 00:00:00 2001 From: matmair Date: Sun, 22 Jan 2023 01:04:59 +0000 Subject: [PATCH 29/33] [Bot] Updated the stats --- _data/general/stats.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index afe5f13f..996c3e37 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,12 +1,12 @@ stats: - name: Docker pulls - number: 2215119 + number: 2217144 icon: fa-brands fa-docker - name: GitHub Stars - number: 2334 + number: 2345 icon: fa-solid fa-star - name: Forks - number: 365 + number: 367 icon: fa-solid fa-code-branch - name: Contributors number: 52 From 3d6d89b081d472be3827a7fbf9a5e169f8650c3a Mon Sep 17 00:00:00 2001 From: matmair Date: Mon, 23 Jan 2023 01:00:33 +0000 Subject: [PATCH 30/33] [Bot] Updated the stats --- _data/general/stats.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 996c3e37..89135824 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,12 +1,12 @@ stats: - name: Docker pulls - number: 2217144 + number: 2219108 icon: fa-brands fa-docker - name: GitHub Stars - number: 2345 + number: 2358 icon: fa-solid fa-star - name: Forks - number: 367 + number: 369 icon: fa-solid fa-code-branch - name: Contributors number: 52 From 0e60159f462a1ed1f9e33b91c465d5dad5ceea06 Mon Sep 17 00:00:00 2001 From: matmair Date: Tue, 24 Jan 2023 01:04:13 +0000 Subject: [PATCH 31/33] [Bot] Updated the stats --- _data/general/stats.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 89135824..3348c28e 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,9 +1,9 @@ stats: - name: Docker pulls - number: 2219108 + number: 2221091 icon: fa-brands fa-docker - name: GitHub Stars - number: 2358 + number: 2366 icon: fa-solid fa-star - name: Forks number: 369 From 360be0106bfd2b5d188c24b61f2c3806d6835aac Mon Sep 17 00:00:00 2001 From: matmair Date: Wed, 25 Jan 2023 00:59:50 +0000 Subject: [PATCH 32/33] [Bot] Updated the stats --- _data/general/stats.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 3348c28e..1a76fef2 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,12 +1,12 @@ stats: - name: Docker pulls - number: 2221091 + number: 2223108 icon: fa-brands fa-docker - name: GitHub Stars - number: 2366 + number: 2373 icon: fa-solid fa-star - name: Forks - number: 369 + number: 370 icon: fa-solid fa-code-branch - name: Contributors number: 52 From a0eba5f2fa2e43ce34e39632f8f801d6924beb11 Mon Sep 17 00:00:00 2001 From: matmair Date: Thu, 26 Jan 2023 01:01:26 +0000 Subject: [PATCH 33/33] [Bot] Updated the stats --- _data/general/stats.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_data/general/stats.yml b/_data/general/stats.yml index 1a76fef2..dd3bbedf 100644 --- a/_data/general/stats.yml +++ b/_data/general/stats.yml @@ -1,12 +1,12 @@ stats: - name: Docker pulls - number: 2223108 + number: 2225153 icon: fa-brands fa-docker - name: GitHub Stars - number: 2373 + number: 2379 icon: fa-solid fa-star - name: Forks - number: 370 + number: 372 icon: fa-solid fa-code-branch - name: Contributors number: 52