tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions Packages Projects Releases Wiki Activity
800 Commits 1 Branch 0 Tags
620febc3ab79a16454a6601438e0695c79d14728
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Donkie 620febc3ab Moved hishel cache directory into spoolmans data directory 
This is to prevent permission issues
 2024-05-21 11:25:08 +02:00
Donkie 0ab6e92d65 Fixed postgres db type example 2024-05-21 11:21:00 +02:00
Donkie 59295a3e5a Added permission error catch for setting up hishel cache 2024-05-21 00:00:10 +02:00
Donkie 4eee6712c1 Bump version to 0.18.0 2024-05-20 22:55:22 +02:00
Donkie ca545b72b9 Fixed spool price sorting not working 
Resolves #349
 2024-05-20 22:42:44 +02:00
Donkie 52c52bcfd8 Updated external db sync to handle spool types and new color hex format 2024-05-20 22:39:25 +02:00
Donkie 5dcc28aa98 Merge pull request #378 from Donkie/weblate 
Translations update
 2024-05-20 22:36:18 +02:00
Donkie 7bd2eac94b Merge pull request #381 from StuSerious/master 
feat: lossless image optimization.
 2024-05-20 22:36:05 +02:00
Donkie c4693d3f34 Implemented used_length spool sort 2024-05-15 20:18:24 +02:00
Donkie 51c3b46f1f Fixed wrong remaining weight and length spool sort 2024-05-15 20:17:00 +02:00
Donkie 090cbadf3b Fixed selected filament re-rendering too much 2024-05-15 19:40:34 +02:00
Donkie 69bb3cec77 Merge pull request #377 from zarthross/patch-1 
Update OctoPrint plugin in README.md
 2024-05-14 21:30:47 +02:00
Donkie ccd4026279 Fixed typing error in filament create form 2024-05-13 22:11:31 +02:00
Donkie 5a8d71fe70 Added import external filament in filament create form 2024-05-13 21:55:18 +02:00
Donkie 46ab709f72 Added extruder and bed temp to materials external db 2024-05-12 22:12:13 +02:00
Donkie 55471062ab External filament select for edit spool form 2024-05-12 22:08:47 +02:00
Donkie 4598d8f520 Some cleanup in create spool page 2024-05-12 21:58:01 +02:00
Donkie 3de2c94098 Create internal filament from external flow done 2024-05-12 21:58:01 +02:00
Donkie e4d2ecf0dc Filament/vendor find by ext id + integration tests 2024-05-12 21:58:01 +02:00
Donkie 4af975d390 Removed 404 codes from find apis because they will never return that 2024-05-12 21:58:01 +02:00
Donkie c2f2f845f6 Removed hashtag from external db color 2024-05-12 21:58:01 +02:00
Donkie 7f8606050b Made external db density field required 2024-05-12 21:58:00 +02:00
Donkie 1e4c73138c Added external ID fields to filaments and vendors 2024-05-12 21:58:00 +02:00
Donkie 36945f449d Show external filaments in spool create 2024-05-12 21:58:00 +02:00
Donkie 8d03a53228 Formatted client files 2024-05-12 21:57:43 +02:00
Donkie eca8e32a55 Removed plural from new api to match others 2024-05-12 21:57:43 +02:00
Donkie 987f357f97 Merge pull request #373 from Donkie/weblate 
Translations update
 2024-05-12 20:11:37 +02:00
Donkie cbaa7b81df Added API for fetching external database, removed parameters structure, 2024-05-12 12:14:25 +02:00
Donkie 595fd82b56 Minor fix in readme 2024-05-12 10:49:09 +02:00
Donkie 21d541a680 Added script to download files from external db 2024-05-12 10:48:33 +02:00
Daniel Hultgren 78e91a199a Translated using Weblate (Swedish) 
Currently translated at 100.0% (247 of 247 strings)

Translated using Weblate (English)

Currently translated at 100.0% (247 of 247 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
 2024-05-11 19:03:17 +02:00
Donkie 1962ffb43e Added install from source guide 2024-05-11 19:03:08 +02:00
Donkie 9040a55204 Merge pull request #368 from Donkie/weblate 
Translations update
 2024-05-10 13:51:40 +02:00
Donkie cd9cca0c06 Fixed missing translation.json errors 2024-05-10 12:56:44 +02:00
Donkie 9ff457f2fd Updated packages 2024-05-10 12:52:41 +02:00
Donkie 88705a7f18 Readme updates, removed env var section in favour of the .env.example file 2024-05-10 12:00:46 +02:00
Donkie bc32f1e890 Now supports running under a sub path 
Just set the SPOOLMAN_BASE_PATH environment variable and it should work.

Resolves #95
 2024-05-10 11:37:09 +02:00
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