Commit graph

198 commits

Author SHA1 Message Date
cayop 78ba2387ec Merge pull request 'hours' (#14) from hours into main
Reviewed-on: #14
2024-10-21 16:51:21 +00:00
Cayo Puigdefabregas 33cc462a4f resolve conflict 2024-10-21 18:41:43 +02:00
Cayo Puigdefabregas efcb53e062 repair bad jsons 2024-10-21 18:39:31 +02:00
Cayo Puigdefabregas e8d8c96700 add anchor in tabs of details of devices 2024-10-21 16:48:36 +02:00
Cayo Puigdefabregas ff91bc9ad9 change TIME_ZONE for env variable 2024-10-21 13:50:01 +02:00
Cayo Puigdefabregas 8d509e31c1 add date in list of events 2024-10-21 13:28:20 +02:00
Cayo Puigdefabregas 4bb71adf00 add hours of use 2024-10-21 13:27:45 +02:00
Cayo Puigdefabregas a0548b38c7 change EreuseWorkbench for workbench-script 2024-10-21 11:24:09 +02:00
cayop a9e39dcd3d Merge pull request 'lot: add a button to show/hide closed lots' (#2) from tau_showclosed-lot-sbtn into main
Reviewed-on: #2
2024-10-18 13:42:45 +00:00
Cayo Puigdefabregas 9badf494a6 resolve confict2 2024-10-18 15:30:56 +02:00
Cayo Puigdefabregas d98e8e2d48 resolve conficts 2024-10-18 15:27:39 +02:00
Cayo Puigdefabregas c60a9dd89d commit in login page 2024-10-18 15:25:27 +02:00
pedro 4cf164d4bc add commit footer for docker 2024-10-18 15:25:27 +02:00
pedro 9f05dee6a7 docker-compose: bugfix DOMAIN vs ALLOWED_HOSTS 2024-10-18 15:25:27 +02:00
pedro 1d9d100fae settings: bugfix format assert error msg on DOMAIN 2024-10-18 15:25:27 +02:00
pedro 096b83da81 settings: bugfix assert error msg on DOMAIN 2024-10-18 15:25:27 +02:00
pedro d995db8181 settings: improve assert error msg on DOMAIN 2024-10-18 15:25:27 +02:00
pedro 3d2cb7d184 docker: improve debug 2024-10-18 15:25:27 +02:00
Cayo Puigdefabregas b7c4926c39 add commit_id in settings 2024-10-18 15:25:27 +02:00
Cayo Puigdefabregas e6141bcc7f more debug in the error answer from api 2024-10-18 15:25:27 +02:00
Cayo Puigdefabregas 0b55d34d74 locale in settings 2024-10-18 15:25:27 +02:00
pedro c49644ffbd add ALLOWED_HOSTS in docker compose 2024-10-18 15:25:27 +02:00
pedro 425b032273 docker: use demo true/false instead of y/n 2024-10-18 15:25:27 +02:00
pedro bf47d4bc5d docker: bugfix wrong detection of demo 2024-10-18 15:25:27 +02:00
pedro 67869bc6f5 add predefined_token
as an alternative to the randomly generated, which is also possible
when no predefined_token is defined

also update .env.example vars
2024-10-18 15:25:27 +02:00
pedro f757c58356 snapshot processing: improve warning msg
add comment TODO that system annotation should happen
2024-10-18 15:25:27 +02:00
pedro 0e8607d93e docker: make default user admin 2024-10-18 15:25:27 +02:00
pedro 3d10217599 docker-reset: remove better the db
now that in db dir there are snapshots stored
2024-10-18 15:25:27 +02:00
Cayo Puigdefabregas d8b6d3ded6 fix hid in details of device 2024-10-18 15:25:27 +02:00
Cayo Puigdefabregas c422eaddeb clean code comment 2024-10-18 15:25:27 +02:00
Cayo Puigdefabregas 090ecc275f fix bug of tag 2024-10-18 15:25:27 +02:00
Cayo Puigdefabregas 2f9b61667d remove pdbs 2024-10-18 15:25:27 +02:00
Cayo Puigdefabregas 003d224c3e add save snapshots for imports and uploads 2024-10-18 15:25:27 +02:00
Cayo Puigdefabregas fae269eb8d save placeholders 2024-10-18 15:25:27 +02:00
Cayo Puigdefabregas 69a54b92fb save snapshots on disk from api 2024-10-18 15:25:27 +02:00
Cayo Puigdefabregas a08428c90b commit in login page 2024-10-18 12:03:31 +02:00
pedro f87897de85 add commit footer for docker 2024-10-18 10:45:08 +02:00
pedro 03b9c5fea8 docker-compose: bugfix DOMAIN vs ALLOWED_HOSTS 2024-10-18 10:28:02 +02:00
pedro a65d78e72f settings: bugfix format assert error msg on DOMAIN 2024-10-18 10:27:27 +02:00
pedro b0754d8e97 settings: bugfix assert error msg on DOMAIN 2024-10-18 10:26:38 +02:00
pedro 460fb678e9 settings: improve assert error msg on DOMAIN 2024-10-18 10:24:40 +02:00
pedro 8e8130fc34 docker: improve debug 2024-10-18 10:20:33 +02:00
Cayo Puigdefabregas 182f854570 add commit_id in settings 2024-10-18 09:52:09 +02:00
Cayo Puigdefabregas 1bb3b12636 more debug in the error answer from api 2024-10-17 19:08:00 +02:00
Cayo Puigdefabregas d94b12d1a0 locale in settings 2024-10-17 18:39:10 +02:00
pedro 2e638e40a9 add ALLOWED_HOSTS in docker compose 2024-10-16 22:48:42 +02:00
pedro 1751dc98c2 docker: use demo true/false instead of y/n 2024-10-16 22:07:40 +02:00
pedro ce9a69d6f7 docker: bugfix wrong detection of demo 2024-10-16 22:05:09 +02:00
pedro 71f68e2d4b add predefined_token
as an alternative to the randomly generated, which is also possible
when no predefined_token is defined

also update .env.example vars
2024-10-16 21:54:54 +02:00
pedro 11f4b647c2 snapshot processing: improve warning msg
add comment TODO that system annotation should happen
2024-10-16 21:14:22 +02:00