Horilla 893fba65cc Fix merge conflict

2025-08-12 10:27:09 +05:30

..

cbv

[UPDT] HORILLA: Refactor html files to use Django i18n gettext in js

2025-08-08 14:44:09 +05:30

migrations

…

static/src

[UPDT] HORILLA: Refactor html files to use Django i18n gettext in js

2025-08-08 14:44:09 +05:30

templates

[UPDT] HORILLA: Refactor html files to use Django i18n gettext in js

2025-08-08 14:44:09 +05:30

templatetags

[UPDT] ASSET: Comment updates

2024-06-20 11:50:05 +05:30

__init__.py

…

admin.py

…

apps.py

[UPDT] ASSET: Updated models class, form class and form html for update the verbose name

2025-03-17 12:18:00 +05:30

filters.py

[ADD] HORILLA V2-BETA: Horilla V2-Beta - Initial Commit

2025-06-11 14:36:06 +05:30

forms.py

[ADD] HORILLA V2-BETA: Horilla V2-Beta - Initial Commit

2025-06-11 14:36:06 +05:30

models.py

[IMP] Merge from cbv branch updates with fixes related to v1

2025-08-01 17:58:33 +05:30

resources.py

…

scheduler.py

[UPDT] BASE: Updated scheduler add_job function call by adding it in a condition to start

2025-01-07 15:13:47 +05:30

sidebar.py

[UPDT] EMPLOYEE: Updated employee personal info as p html for translation tags

2024-12-31 18:57:34 +05:30

tests.py

[UPDT] ASSET: Comment updates

2024-06-20 11:50:05 +05:30

urls.py

[IMP] Merge from cbv branch updates with fixes related to v1

2025-08-01 17:58:33 +05:30

views.py

Fix merge conflict

2025-08-12 10:27:09 +05:30