tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions Packages Projects Releases Wiki Activity
748 Commits 1 Branch 0 Tags
fc532ff69721956a5174fc8695d5e3a3b0ea4252
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Donkie fc532ff697 Update bug_report.md 2024-05-06 19:30:37 +02:00
Donkie 4f93fdd4ea Bump version to 0.17.0 2024-05-04 20:35:35 +02:00
Donkie 1ddd9fb94a Merge pull request #335 from CooperGerman/master 
Create install_arch.sh
 2024-05-04 20:28:50 +02:00
Donkie 3db02717da Merge pull request #346 from Donkie/weblate 
Translations update
 2024-05-04 20:19:37 +02:00
Donkie fa4905de0f Merge pull request #339 from spyder007/feature/spool_revisions 
Add additional handling for spool weights
 2024-04-24 20:38:24 +02:00
Donkie 92a5868ccb Merge pull request #350 from Forest-Troll/master 
Added prometheus integration
 2024-04-15 21:10:27 +02:00
Donkie 640ca8c430 Fixed spool clone showing white screen 
Resolves #326
 2024-04-14 10:36:51 +02:00
Donkie 29f54358d6 Merge pull request #345 from Donkie/dependabot/npm_and_yarn/client/vite-5.0.13 2024-04-03 20:00:31 +02:00
Donkie db18a5f19d Added libffi to fix armv7 builds 
Thanks @spyder007
 2024-04-01 22:15:27 +02:00
Donkie e6aa80347f Merge pull request #333 from Donkie/dependabot/npm_and_yarn/client/follow-redirects-1.15.6 
Bump follow-redirects from 1.15.4 to 1.15.6 in /client
 2024-04-01 22:13:37 +02:00
Donkie b86841d7fe Merge pull request #325 from Donkie/weblate 
Translations update
 2024-04-01 22:13:29 +02:00
Donkie 7808615b1d Merge pull request #341 from Donkie/dependabot/npm_and_yarn/client/express-4.19.2 2024-03-29 07:55:01 +01:00
Donkie a68e0d59bd Merge pull request #301 from Donkie/weblate 
Translations update
 2024-03-02 19:30:16 +01:00
Daniel Hultgren e3b2bed573 Translated using Weblate (Swedish) 
Currently translated at 100.0% (241 of 241 strings)

Co-authored-by: Daniel Hultgren <daniel.cf.hultgren@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/sv/
Translation: Spoolman/Web Client
 2024-03-02 19:30:01 +01:00
Donkie 739e982215 Merge pull request #324 from Donkie/dependabot/npm_and_yarn/client/sanitize-html-2.12.1 
Bump sanitize-html from 2.11.0 to 2.12.1 in /client
 2024-03-02 19:29:56 +01:00
Donkie c6c75e6271 Prefix ExecStart with bash to circumvent execute permission issue 
No matter how many ways we try to add execute permissions to these scripts they always seem to get lost in one way or another. Now for example Moonraker doesn't run the install_debian.sh script, so the chmod never gets run. A .zip file doesn't seem to properly store the execute permission, so this would never work.
 2024-02-02 23:14:54 +01:00
Donkie c65bc4201b Currency setting is now utilized in filament/spool lists, edit pages etc 2024-02-02 23:06:06 +01:00
Donkie 220457c1ac Merge pull request #297 from Donkie/weblate 
Translations update
 2024-02-02 22:23:51 +01:00
Daniel Hultgren 126ba45bff Translated using Weblate (Swedish) 
Currently translated at 100.0% (241 of 241 strings)

Co-authored-by: Daniel Hultgren <daniel.cf.hultgren@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/sv/
Translation: Spoolman/Web Client
 2024-02-02 22:22:10 +01:00
Donkie f969e11d28 Minor translation fixes 2024-02-02 22:13:59 +01:00
Donkie c2335366bb Fixed sorting by remaining weight/length 2024-02-02 22:10:11 +01:00
Donkie b6b6fcf6bd Remove .venv in CI build job 2024-02-01 20:04:00 +01:00
Donkie ad177a4cba Merge pull request #293 from Donkie/weblate 
Translations update
 2024-02-01 18:25:33 +01:00
Donkie cccb0de982 Merge pull request #279 from hcooper/dynamic-port 
Support dynamic ports
 2024-02-01 18:25:04 +01:00
Donkie 88fa4b636a Create .gitattributes 2024-01-30 20:12:16 +01:00
Donkie 23f383dd63 Fixed edit forms refreshing after you start editing 2024-01-30 20:02:54 +01:00
Donkie 41a40d9fa3 Minor spool edit cleanup, added enum 2024-01-30 19:29:17 +01:00
Donkie 81b7a9b4ec Added tooltip in filament filter menu 
To differentiate between different filaments that may be named the same.
Resolves #276
 2024-01-30 19:21:38 +01:00
Donkie 36926c9ccf Added "Add Spool" button on filament list page 
Resolves #281
 2024-01-30 18:57:23 +01:00
