tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity
799 Commits 1 Branch 0 Tags
0ab6e92d6549be3dd45733df71af33e31eb6dcd1
Commit Graph

799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
luger16
c8b8dab906 Translated using Weblate (German) 
Currently translated at 93.3% (223 of 239 strings)

Co-authored-by: luger16 <luis.gerlach@gmx.de>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/de/
Translation: Spoolman/Web Client
 2024-01-29 21:01:46 +01:00
my_mail
a99530391b Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (239 of 239 strings)

Co-authored-by: my_mail <egor6508@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/uk/
Translation: Spoolman/Web Client
 2024-01-29 21:01:46 +01:00
srbjessen
a034e96939 Translated using Weblate (Danish) 
Currently translated at 100.0% (209 of 209 strings)

Co-authored-by: srbjessen <srbjessen@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/da/
Translation: Spoolman/Web Client
 2024-01-29 21:01:46 +01:00
Сергій
445331369b Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (209 of 209 strings)

Co-authored-by: Сергій <sergiy.goncharuk.1@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/uk/
Translation: Spoolman/Web Client
 2024-01-29 21:01:46 +01:00
Gregory Fontaine
7a7d43b548 Translated using Weblate (French) 
Currently translated at 100.0% (209 of 209 strings)

Co-authored-by: Gregory Fontaine <gregory.fontaine35@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/fr/
Translation: Spoolman/Web Client
 2024-01-29 21:01:46 +01:00
Samuel Wang
b854f936c5 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (209 of 209 strings)

Co-authored-by: Samuel Wang <imhsaw@gmail.com>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/zh_Hans/
Translation: Spoolman/Web Client
 2024-01-29 21:01:46 +01:00
Maurice Kevenaar
684b17619c Translated using Weblate (Dutch) 
Currently translated at 100.0% (239 of 239 strings)

Translated using Weblate (Dutch)

Currently translated at 100.0% (209 of 209 strings)

Co-authored-by: Maurice Kevenaar <maurice@kevenaar.name>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/nl/
Translation: Spoolman/Web Client
 2024-01-29 21:01:46 +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
bittin1ddc447d824349b2
e4b25d1eda Translated using Weblate (Swedish) 
Currently translated at 100.0% (209 of 209 strings)

Co-authored-by: bittin1ddc447d824349b2 <bittin@reimu.nl>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/sv/
Translation: Spoolman/Web Client
 2024-01-29 21:01:46 +01:00
gallegonovato
30c5891c11 Translated using Weblate (Spanish) 
Currently translated at 100.0% (239 of 239 strings)

Translated using Weblate (Spanish)

Currently translated at 100.0% (209 of 209 strings)

Co-authored-by: gallegonovato <fran-carro@hotmail.es>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/es/
Translation: Spoolman/Web Client
 2024-01-29 21:01:46 +01:00
Mick#6366
9b5d8969e5 Translated using Weblate (Czech) 
Currently translated at 100.0% (239 of 239 strings)

Translated using Weblate (Romanian)

Currently translated at 56.4% (118 of 209 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (209 of 209 strings)

Co-authored-by: Mick#6366 <kos.m@post.cz>
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/cs/
Translate-URL: https://hosted.weblate.org/projects/spoolman/web-client/ro/
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
hcooper
1273b20224 Support dynamic ports 2024-01-23 11:16:57 -08: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
hcooper
ccfec28bcd Switch from "docker-compose" to "docker compose" 
"docker compose" is the modern usage.
 2024-01-23 00:09:32 -08:00
dependabot[bot]
c014fb361b Bump vite from 5.0.10 to 5.0.12 in /client 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.10 to 5.0.12.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.0.12/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.0.12/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-19 22:07:08 +00:00