Commit graph

104 commits

Author SHA1 Message Date
c7a4894bbb Remove static files from git cache on prod branch 2023-12-04 13:57:14 +08:00
71d0919c79 Remove static files from git cache 2023-12-04 13:54:46 +08:00
ce793c1d13 Merge branch 'prod' of github.com:lemeow125/EquipmentTracker-Backend 2023-12-04 13:47:17 +08:00
c0e3b22ff6 Merge branch 'ERD' of github.com:lemeow125/EquipmentTracker-Backend 2023-12-04 13:47:11 +08:00
Lorenzo
48e253adfe 12/3 commit 2023-12-03 16:54:28 +08:00
Keannu Bernasol
3eb9edd684
Merge pull request #12 from lemeow125/master
Merge to prod
2023-12-03 16:45:57 +08:00
Lorenzo
f0bc1d4483 12/3 ERD changes 2023-12-03 16:43:53 +08:00
ba857dff38 Add ID to equipment instance log serializer 2023-12-03 13:03:49 +08:00
8a38392534 Fix admin panel fields causing crashes 2023-12-03 12:38:37 +08:00
b4d177f8c3 Improve view in lists 2023-12-03 12:34:20 +08:00
c1ca024b4e Add is_technician field to django admin panel 2023-12-03 12:20:56 +08:00
f8bc36a2c4 Make domain compatible with hash router for activation 2023-12-03 01:12:31 +08:00
319c46d76d Update docker-compose 2023-12-03 01:00:10 +08:00
d8e4a0ba3e Update backend domain 2023-12-03 00:46:21 +08:00
fefc3aae38 Update deployment related files 2023-12-03 00:43:50 +08:00
ad295a0e6d Add docker-related files 2023-12-03 00:08:10 +08:00
2dbd9d2690 Return equipment and equipment instances sorted by id in ascending order 2023-12-02 22:08:36 +08:00
b707199bc0 Make remarks and description optional and nullable and add category field to equipment instance serializers 2023-12-02 22:01:27 +08:00
4a6bd1ef35 Add category to equipment model and improve serializers for equipments app 2023-12-02 20:58:55 +08:00
0529152375 Added django-unfold for admin panel theme 2023-11-30 23:40:29 +08:00
d50ca983da Fixed last_updated_by field for equipment and equipment instances 2023-11-20 01:53:19 +08:00
3ca24d395d Fixed passwords not being saved on registration 2023-11-20 00:22:51 +08:00
8cb45d4e50 updated reset password url 2023-11-20 00:00:48 +08:00
70a596c63e update domain name 2023-11-19 19:51:38 +08:00
079b88fe7f Pre-generate accounts as technicians by default 2023-11-19 19:06:03 +08:00
3a5f872c67 Pre-generate accounts as technicians by default 2023-11-19 19:05:36 +08:00
Keannu Bernasol
3dcd845f72
Merge pull request #11 from lemeow125/feature/equipment_groups
Feature/equipment groups
2023-11-19 18:59:24 +08:00
6f95978946 Fixed email activation 2023-11-19 18:58:41 +08:00
0d2721434a Show technician status in admin page 2023-11-13 18:49:30 +08:00
806be0157c Added is_technician field in customuser 2023-11-13 18:22:53 +08:00
a92d698ec9 Added OpenAPI decorators for equipment and instances 2023-11-13 18:13:18 +08:00
d6efa30759 Improved admin panel for equipment and equipment groups 2023-11-13 18:02:05 +08:00
03a4e07f7f Added equipment groups model and adjusted equipments postmigration script 2023-11-13 17:52:09 +08:00
0ea1251507 Added correct choices for status field in equipmentinstance 2023-11-13 17:28:40 +08:00
0e11d7e1ed Added history viewing for equipment and equipment instances in django admin 2023-11-12 22:10:54 +08:00
1163d64c06 Add equipment field to equipment instance log serializer to correctly identify equipment when viewing logs 2023-11-12 22:08:34 +08:00
53e4d8e02d Fix committed stuff 2023-11-12 22:01:28 +08:00
928a73b081 Fix gitignore 2023-11-12 22:00:26 +08:00
62652e4ebf Remove .env from repo 2023-11-12 21:58:30 +08:00
3ce93d840d Delete sqlite db 2023-11-12 21:56:14 +08:00
f5fc435b9d Fix gitignore to properly exclude sqlite db and static folder 2023-11-12 21:55:49 +08:00
449dd38fc1 Fix gitignore to properly exclude sqlite db and static folder 2023-11-12 21:55:42 +08:00
5b401c3824 Remove sqlite db again 2023-11-12 21:54:37 +08:00
4b33401221 Updated drf schema 2023-11-12 21:50:39 +08:00
1f9ed88e2e Remove sqlite db from repo 2023-11-12 21:49:07 +08:00
Keannu Bernasol
31b9778d40
Merge pull request #10 from lemeow125/feature/auth
Feature/auth
2023-11-12 21:47:24 +08:00
7609152767 Added all required functionality for equipments and equipment handling 2023-11-12 21:45:39 +08:00
2d0e602ba1 Added schema documentation 2023-11-09 19:52:03 +08:00
1c56369044 Added user model 2023-11-09 19:48:13 +08:00
Keannu Bernasol
2042f03501
Merge pull request #9 from lemeow125/ERD
ERD branch merge to master
2023-10-26 20:10:51 +08:00