tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions Packages Projects Releases Wiki Activity
1,044 Commits 1 Branch 0 Tags
03815687ffe26d2f076dfd9d5743994736217cd5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Donkie 03815687ff Merge pull request #526 from Pantastisch/feature/hex-color-code-in-filament-page 
Add Color Code Display for Single Color Filaments
 2025-02-24 20:48:31 +01:00
Donkie c0af80d439 Merge pull request #581 from Donkie/weblate 
Translations update
 2025-02-24 20:46:42 +01:00
Donkie 276fd1e733 Merge pull request #484 from Forest-Troll/master 
Prometheus metrics improve
 2024-12-28 22:04:14 +01:00
Donkie a14a520116 Merge pull request #557 from Donkie/weblate 
Translations update
 2024-12-28 22:03:27 +01:00
Donkie 6421f723ee Merge pull request #578 from Khaos66/master 
Enable install script to be automated
 2024-12-28 22:01:23 +01:00
Donkie 053b20f19c Bump version to 0.21.0 2024-12-01 14:54:31 +01:00
Donkie a3f506ce85 Bumped python dependencies 2024-12-01 14:53:58 +01:00
Donkie 0e6bdd764f Merge pull request #548 from Donkie/weblate 
Translations update
 2024-12-01 14:35:34 +01:00
Donkie 1372d75d90 Update README.md 2024-11-25 21:36:19 +01:00
Donkie 139d435cee Fixed manufacturer with spool weight 0 not being allowed 
Resolves #521
 2024-11-25 20:49:39 +01:00
Donkie a3be91b89c Fixed not being able to clear price field 
Resolves #525
 2024-11-25 20:39:24 +01:00
Donkie 649c074bb3 Fix uvicorn doing its own thing when logging 
Resolves #532
 2024-11-25 20:21:28 +01:00
Donkie 04920e463a Fixed number precision in locations page spool card 2024-11-25 19:07:24 +01:00
Donkie c57141254c Merge branch 'locationspage' into master 2024-11-24 15:05:01 +01:00
Donkie 46a9097491 Final locations updates 2024-11-24 15:04:20 +01:00
Donkie d142b0eaec Include the custom locations in spool edit page 2024-11-24 14:51:15 +01:00
Donkie 0827cc8a5a Improvements to default location 2024-11-24 14:45:16 +01:00
Donkie 755e06c989 Now goes back to loc page on edit submit 2024-11-24 12:31:38 +01:00
Donkie bb0b00b973 Merge pull request #542 from Donkie/weblate 
Translations update
 2024-11-24 09:56:44 +01:00
Donkie 1a55855ce9 Some i18n stuff 2024-11-23 23:16:41 +01:00
Donkie 67c5b34bf5 Final touches on locations page 2024-11-23 22:42:47 +01:00
Donkie bf06408368 Added reading and using of spool orders in locations 2024-11-20 21:57:01 +01:00
Donkie ce42d687ed Some file rearranging 2024-11-20 21:08:43 +01:00
Donkie 37b6d1fcee Added ability to rename location 2024-11-20 21:00:39 +01:00
Donkie 5861190821 Fixed being able to create multiple locs of same name 2024-11-20 20:15:46 +01:00
Donkie 8d6f2636c5 Locations can now be drag-dropped around 2024-11-20 20:12:08 +01:00
Donkie 3dc0082f0e Added ability to add new location 2024-11-20 19:37:56 +01:00
Donkie e4175e26ec Added a locations setting so empty locations are still kept around 2024-11-19 22:32:05 +01:00
Donkie 1eca7b2503 Added buttons to view/edit spools on locations page 2024-11-19 22:04:06 +01:00
Donkie b568147884 Updated some dependencies 2024-11-19 21:56:22 +01:00
Donkie a4355967d0 Added basic locations page to easily move spools between locations 2024-11-19 21:49:29 +01:00
Donkie 502ea1ba8b Added Romanian, Persian and Traditional Chinese to list of select-able languages 2024-11-18 22:41:14 +01:00
Donkie b555f812ef Merge pull request #523 from Donkie/weblate 
Translations update
 2024-11-18 22:21:33 +01:00
Donkie ba488655bf Update README.md 2024-11-07 21:07:15 +01:00
Donkie 0ef4649927 Update README.md 2024-11-06 22:24:02 +01:00
Donkie 281e6cbe44 Update README.md 2024-11-06 22:21:36 +01:00
Donkie 39aea03a01 Merge pull request #517 from TomW1605/add-archive-un-archive-button-to-spool-view-page 
add archive/un archive button to spool view page
 2024-10-27 18:21:24 +01:00