Donkie 4d65dea1e9 Fixed sorting by filament in spool page 
Previously it sorted by filament ID which gave wonky results, now it properly sorts by filament combined name instead

Resolves #219
 2024-01-30 18:20:53 +01:00
Donkie 290eb5cb81 Added backend ability to sort by combined_name 2024-01-30 18:20:53 +01:00
Donkie 414c11cd7f Merge pull request #270 from Donkie/weblate 
Translations update
 2024-01-29 22:29:23 +01:00
Daniel Hultgren a6cb08a587 Translated using Weblate (Swedish) 
Currently translated at 100.0% (209 of 209 strings)

Co-authored-by: Daniel Hultgren <daniel.cf.hultgren@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/sv/
Translation: Spoolman/Web Client
 2024-01-29 21:01:46 +01:00
Donkie 9d3fb02231 Fixed spool edit page being in render loop 2024-01-26 17:30:34 +01:00
Donkie d0a958decb Removed camera constraints from QR scanner 
By default camera needs to be at least 640x640 but I don't see why that's necessary.

Fixes #285
 2024-01-26 17:14:45 +01:00
Donkie f7c9c44ea7 Write build info earlier when we still have git 2024-01-25 22:58:25 +01:00
Donkie 721733551f Fix git commit in ci.yml 2024-01-25 22:54:26 +01:00
Donkie 46c95eb5dd Fixed valueerror on invalid build date 2024-01-25 22:14:31 +01:00
Donkie b40da6e2ee Updated commit and build date capturing 
It's now written to a build.txt file instead of using environment variables internally. Standalone installs now has this properly as well.
 2024-01-25 22:03:18 +01:00
Donkie c0b4951a68 Read Spoolman version directly from pyproject.toml instead 2024-01-25 21:54:10 +01:00
Donkie e77623bab0 Fixed start script 2024-01-25 21:53:48 +01:00
Donkie 1479e13d94 Some script permission fixes 2024-01-25 20:49:16 +01:00
Donkie 2786eff3da Fixed release publishing happening outside tag push 2024-01-25 20:21:42 +01:00
Donkie 52cdb01110 Updated scripts to not use PDM anymore 2024-01-25 20:13:24 +01:00
Donkie 44d3ed72b0 CI job now builds a requirement.txt into the spoolman.zip 2024-01-25 20:11:12 +01:00
Donkie f294561d57 Merge pull request #256 from Donkie/custom-fields 
New backend custom fields system
 2024-01-23 19:37:33 +01:00
Donkie 40d3a3184f Implemented extra fields for spools and vendors as well 2024-01-23 19:27:34 +01:00
Donkie fb23024ed0 Extra fields now finished for filaments 2024-01-23 18:58:58 +01:00
Donkie 23818c1005 Made a nicer button for Show Spools in filament show page 2024-01-23 18:58:58 +01:00
Donkie f8cc9f7eda Updated integration tests to not require exact match 
This matches how we want clients to behave, they should ignore any extra fields that are sent in the response.
 2024-01-23 18:58:58 +01:00
Donkie 7972f4d401 Update test_add.py 2024-01-23 18:58:58 +01:00
Donkie 3340da3067 Allow relative imports in tests 2024-01-23 18:58:57 +01:00
Donkie 1caae75d81 Update conftest.py 2024-01-23 18:58:57 +01:00
Donkie f9787158b8 Extra field settings UI done 2024-01-23 18:58:57 +01:00
Donkie 483c48151b Work on extra fields settings UI 
Almost finished
 2024-01-23 18:58:57 +01:00
Donkie 77e781f1ea Added settings menu with working currency editing 2024-01-23 18:58:57 +01:00
Donkie 9362d04dad Add caching for extra fields retrieval 2024-01-23 18:58:57 +01:00
Donkie 4adee1327b Ruff fix 2024-01-23 18:58:57 +01:00
Donkie a868e1889f Added integration tests for using extra fields 2024-01-23 18:58:57 +01:00
Donkie 36a346bf64 Added restrictions on changing existing fields 2024-01-23 18:58:57 +01:00
Donkie 09b8705133 Existing extra fields for entities are now cleared if a field is deleted 2024-01-23 18:58:57 +01:00
Donkie 86e126f775 Added some basic field CRUD tests 2024-01-23 18:58:57 +01:00
Donkie 06e3849862 No longer need to specify entity_type in body 2024-01-23 18:58:57 +01:00
Donkie 77ac9d6a5c Added custom extra fields to backend 
No integration tests yet, TBD
 2024-01-23 18:58:57 +01:00
Donkie 71c29d2467 Merge pull request #278 from hcooper/patch-1 
Switch tests from "docker-compose" to "docker compose"
 2024-01-23 18:14:46 +01:00
Donkie 4acb649a21 Merge pull request #275 from Donkie/dependabot/npm_and_yarn/client/vite-5.0.12 
Bump vite from 5.0.10 to 5.0.12 in /client
 2024-01-23 18:14:18 +01:00