Donkie 86f69d470f Added backend supported csv/json export functionality 2024-10-27 12:36:39 +01:00
Donkie a95ddcedd1 Merge pull request #506 from Donkie/weblate 
Translations update
 2024-10-26 22:51:53 +02:00
Donkie 4a4a6c20e3 Merge pull request #519 from Donkie/dependabot/npm_and_yarn/client/rollup-4.24.0 
Bump rollup from 4.21.3 to 4.24.0 in /client
 2024-10-26 22:30:04 +02:00
Donkie 25a33c6361 Merge pull request #513 from Donkie/dependabot/npm_and_yarn/client/multi-9f37c16f8f 
Bump cookie and express in /client
 2024-10-26 22:26:51 +02:00
Donkie 8a0370d74b Merge pull request #518 from TomW1605/add-external-id-to-filament-and-vendor-edit-pages 
add external id to filament and vendor edit pages
 2024-10-26 22:26:20 +02:00
Donkie b74b7e0205 Merge pull request #497 from Uro1/fix-line-endings 2024-09-30 17:32:23 +02:00
Donkie 590b0df191 Fixed release zip missing dot-files 2024-09-23 19:26:29 +02:00
Donkie 62705b590b Merge pull request #482 from Donkie/weblate 2024-09-23 11:31:30 +02:00
Donkie 980809f1ad Merge pull request #488 from Donkie/dependabot/npm_and_yarn/client/multi-9423f4c335 2024-09-18 06:06:23 +02:00
Donkie 9cb1dfbf79 Merge pull request #487 from Donkie/dependabot/npm_and_yarn/client/vite-5.4.6 2024-09-18 06:04:37 +02:00
Donkie 4f8d5abcec Bump version to 0.20.0 2024-09-08 22:42:34 +02:00
Donkie a826db12ea Merge pull request #446 from TomW1605/allow-prefix-and-suffix-with-double-braces 
allow prefix and suffix with double braces in label format
 2024-09-08 22:38:39 +02:00
Donkie 608d88f6c5 Merge pull request #476 from Donkie/weblate 
Translations update
 2024-09-08 22:35:45 +02:00
Donkie 909d8c38bd Test stage now only downloads the relevant images 2024-09-08 22:17:46 +02:00
Donkie 13a038cb3e Updated all action versions 2024-09-08 13:29:27 +02:00
Donkie eeb1e53490 Merge pull request #475 from Donkie/dependabot/npm_and_yarn/client/axios-1.7.7 
Bump axios from 1.7.3 to 1.7.7 in /client
 2024-09-07 19:56:46 +02:00
Donkie 4469523650 Merge pull request #469 from Donkie/weblate 
Translations update
 2024-09-07 19:56:24 +02:00
Donkie b70cfb0e79 Bump artifact action versions 2024-09-07 19:54:01 +02:00
Donkie 5bd9d055d0 Merge pull request #460 from Donkie/weblate 2024-08-28 07:39:40 +02:00
Donkie a6d271ac87 Merge pull request #461 from samturner3/master 
Feature: Add option to use full URL in QR codes instead of web+spoolman: prefix
 2024-08-26 20:23:25 +02:00
Donkie 93c9f46385 Merge pull request #458 from teoteo/teoteo-patch-1 
Helps to identify the icon
 2024-08-26 20:16:06 +02:00
Donkie 32c737fa98 Revert so commit now happens before notice, but add a catch-all to websocket notifications 2024-08-16 15:13:09 +02:00
Donkie 8edf6d2e20 Merge pull request #449 from Donkie/weblate 
Translations update
 2024-08-16 10:33:45 +02:00
Donkie e5f79493cc Fixed error on trying to send ws message to disconnected client 
This could result in a major filament usage track failure since the Use http request would fail and Moonraker would keep retrying to save the used filament. However it was actually saved since the db.commit() happens before the websocket message fails.
 2024-08-16 10:28:22 +02:00
Donkie 5c5bd4627b Bump version to 0.19.3 2024-08-10 11:50:16 +02:00
Donkie da89b80d07 Allow larger print preview scale size 
Resolves #439
 2024-08-10 11:45:21 +02:00
Donkie 14a22e072f Fixed being unable to change currency 
Resolves #436
 2024-08-10 11:44:11 +02:00
Donkie 2e414af9bb Bump version to 0.19.2 2024-08-09 17:16:08 +02:00
Donkie d7479d3cdf Merge pull request #432 from Donkie/weblate 
Translations update
 2024-08-09 17:15:21 +02:00
Daniel Hultgren 225aa77d41 Translated using Weblate (Swedish) 
Currently translated at 100.0% (271 of 271 strings)

Translated using Weblate (Swedish)

Currently translated at 89.2% (242 of 271 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-08-09 15:15:04 +00:00
Donkie b2f6227540 Merge pull request #435 from foxt/patch-1 
Install script: Don't bother using sudo if user is running as root
 2024-08-09 17:14:56 +02:00
Donkie 2fd80038e3 Bump version to 0.19.1 2024-08-09 17:07:13 +02:00
Donkie 9469f47f09 Fixed importing multi color filaments in spool create form 2024-08-09 17:04:40 +02:00
Donkie eb4e1a950a Fixed importing multi-color in create filament 2024-08-09 16:58:30 +02:00
Donkie eee36fad66 Fixed multi color picker not working 2024-08-08 23:02:11 +02:00
Donkie c93ca5d916 Bump version to 0.19.0 2024-08-07 15:44:24 +02:00
Donkie 902e98b059 Increased itest connection timeout 2024-08-07 15:27:22 +02:00
Donkie 3454002c09 Fixed conftest 2024-08-07 15:19:35 +02:00
Donkie 515722bf4f Attempt to make itest spoolman up check more robust 2024-08-07 15:12:42 +02:00
Donkie efa93615ec Updated dependencies in integration tests 2024-08-07 14:45:43 +02:00
Donkie ae26bf5733 Fixed label template error if invalid extra field 2024-08-07 14:26:50 +02:00
Donkie 10ad8cebcb Added button to save labels as png images 
Resolves #80
Resolves #348
 2024-08-07 13:58:48 +02:00
Donkie 7082c5206b Added ability to hide qr code entirely when printing 
Resolves #231
 2024-08-07 13:09:43 +02:00
Donkie 7108b0e7a1 Optimized and organized all clients imports 2024-08-07 12:46:37 +02:00
Donkie 8413e33895 Minor fix to ActionsColumn function 
No longer uses hooks but instead takes in the title
 2024-08-07 12:40:54 +02:00
Donkie 736e59d1eb Improve useLiveify a bit 2024-08-07 12:19:25 +02:00
Donkie 3bd93cb0af Removed React prefix to some use hooks 2024-08-06 14:28:09 +02:00
Donkie 701ed2fae6 Added button to adjust filament 
Resolves #428
Resolves #30
 2024-08-06 11:34:47 +02:00
Donkie 00e35584f4 Fixed item cloning not handling extra fields properly 
Resolves #424
 2024-08-05 19:56:42 +02:00
Donkie 48ef3a23f2 Fixed client showing wrong spool price if overridden to 0 
Resolves #431
 2024-08-05 19:43:05 +02:00
Donkie 93d27a96d3 Spool weight can now be set to 0 
Fixes #422
 2024-08-05 19:39:54 +02:00
Donkie 694e4b9f61 Update compose-action to try fix CI issue 2024-08-05 19:35:17 +02:00
Donkie f3711f3789 Formatting 2024-08-05 19:26:35 +02:00
Donkie 3b1a09752e Fixed AlignType import 2024-08-05 19:25:14 +02:00
Donkie 71b3ad8f7b Update pdm version in pre-commit 2024-08-05 19:20:29 +02:00
Donkie ae0dbc740b Fixed client build 2024-08-05 19:20:29 +02:00
Donkie 5afe53e05b Merge pull request #423 from tzahari/master 
Optimized list views
 2024-08-05 19:16:50 +02:00
Donkie 4f49481475 Update PDM lockfile 
This updates all dependencies, as well as makes it compatible with latest PDM which now complains about the cross_platform strategy choice, we instead use inherit_metadata now.
 2024-08-05 19:15:34 +02:00
Donkie 093d5e095c Merge remote-tracking branch 'weblate/master' into master 2024-08-05 18:57:49 +02:00
Donkie fc505c98f1 Merge pull request #399 from Donkie/weblate 
Translations update
 2024-08-05 18:49:32 +02:00
Donkie 92f70e73e0 Updated most node dependencies 2024-08-05 18:49:15 +02:00
Donkie 21b9f16531 Print preview area now sizes according to its sibling area 2024-08-05 18:39:41 +02:00
Donkie bf8cbc7a96 Fixed continue button in spool select page 2024-08-05 18:16:02 +02:00