Donkie 9ef4f16214 Merge pull request #248 from Donkie/settings-backend 
New backend settings system
 2024-01-16 19:26:50 +01:00
Donkie 5900f2248a Updated settings migration 2024-01-16 19:20:44 +01:00
Donkie 44da991d47 Added a new backend settings system 
This can be used for saving runtime-configurable settings in the database.
 2024-01-16 19:17:06 +01:00
Donkie cad6d4a7f7 Merge pull request #233 from Donkie/weblate 
Translations update
 2024-01-16 19:14:55 +01:00
Daniel Hultgren d8ce41cb71 Translated using Weblate (Italian) 
Currently translated at 94.7% (198 of 209 strings)

Translated using Weblate (Hungarian)

Currently translated at 94.7% (198 of 209 strings)

Translated using Weblate (Norwegian Bokmål)

Currently translated at 94.7% (198 of 209 strings)

Translated using Weblate (Chinese (Simplified))

Currently translated at 94.7% (198 of 209 strings)

Co-authored-by: Daniel Hultgren <daniel.cf.hultgren@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/hu/
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/it/
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/nb_NO/
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/zh_Hans/
Translation: Spoolman/Web Client
 2024-01-16 19:05:57 +01:00
Donkie 46f9dd827f Merge pull request #240 from pdsccode/master 
Adding prices to spools
 2024-01-16 18:23:30 +01:00
Donkie a63e401583 Merge pull request #259 from Donkie/dependabot/npm_and_yarn/client/follow-redirects-1.15.4 2024-01-11 06:50:51 +01:00
Donkie ee22904383 Updated development chapter 2024-01-07 09:55:41 +01:00
Donkie 5904683b8f Merge pull request #251 from Copro/patch-1 
Update README.md fix prerequisites typo
 2024-01-06 16:04:22 +01:00
Donkie d424383ebb Fixed CI zip not including dot-files 2023-12-29 20:18:45 +01:00
Donkie cf4add2753 Updated install script and README with new build setup 2023-12-29 13:02:24 +01:00
Donkie dc84c8cd08 Moved to tmp dir instead 2023-12-29 12:42:05 +01:00
Donkie dec34df6bd Fixed some release publish issues 2023-12-29 12:33:51 +01:00
Donkie 96f1c86616 Update ci.yml 2023-12-29 12:13:21 +01:00
Donkie 0dfaa0ede4 Trigger release with PAT 
This is needed because the regular GITHUB_TOKEN does allow repo write, but it doesn't trigger any new actions.
 2023-12-29 12:00:48 +01:00
Donkie f083ed9c5c Updated push method in trigger release to hopefully push the tag also 2023-12-29 11:43:21 +01:00
Donkie 64528b08e6 Added git name and email to release trigger job 2023-12-29 11:36:08 +01:00
Donkie 57daa961f3 Fixed issue in bump script 2023-12-29 11:33:34 +01:00
Donkie 57ea0f5af9 Combine release workflow into CI 2023-12-29 11:18:25 +01:00
Donkie 0be9ab5a8f Added PUID and PGID environment variable support 2023-12-29 11:18:25 +01:00
Donkie 66189caeb4 Update issue templates 2023-12-29 00:41:38 +01:00
Donkie 3ee7d355b6 Added new CI jobs for release automation 2023-12-29 00:35:51 +01:00
Donkie 315ff1d980 Added node package bumping to bump script 2023-12-29 00:14:26 +01:00
Donkie 42155b0121 Removed some unnecessary pre-commit checks 2023-12-29 00:13:54 +01:00
Donkie ded503667f Merge pull request #227 from Donkie/weblate 
Translations update
 2023-12-28 11:43:53 +01:00
Daniel Hultgren 7ed7de19ad Translated using Weblate (Swedish) 
Currently translated at 100.0% (207 of 207 strings)

Translated using Weblate (English)

Currently translated at 100.0% (207 of 207 strings)

Co-authored-by: Daniel Hultgren <daniel.cf.hultgren@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/en/
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/sv/
Translation: Spoolman/Web Client
 2023-12-28 11:43:17 +01:00
Donkie 86af6434a9 Fixed CI name collision with built docker images 2023-12-28 11:43:16 +01:00
Donkie 75a8128f19 New CI step to produce a full Spoolman build zip 2023-12-28 11:23:34 +01:00
Donkie cf8d7472f5 Added backend filament search by similar color 2023-12-19 21:37:07 +01:00
Donkie 8322451f26 Converted description translation to one line 2023-12-18 21:54:52 +01:00
Donkie 4dcb965b87 Translated help page 2023-12-18 21:52:22 +01:00
Donkie bd956412d8 Added translation for Ko-fi button 2023-12-18 21:48:13 +01:00
Donkie 0e57d93ec8 Moved help stuff to a new dedicated Help page 
Also added some cool stats on home page
 2023-12-18 21:25:23 +01:00
Donkie d1a5690c81 Added beginnings of a home page 2023-12-18 20:20:48 +01:00