UL-FRI · gregorjerse · Oct 26, 2025 · Oct 26, 2025 · Copilot · Oct 26, 2025
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,2 +1,54 @@
-[tool.isort]
-profile = "black"
+[build-system]
+requires = ["setuptools >= 80.9.0", "setuptools_scm >= 8.3.1"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "timetable-fri"
+description = "UL FRI Timetable API"
+authors = [{ name = "Gregor Jerše", email = "gregor@jerse.info" }, { name = "Gašper Fele-Žorž", email = "polz@not.si" }]
+dynamic = ["version"]
+readme = "README.md"
+license = "GPL-3.0-or-later"
+requires-python = ">=3.13, <3.14"
+keywords = ["timetabling", "FRI", "university", "timetable", "api", "django", "rest-framework"]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Framework :: Django :: 5.2",
+    "Environment :: Console",
+    "Environment :: Web Environment",
+    "Intended Audience :: Education",
+    "Intended Audience :: Developers",
+    "Intended Audience :: System Administrators",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.13",
+]
+dependencies = [
+    "Django ~= 5.2.7",
+    "djangorestframework ~= 3.16.1",
+    "django-filter ~= 25.2",
+    "dj-rest-auth ~= 7.0.1",
+    "django-cors-headers ~= 4.9.0",
+    "python-ldap ~= 3.4.5",
+    "requests ~= 2.32.5",
+    "django-auth-ldap ~= 5.2.0",
+    "django-impersonate ~= 1.9.5",
+    "django-import-export ~= 4.3.12",
+    "pytz ~= 2025.2",
+    "icalendar ~= 6.3.1",
+    "palettable ~= 3.3.3",
+]
+[project.optional-dependencies]
+postgres = ["psycopg[binary] ~= 3.2.12"]
+docs = ["sphinx", "sphinx-pyproject"]
+package = ["twine", "check-manifest", "build"]
+test = ["ruff~=0.14.2", "pytest-cov"]
+devel = ["ipython", "types-tqdm"]
+[project.urls]
+repository = "https://github.com/ul-fri/urnik"
+documentation = "https://github.com/ul-fri/urnik"
+
+[tool.setuptools_scm]
+
diff --git a/exchange/__init__.py → src/exchange/__init__.py b/exchange/__init__.py → src/exchange/__init__.py
diff --git a/exchange/admin.py → src/exchange/admin.py b/exchange/admin.py → src/exchange/admin.py
diff --git a/exchange/apps.py → src/exchange/apps.py b/exchange/apps.py → src/exchange/apps.py
diff --git a/exchange/controllers.py → src/exchange/controllers.py b/exchange/controllers.py → src/exchange/controllers.py
diff --git a/exchange/forms.py → src/exchange/forms.py b/exchange/forms.py → src/exchange/forms.py
diff --git a/exchange/management/__init__.py → src/exchange/management/__init__.py b/exchange/management/__init__.py → src/exchange/management/__init__.py
diff --git a/exchange/management/commands/__init__.py → src/exchange/management/commands/__init__.py b/exchange/management/commands/__init__.py → src/exchange/management/commands/__init__.py
diff --git a/exchange/migrations/0001_initial.py → src/exchange/migrations/0001_initial.py b/exchange/migrations/0001_initial.py → src/exchange/migrations/0001_initial.py
diff --git a/exchange/migrations/__init__.py → src/exchange/migrations/__init__.py b/exchange/migrations/__init__.py → src/exchange/migrations/__init__.py
diff --git a/exchange/models.py → src/exchange/models.py b/exchange/models.py → src/exchange/models.py
diff --git a/exchange/static/css/exchange.css → src/exchange/static/css/exchange.css b/exchange/static/css/exchange.css → src/exchange/static/css/exchange.css
diff --git a/...e/templates/exchange/exchange_create.html → ...e/templates/exchange/exchange_create.html b/...e/templates/exchange/exchange_create.html → ...e/templates/exchange/exchange_create.html
diff --git a/...plates/exchange/exchange_create_help.html → ...plates/exchange/exchange_create_help.html b/...plates/exchange/exchange_create_help.html → ...plates/exchange/exchange_create_help.html
diff --git a/...ates/exchange/exchange_create_result.html → ...ates/exchange/exchange_create_result.html b/...ates/exchange/exchange_create_result.html → ...ates/exchange/exchange_create_result.html
diff --git a/...nge/templates/exchange/exchange_main.html → ...nge/templates/exchange/exchange_main.html b/...nge/templates/exchange/exchange_main.html → ...nge/templates/exchange/exchange_main.html
diff --git a/...ange/templates/exchange/student_main.html → ...ange/templates/exchange/student_main.html b/...ange/templates/exchange/student_main.html → ...ange/templates/exchange/student_main.html
diff --git a/...ange/templates/exchange/teacher_main.html → ...ange/templates/exchange/teacher_main.html b/...ange/templates/exchange/teacher_main.html → ...ange/templates/exchange/teacher_main.html
diff --git a/.../exchange/teacher_subject_management.html → .../exchange/teacher_subject_management.html b/.../exchange/teacher_subject_management.html → .../exchange/teacher_subject_management.html
diff --git a/...ates/exchange/template_exchange_list.html → ...ates/exchange/template_exchange_list.html b/...ates/exchange/template_exchange_list.html → ...ates/exchange/template_exchange_list.html
diff --git a/exchange/templatetags/__init__.py → src/exchange/templatetags/__init__.py b/exchange/templatetags/__init__.py → src/exchange/templatetags/__init__.py
diff --git a/exchange/templatetags/exchange_helpers.py → ...exchange/templatetags/exchange_helpers.py b/exchange/templatetags/exchange_helpers.py → ...exchange/templatetags/exchange_helpers.py
diff --git a/exchange/tests.py → src/exchange/tests.py b/exchange/tests.py → src/exchange/tests.py
diff --git a/exchange/urls.py → src/exchange/urls.py b/exchange/urls.py → src/exchange/urls.py
diff --git a/exchange/views.py → src/exchange/views.py b/exchange/views.py → src/exchange/views.py
diff --git a/frinajave/__init__.py → src/frinajave/__init__.py b/frinajave/__init__.py → src/frinajave/__init__.py
diff --git a/frinajave/admin.py → src/frinajave/admin.py b/frinajave/admin.py → src/frinajave/admin.py
diff --git a/frinajave/management/__init__.py → src/frinajave/management/__init__.py b/frinajave/management/__init__.py → src/frinajave/management/__init__.py
diff --git a/frinajave/management/commands/__init__.py → ...frinajave/management/commands/__init__.py b/frinajave/management/commands/__init__.py → ...frinajave/management/commands/__init__.py
diff --git a/frinajave/migrations/0001_initial.py → src/frinajave/migrations/0001_initial.py b/frinajave/migrations/0001_initial.py → src/frinajave/migrations/0001_initial.py
diff --git a/frinajave/migrations/__init__.py → src/frinajave/migrations/__init__.py b/frinajave/migrations/__init__.py → src/frinajave/migrations/__init__.py
diff --git a/frinajave/models.py → src/frinajave/models.py b/frinajave/models.py → src/frinajave/models.py
diff --git a/friprosveta/__init__.py → src/friprosveta/__init__.py b/friprosveta/__init__.py → src/friprosveta/__init__.py
diff --git a/friprosveta/admin.py → src/friprosveta/admin.py b/friprosveta/admin.py → src/friprosveta/admin.py
diff --git a/friprosveta/forms.py → src/friprosveta/forms.py b/friprosveta/forms.py → src/friprosveta/forms.py
diff --git a/friprosveta/locale/sl/LC_MESSAGES/django.mo → ...iprosveta/locale/sl/LC_MESSAGES/django.mo b/friprosveta/locale/sl/LC_MESSAGES/django.mo → ...iprosveta/locale/sl/LC_MESSAGES/django.mo
diff --git a/friprosveta/locale/sl/LC_MESSAGES/django.po → ...iprosveta/locale/sl/LC_MESSAGES/django.po b/friprosveta/locale/sl/LC_MESSAGES/django.po → ...iprosveta/locale/sl/LC_MESSAGES/django.po
diff --git a/friprosveta/management/__init__.py → src/friprosveta/management/__init__.py b/friprosveta/management/__init__.py → src/friprosveta/management/__init__.py
diff --git a/friprosveta/management/commands/__init__.py → ...iprosveta/management/commands/__init__.py b/friprosveta/management/commands/__init__.py → ...iprosveta/management/commands/__init__.py
diff --git a/.../management/commands/add_activity_tags.py → .../management/commands/add_activity_tags.py b/.../management/commands/add_activity_tags.py → .../management/commands/add_activity_tags.py
diff --git a/.../commands/add_default_subject_managers.py → .../commands/add_default_subject_managers.py b/.../commands/add_default_subject_managers.py → .../commands/add_default_subject_managers.py
diff --git a/...a/management/commands/add_teacher_tags.py → ...a/management/commands/add_teacher_tags.py b/...a/management/commands/add_teacher_tags.py → ...a/management/commands/add_teacher_tags.py
diff --git a/friprosveta/management/commands/add_user.py → ...iprosveta/management/commands/add_user.py b/friprosveta/management/commands/add_user.py → ...iprosveta/management/commands/add_user.py
diff --git a/...nt/commands/calculate_group_size_hints.py → ...nt/commands/calculate_group_size_hints.py b/...nt/commands/calculate_group_size_hints.py → ...nt/commands/calculate_group_size_hints.py
diff --git a/...anagement/commands/change_teacher_code.py → ...anagement/commands/change_teacher_code.py b/...anagement/commands/change_teacher_code.py → ...anagement/commands/change_teacher_code.py
diff --git a/.../management/commands/create_activities.py → .../management/commands/create_activities.py b/.../management/commands/create_activities.py → .../management/commands/create_activities.py
diff --git a/...anagement/commands/create_realizations.py → ...anagement/commands/create_realizations.py b/...anagement/commands/create_realizations.py → ...anagement/commands/create_realizations.py
diff --git a/...ement/commands/create_top_level_groups.py → ...ement/commands/create_top_level_groups.py b/...ement/commands/create_top_level_groups.py → ...ement/commands/create_top_level_groups.py
diff --git a/...sveta/management/commands/crossections.py → ...sveta/management/commands/crossections.py b/...sveta/management/commands/crossections.py → ...sveta/management/commands/crossections.py
diff --git a/...rosveta/management/commands/django2fet.py → ...rosveta/management/commands/django2fet.py b/...rosveta/management/commands/django2fet.py → ...rosveta/management/commands/django2fet.py
diff --git a/...agement/commands/export_student_groups.py → ...agement/commands/export_student_groups.py b/...agement/commands/export_student_groups.py → ...agement/commands/export_student_groups.py
diff --git a/...rosveta/management/commands/fet2django.py → ...rosveta/management/commands/fet2django.py b/...rosveta/management/commands/fet2django.py → ...rosveta/management/commands/fet2django.py
diff --git a/...veta/management/commands/fetcsv2django.py → ...veta/management/commands/fetcsv2django.py b/...veta/management/commands/fetcsv2django.py → ...veta/management/commands/fetcsv2django.py
diff --git a/...osveta/management/commands/fill_groups.py → ...osveta/management/commands/fill_groups.py b/...osveta/management/commands/fill_groups.py → ...osveta/management/commands/fill_groups.py
diff --git a/...nagement/commands/import_studis_najave.py → ...nagement/commands/import_studis_najave.py b/...nagement/commands/import_studis_najave.py → ...nagement/commands/import_studis_najave.py
diff --git a/...gement/commands/import_studis_students.py → ...gement/commands/import_studis_students.py b/...gement/commands/import_studis_students.py → ...gement/commands/import_studis_students.py
diff --git a/...t/commands/import_unitime_realizations.py → ...t/commands/import_unitime_realizations.py b/...t/commands/import_unitime_realizations.py → ...t/commands/import_unitime_realizations.py
diff --git a/...ta/management/commands/notify_teachers.py → ...ta/management/commands/notify_teachers.py b/...ta/management/commands/notify_teachers.py → ...ta/management/commands/notify_teachers.py
diff --git a/...commands/razporedi_pedagoge_na_diplome.py → ...commands/razporedi_pedagoge_na_diplome.py b/...commands/razporedi_pedagoge_na_diplome.py → ...commands/razporedi_pedagoge_na_diplome.py
diff --git a/...eta/management/commands/split_activity.py → ...eta/management/commands/split_activity.py b/...eta/management/commands/split_activity.py → ...eta/management/commands/split_activity.py
diff --git a/...osveta/management/commands/split_group.py → ...osveta/management/commands/split_group.py b/...osveta/management/commands/split_group.py → ...osveta/management/commands/split_group.py
diff --git a/...veta/management/commands/sync_subjects.py → ...veta/management/commands/sync_subjects.py b/...veta/management/commands/sync_subjects.py → ...veta/management/commands/sync_subjects.py
diff --git a/...veta/management/commands/sync_teachers.py → ...veta/management/commands/sync_teachers.py b/...veta/management/commands/sync_teachers.py → ...veta/management/commands/sync_teachers.py
diff --git a/...agement/commands/unitime/AcademicAreas.py → ...agement/commands/unitime/AcademicAreas.py b/...agement/commands/unitime/AcademicAreas.py → ...agement/commands/unitime/AcademicAreas.py
diff --git a/...ommands/unitime/AcademicClassification.py → ...ommands/unitime/AcademicClassification.py b/...ommands/unitime/AcademicClassification.py → ...ommands/unitime/AcademicClassification.py
diff --git a/...ent/commands/unitime/BuildingsAndRooms.py → ...ent/commands/unitime/BuildingsAndRooms.py b/...ent/commands/unitime/BuildingsAndRooms.py → ...ent/commands/unitime/BuildingsAndRooms.py
diff --git a/...nt/commands/unitime/ClassesTimePattern.py → ...nt/commands/unitime/ClassesTimePattern.py b/...nt/commands/unitime/ClassesTimePattern.py → ...nt/commands/unitime/ClassesTimePattern.py
diff --git a/.../management/commands/unitime/CreateXML.py → .../management/commands/unitime/CreateXML.py b/.../management/commands/unitime/CreateXML.py → .../management/commands/unitime/CreateXML.py
diff --git a/...nt/commands/unitime/DefaultTimePattern.py → ...nt/commands/unitime/DefaultTimePattern.py b/...nt/commands/unitime/DefaultTimePattern.py → ...nt/commands/unitime/DefaultTimePattern.py
diff --git a/...anagement/commands/unitime/Departments.py → ...anagement/commands/unitime/Departments.py b/...anagement/commands/unitime/Departments.py → ...anagement/commands/unitime/Departments.py
diff --git a/.../management/commands/unitime/ExportAll.py → .../management/commands/unitime/ExportAll.py b/.../management/commands/unitime/ExportAll.py → .../management/commands/unitime/ExportAll.py
diff --git a/...commands/unitime/LastLikeCourseDemands.py → ...commands/unitime/LastLikeCourseDemands.py b/...commands/unitime/LastLikeCourseDemands.py → ...commands/unitime/LastLikeCourseDemands.py
diff --git a/...eta/management/commands/unitime/Majors.py → ...eta/management/commands/unitime/Majors.py b/...eta/management/commands/unitime/Majors.py → ...eta/management/commands/unitime/Majors.py
diff --git a/...eta/management/commands/unitime/Minors.py → ...eta/management/commands/unitime/Minors.py b/...eta/management/commands/unitime/Minors.py → ...eta/management/commands/unitime/Minors.py
diff --git a/.../management/commands/unitime/Offerings.py → .../management/commands/unitime/Offerings.py b/.../management/commands/unitime/Offerings.py → .../management/commands/unitime/Offerings.py
diff --git a/...nagement/commands/unitime/RoomFeatures.py → ...nagement/commands/unitime/RoomFeatures.py b/...nagement/commands/unitime/RoomFeatures.py → ...nagement/commands/unitime/RoomFeatures.py
diff --git a/...veta/management/commands/unitime/Staff.py → ...veta/management/commands/unitime/Staff.py b/...veta/management/commands/unitime/Staff.py → ...veta/management/commands/unitime/Staff.py
diff --git a/.../commands/unitime/StaffTimePreferences.py → .../commands/unitime/StaffTimePreferences.py b/.../commands/unitime/StaffTimePreferences.py → .../commands/unitime/StaffTimePreferences.py
diff --git a/...commands/unitime/StudentAccommodations.py → ...commands/unitime/StudentAccommodations.py b/...commands/unitime/StudentAccommodations.py → ...commands/unitime/StudentAccommodations.py
diff --git a/...commands/unitime/StudentCourseRequests.py → ...commands/unitime/StudentCourseRequests.py b/...commands/unitime/StudentCourseRequests.py → ...commands/unitime/StudentCourseRequests.py
diff --git a/...nt/commands/unitime/StudentEnrollments.py → ...nt/commands/unitime/StudentEnrollments.py b/...nt/commands/unitime/StudentEnrollments.py → ...nt/commands/unitime/StudentEnrollments.py
diff --git a/...agement/commands/unitime/StudentGroups.py → ...agement/commands/unitime/StudentGroups.py b/...agement/commands/unitime/StudentGroups.py → ...agement/commands/unitime/StudentGroups.py
diff --git a/...a/management/commands/unitime/Students.py → ...a/management/commands/unitime/Students.py b/...a/management/commands/unitime/Students.py → ...a/management/commands/unitime/Students.py
diff --git a/...nagement/commands/unitime/SubjectAreas.py → ...nagement/commands/unitime/SubjectAreas.py b/...nagement/commands/unitime/SubjectAreas.py → ...nagement/commands/unitime/SubjectAreas.py
diff --git a/...t/commands/unitime/SubjectRequirements.py → ...t/commands/unitime/SubjectRequirements.py b/...t/commands/unitime/SubjectRequirements.py → ...t/commands/unitime/SubjectRequirements.py
diff --git a/...a/management/commands/unitime/__init__.py → ...a/management/commands/unitime/__init__.py b/...a/management/commands/unitime/__init__.py → ...a/management/commands/unitime/__init__.py
diff --git a/...eta/management/commands/unitime/common.py → ...eta/management/commands/unitime/common.py b/...eta/management/commands/unitime/common.py → ...eta/management/commands/unitime/common.py
diff --git a/...eta/management/commands/unitime_export.py → ...eta/management/commands/unitime_export.py b/...eta/management/commands/unitime_export.py → ...eta/management/commands/unitime_export.py
diff --git a/...commands/update_group_sizes_from_hints.py → ...commands/update_group_sizes_from_hints.py b/...commands/update_group_sizes_from_hints.py → ...commands/update_group_sizes_from_hints.py
diff --git a/...veta/management/commands/update_groups.py → ...veta/management/commands/update_groups.py b/...veta/management/commands/update_groups.py → ...veta/management/commands/update_groups.py
diff --git a/...t/commands/update_subgroups_from_hints.py → ...t/commands/update_subgroups_from_hints.py b/...t/commands/update_subgroups_from_hints.py → ...t/commands/update_subgroups_from_hints.py
diff --git a/...eta/management/commands/utils/__init__.py → ...eta/management/commands/utils/__init__.py b/...eta/management/commands/utils/__init__.py → ...eta/management/commands/utils/__init__.py
diff --git a/...nagement/commands/utils/subject_groups.py → ...nagement/commands/utils/subject_groups.py b/...nagement/commands/utils/subject_groups.py → ...nagement/commands/utils/subject_groups.py
diff --git a/...ent/commands/utils/unitime_allocations.py → ...ent/commands/utils/unitime_allocations.py b/...ent/commands/utils/unitime_allocations.py → ...ent/commands/utils/unitime_allocations.py
diff --git a/friprosveta/migrations/0001_initial.py → src/friprosveta/migrations/0001_initial.py b/friprosveta/migrations/0001_initial.py → src/friprosveta/migrations/0001_initial.py
diff --git a/...eta/migrations/0002_auto_20180228_1129.py → ...eta/migrations/0002_auto_20180228_1129.py b/...eta/migrations/0002_auto_20180228_1129.py → ...eta/migrations/0002_auto_20180228_1129.py
diff --git a/...eta/migrations/0003_auto_20180930_2347.py → ...eta/migrations/0003_auto_20180930_2347.py b/...eta/migrations/0003_auto_20180930_2347.py → ...eta/migrations/0003_auto_20180930_2347.py
diff --git a/...ations/0004_activity_ready_to_schedule.py → ...ations/0004_activity_ready_to_schedule.py b/...ations/0004_activity_ready_to_schedule.py → ...ations/0004_activity_ready_to_schedule.py
diff --git a/...igrations/0005_activity_cycles_on_site.py → ...igrations/0005_activity_cycles_on_site.py b/...igrations/0005_activity_cycles_on_site.py → ...igrations/0005_activity_cycles_on_site.py
diff --git a/friprosveta/migrations/__init__.py → src/friprosveta/migrations/__init__.py b/friprosveta/migrations/__init__.py → src/friprosveta/migrations/__init__.py
diff --git a/friprosveta/models.py → src/friprosveta/models.py b/friprosveta/models.py → src/friprosveta/models.py
diff --git a/friprosveta/restapi.py → src/friprosveta/restapi.py b/friprosveta/restapi.py → src/friprosveta/restapi.py
diff --git a/friprosveta/serializers.py → src/friprosveta/serializers.py b/friprosveta/serializers.py → src/friprosveta/serializers.py
diff --git a/friprosveta/static/css/allocations.css → src/friprosveta/static/css/allocations.css b/friprosveta/static/css/allocations.css → src/friprosveta/static/css/allocations.css
diff --git a/friprosveta/static/css/cgp.css → src/friprosveta/static/css/cgp.css b/friprosveta/static/css/cgp.css → src/friprosveta/static/css/cgp.css
diff --git a/friprosveta/static/css/cycles_overview.css → ...riprosveta/static/css/cycles_overview.css b/friprosveta/static/css/cycles_overview.css → ...riprosveta/static/css/cycles_overview.css
diff --git a/friprosveta/static/css/main.css → src/friprosveta/static/css/main.css b/friprosveta/static/css/main.css → src/friprosveta/static/css/main.css
diff --git a/...osveta/static/css/teacher_preferences.css → ...osveta/static/css/teacher_preferences.css b/...osveta/static/css/teacher_preferences.css → ...osveta/static/css/teacher_preferences.css
diff --git a/friprosveta/static/icon_addlink.gif → src/friprosveta/static/icon_addlink.gif b/friprosveta/static/icon_addlink.gif → src/friprosveta/static/icon_addlink.gif
diff --git a/...sveta/static/images/bg_circles_bottom.png → ...sveta/static/images/bg_circles_bottom.png b/...sveta/static/images/bg_circles_bottom.png → ...sveta/static/images/bg_circles_bottom.png
diff --git a/friprosveta/static/images/bg_circles_top.png → ...prosveta/static/images/bg_circles_top.png b/friprosveta/static/images/bg_circles_top.png → ...prosveta/static/images/bg_circles_top.png
diff --git a/friprosveta/static/images/bg_logo.png → src/friprosveta/static/images/bg_logo.png b/friprosveta/static/images/bg_logo.png → src/friprosveta/static/images/bg_logo.png
diff --git a/...osveta/static/images/bg_pattern_lines.png → ...osveta/static/images/bg_pattern_lines.png b/...osveta/static/images/bg_pattern_lines.png → ...osveta/static/images/bg_pattern_lines.png
diff --git a/friprosveta/static/images/bg_tile.gif → src/friprosveta/static/images/bg_tile.gif b/friprosveta/static/images/bg_tile.gif → src/friprosveta/static/images/bg_tile.gif
diff --git a/friprosveta/static/images/fri_logo.png → src/friprosveta/static/images/fri_logo.png b/friprosveta/static/images/fri_logo.png → src/friprosveta/static/images/fri_logo.png
diff --git a/friprosveta/static/images/logo_fri.gif → src/friprosveta/static/images/logo_fri.gif b/friprosveta/static/images/logo_fri.gif → src/friprosveta/static/images/logo_fri.gif
diff --git a/friprosveta/static/images/napis_fri.gif → src/friprosveta/static/images/napis_fri.gif b/friprosveta/static/images/napis_fri.gif → src/friprosveta/static/images/napis_fri.gif
diff --git a/friprosveta/static/images/tools/bg_tools.gif → ...prosveta/static/images/tools/bg_tools.gif b/friprosveta/static/images/tools/bg_tools.gif → ...prosveta/static/images/tools/bg_tools.gif
diff --git a/friprosveta/static/images/tools/contact.gif → ...iprosveta/static/images/tools/contact.gif b/friprosveta/static/images/tools/contact.gif → ...iprosveta/static/images/tools/contact.gif
diff --git a/...veta/static/images/tools/contact_over.gif → ...veta/static/images/tools/contact_over.gif b/...veta/static/images/tools/contact_over.gif → ...veta/static/images/tools/contact_over.gif
diff --git a/friprosveta/static/images/tools/en.gif → src/friprosveta/static/images/tools/en.gif b/friprosveta/static/images/tools/en.gif → src/friprosveta/static/images/tools/en.gif
diff --git a/friprosveta/static/images/tools/en_over.gif → ...iprosveta/static/images/tools/en_over.gif b/friprosveta/static/images/tools/en_over.gif → ...iprosveta/static/images/tools/en_over.gif
diff --git a/friprosveta/static/images/tools/home.gif → src/friprosveta/static/images/tools/home.gif b/friprosveta/static/images/tools/home.gif → src/friprosveta/static/images/tools/home.gif
diff --git a/...rosveta/static/images/tools/home_over.gif → ...rosveta/static/images/tools/home_over.gif b/...rosveta/static/images/tools/home_over.gif → ...rosveta/static/images/tools/home_over.gif
diff --git a/friprosveta/static/images/tools/intra.gif → ...friprosveta/static/images/tools/intra.gif b/friprosveta/static/images/tools/intra.gif → ...friprosveta/static/images/tools/intra.gif
diff --git a/...osveta/static/images/tools/intra_over.gif → ...osveta/static/images/tools/intra_over.gif b/...osveta/static/images/tools/intra_over.gif → ...osveta/static/images/tools/intra_over.gif
diff --git a/friprosveta/static/images/tools/rss.gif → src/friprosveta/static/images/tools/rss.gif b/friprosveta/static/images/tools/rss.gif → src/friprosveta/static/images/tools/rss.gif
diff --git a/friprosveta/static/images/tools/rss_over.gif → ...prosveta/static/images/tools/rss_over.gif b/friprosveta/static/images/tools/rss_over.gif → ...prosveta/static/images/tools/rss_over.gif
diff --git a/friprosveta/static/images/tools/sitemap.gif → ...iprosveta/static/images/tools/sitemap.gif b/friprosveta/static/images/tools/sitemap.gif → ...iprosveta/static/images/tools/sitemap.gif
diff --git a/...veta/static/images/tools/sitemap_over.gif → ...veta/static/images/tools/sitemap_over.gif b/...veta/static/images/tools/sitemap_over.gif → ...veta/static/images/tools/sitemap_over.gif
diff --git a/friprosveta/static/js/i18n.js → src/friprosveta/static/js/i18n.js b/friprosveta/static/js/i18n.js → src/friprosveta/static/js/i18n.js
diff --git a/friprosveta/static/js/jquery-1.7.1.js → src/friprosveta/static/js/jquery-1.7.1.js b/friprosveta/static/js/jquery-1.7.1.js → src/friprosveta/static/js/jquery-1.7.1.js
diff --git a/friprosveta/static/js/jquery-1.7.1.min.js → ...friprosveta/static/js/jquery-1.7.1.min.js b/friprosveta/static/js/jquery-1.7.1.min.js → ...friprosveta/static/js/jquery-1.7.1.min.js
diff --git a/friprosveta/static/js/jsi18n.js → src/friprosveta/static/js/jsi18n.js b/friprosveta/static/js/jsi18n.js → src/friprosveta/static/js/jsi18n.js
diff --git a/friprosveta/studis.py → src/friprosveta/studis.py b/friprosveta/studis.py → src/friprosveta/studis.py
diff --git a/friprosveta/templates/403.html → src/friprosveta/templates/403.html b/friprosveta/templates/403.html → src/friprosveta/templates/403.html
diff --git a/friprosveta/templates/base.html → src/friprosveta/templates/base.html b/friprosveta/templates/base.html → src/friprosveta/templates/base.html
diff --git a/...emplates/friprosveta/activity_detail.html → ...emplates/friprosveta/activity_detail.html b/...emplates/friprosveta/activity_detail.html → ...emplates/friprosveta/activity_detail.html
diff --git a/.../templates/friprosveta/activity_edit.html → .../templates/friprosveta/activity_edit.html b/.../templates/friprosveta/activity_edit.html → .../templates/friprosveta/activity_edit.html
diff --git a/...es/friprosveta/activity_requirements.html → ...es/friprosveta/activity_requirements.html b/...es/friprosveta/activity_requirements.html → ...es/friprosveta/activity_requirements.html
diff --git a/...ta/templates/friprosveta/allocations.html → ...ta/templates/friprosveta/allocations.html b/...ta/templates/friprosveta/allocations.html → ...ta/templates/friprosveta/allocations.html
diff --git a/...mplates/friprosveta/allocations_edit.html → ...mplates/friprosveta/allocations_edit.html b/...mplates/friprosveta/allocations_edit.html → ...mplates/friprosveta/allocations_edit.html
diff --git a/...ta/templates/friprosveta/assignments.html → ...ta/templates/friprosveta/assignments.html b/...ta/templates/friprosveta/assignments.html → ...ta/templates/friprosveta/assignments.html
diff --git a/.../templates/friprosveta/busy_students.html → .../templates/friprosveta/busy_students.html b/.../templates/friprosveta/busy_students.html → .../templates/friprosveta/busy_students.html
diff --git a/...ates/friprosveta/busy_students_admin.html → ...ates/friprosveta/busy_students_admin.html b/...ates/friprosveta/busy_students_admin.html → ...ates/friprosveta/busy_students_admin.html
diff --git a/...osveta/templates/friprosveta/cookies.html → ...osveta/templates/friprosveta/cookies.html b/...osveta/templates/friprosveta/cookies.html → ...osveta/templates/friprosveta/cookies.html
diff --git a/friprosveta/templates/friprosveta/faq.html → ...riprosveta/templates/friprosveta/faq.html b/friprosveta/templates/friprosveta/faq.html → ...riprosveta/templates/friprosveta/faq.html
diff --git a/...eta/templates/friprosveta/group_list.html → ...eta/templates/friprosveta/group_list.html b/...eta/templates/friprosveta/group_list.html → ...eta/templates/friprosveta/group_list.html
diff --git a/...templates/friprosveta/group_overview.html → ...templates/friprosveta/group_overview.html b/...templates/friprosveta/group_overview.html → ...templates/friprosveta/group_overview.html
diff --git a/...plates/friprosveta/group_preferences.html → ...plates/friprosveta/group_preferences.html b/...plates/friprosveta/group_preferences.html → ...plates/friprosveta/group_preferences.html
diff --git a/friprosveta/templates/friprosveta/index.html → ...prosveta/templates/friprosveta/index.html b/friprosveta/templates/friprosveta/index.html → ...prosveta/templates/friprosveta/index.html
diff --git a/...ta/templates/friprosveta/najave_list.html → ...ta/templates/friprosveta/najave_list.html b/...ta/templates/friprosveta/najave_list.html → ...ta/templates/friprosveta/najave_list.html
diff --git a/...plates/friprosveta/place_realization.html → ...plates/friprosveta/place_realization.html b/...plates/friprosveta/place_realization.html → ...plates/friprosveta/place_realization.html
diff --git a/...es/friprosveta/preference_types_list.html → ...es/friprosveta/preference_types_list.html b/...es/friprosveta/preference_types_list.html → ...es/friprosveta/preference_types_list.html
diff --git a/.../friprosveta/problematic_allocations.html → .../friprosveta/problematic_allocations.html b/.../friprosveta/problematic_allocations.html → .../friprosveta/problematic_allocations.html
diff --git a/...sveta/templates/friprosveta/problems.html → ...sveta/templates/friprosveta/problems.html b/...sveta/templates/friprosveta/problems.html → ...sveta/templates/friprosveta/problems.html
diff --git a/...osveta/templates/friprosveta/results.html → ...osveta/templates/friprosveta/results.html b/...osveta/templates/friprosveta/results.html → ...osveta/templates/friprosveta/results.html
diff --git a/.../templates/friprosveta/students_list.html → .../templates/friprosveta/students_list.html b/.../templates/friprosveta/students_list.html → .../templates/friprosveta/students_list.html
diff --git a/...osveta/templates/friprosveta/subject.html → ...osveta/templates/friprosveta/subject.html b/...osveta/templates/friprosveta/subject.html → ...osveta/templates/friprosveta/subject.html
diff --git a/...a/templates/friprosveta/subject_list.html → ...a/templates/friprosveta/subject_list.html b/...a/templates/friprosveta/subject_list.html → ...a/templates/friprosveta/subject_list.html
diff --git a/...ates/friprosveta/tag_preference_list.html → ...ates/friprosveta/tag_preference_list.html b/...ates/friprosveta/tag_preference_list.html → ...ates/friprosveta/tag_preference_list.html
diff --git a/...tes/friprosveta/tag_time_preferences.html → ...tes/friprosveta/tag_time_preferences.html b/...tes/friprosveta/tag_time_preferences.html → ...tes/friprosveta/tag_time_preferences.html
diff --git a/...prosveta/teacher_formset_preferences.html → ...prosveta/teacher_formset_preferences.html b/...prosveta/teacher_formset_preferences.html → ...prosveta/teacher_formset_preferences.html
diff --git a/.../templates/friprosveta/teacher_hours.html → .../templates/friprosveta/teacher_hours.html b/.../templates/friprosveta/teacher_hours.html → .../templates/friprosveta/teacher_hours.html
diff --git a/...ates/friprosveta/teacher_hours_table.html → ...ates/friprosveta/teacher_hours_table.html b/...ates/friprosveta/teacher_hours_table.html → ...ates/friprosveta/teacher_hours_table.html
diff --git a/.../friprosveta/teacher_preference_list.html → .../friprosveta/teacher_preference_list.html b/.../friprosveta/teacher_preference_list.html → .../friprosveta/teacher_preference_list.html
diff --git a/...eacher_single_democratic_preferences.html → ...eacher_single_democratic_preferences.html b/...eacher_single_democratic_preferences.html → ...eacher_single_democratic_preferences.html
diff --git a/...iprosveta/teacher_single_preferences.html → ...iprosveta/teacher_single_preferences.html b/...iprosveta/teacher_single_preferences.html → ...iprosveta/teacher_single_preferences.html
diff --git a/...eta/timetable_teacherpreference_list.html → ...eta/timetable_teacherpreference_list.html b/...eta/timetable_teacherpreference_list.html → ...eta/timetable_teacherpreference_list.html
diff --git a/friprosveta/templates/navigation.html → src/friprosveta/templates/navigation.html b/friprosveta/templates/navigation.html → src/friprosveta/templates/navigation.html
diff --git a/...ta/templates/registration/logged_out.html → ...ta/templates/registration/logged_out.html b/...ta/templates/registration/logged_out.html → ...ta/templates/registration/logged_out.html
diff --git a/...rosveta/templates/registration/login.html → ...rosveta/templates/registration/login.html b/...rosveta/templates/registration/login.html → ...rosveta/templates/registration/login.html
diff --git a/...s/timetable/activityrealization_list.html → ...s/timetable/activityrealization_list.html b/...s/timetable/activityrealization_list.html → ...s/timetable/activityrealization_list.html
diff --git a/...a/templates/timetable/timetable_list.html → ...a/templates/timetable/timetable_list.html b/...a/templates/timetable/timetable_list.html → ...a/templates/timetable/timetable_list.html
diff --git a/...emplates/timetable/timetableset_list.html → ...emplates/timetable/timetableset_list.html b/...emplates/timetable/timetableset_list.html → ...emplates/timetable/timetableset_list.html
diff --git a/friprosveta/tests.py → src/friprosveta/tests.py b/friprosveta/tests.py → src/friprosveta/tests.py
diff --git a/friprosveta/ul_groupname.py → src/friprosveta/ul_groupname.py b/friprosveta/ul_groupname.py → src/friprosveta/ul_groupname.py
diff --git a/friprosveta/urls.py → src/friprosveta/urls.py b/friprosveta/urls.py → src/friprosveta/urls.py
diff --git a/friprosveta/views.py → src/friprosveta/views.py b/friprosveta/views.py → src/friprosveta/views.py
diff --git a/timetable/__init__.py → src/timetable/__init__.py b/timetable/__init__.py → src/timetable/__init__.py
diff --git a/timetable/admin.py → src/timetable/admin.py b/timetable/admin.py → src/timetable/admin.py
@@ -29,7 +29,7 @@ class TeacherAdmin(ImportExportActionModelAdmin):
         "activities__name",
         "activities__short_name",
     )
-    filter_horizontal = ("activities",)
+    # filter_horizontal = ("activities",)
 
 
 class ClassroomNResourcesInline(admin.TabularInline):
@@ -41,7 +41,7 @@ class ClassroomNResourcesInline(admin.TabularInline):
 
 
 class ClassroomAdmin(ImportExportActionModelAdmin):
-    filter_horizontal = ("resources",)
+    # filter_horizontal = ("resources",)
     list_filter = ("classroomset",)
     inlines = [
         ClassroomNResourcesInline,

diff --git a/timetable/forms.py → src/timetable/forms.py b/timetable/forms.py → src/timetable/forms.py
diff --git a/timetable/management/__init__.py → src/timetable/management/__init__.py b/timetable/management/__init__.py → src/timetable/management/__init__.py
diff --git a/timetable/management/commands/__init__.py → ...timetable/management/commands/__init__.py b/timetable/management/commands/__init__.py → ...timetable/management/commands/__init__.py
diff --git a/timetable/management/commands/copy_groups.py → ...etable/management/commands/copy_groups.py b/timetable/management/commands/copy_groups.py → ...etable/management/commands/copy_groups.py
diff --git a/timetable/migrations/0001_initial.py → src/timetable/migrations/0001_initial.py b/timetable/migrations/0001_initial.py → src/timetable/migrations/0001_initial.py
diff --git a/...ble/migrations/0002_auto_20180228_1129.py → ...ble/migrations/0002_auto_20180228_1129.py b/...ble/migrations/0002_auto_20180228_1129.py → ...ble/migrations/0002_auto_20180228_1129.py
diff --git a/...ble/migrations/0003_auto_20180930_2347.py → ...ble/migrations/0003_auto_20180930_2347.py b/...ble/migrations/0003_auto_20180930_2347.py → ...ble/migrations/0003_auto_20180930_2347.py
diff --git a/...tions/0004_group_visible_in_navigation.py → ...tions/0004_group_visible_in_navigation.py b/...tions/0004_group_visible_in_navigation.py → ...tions/0004_group_visible_in_navigation.py
diff --git a/...ons/0005_alter_activity_mustnotoverlap.py → ...ons/0005_alter_activity_mustnotoverlap.py b/...ons/0005_alter_activity_mustnotoverlap.py → ...ons/0005_alter_activity_mustnotoverlap.py
diff --git a/...igrations/0006_activity_required_rooms.py → ...igrations/0006_activity_required_rooms.py b/...igrations/0006_activity_required_rooms.py → ...igrations/0006_activity_required_rooms.py
diff --git a/timetable/migrations/__init__.py → src/timetable/migrations/__init__.py b/timetable/migrations/__init__.py → src/timetable/migrations/__init__.py
diff --git a/timetable/models.py → src/timetable/models.py b/timetable/models.py → src/timetable/models.py
@@ -570,7 +570,8 @@ def default_timetable(request):
     - IndexError when no public timetable exists for a given site.
     """
     all_timetables = Timetable.objects.all()
-    current_site = get_current_site(request)
+    #current_site = get_current_site(request)
+    current_site = Site.objects.all().last()
-    #current_site = get_current_site(request)
-    current_site = Site.objects.all().last()
+    current_site = get_current_site(request)
-    #current_site = get_current_site(request)
-    current_site = Site.objects.all().last()
+    current_site = get_current_site(request)
     current_site_default_timetables = all_timetables.filter(
         timetablesite__site=current_site, public=True, timetablesite__default=True
     )

diff --git a/timetable/static/js/activities.js → src/timetable/static/js/activities.js b/timetable/static/js/activities.js → src/timetable/static/js/activities.js
diff --git a/timetable/static/js/preferences.js → src/timetable/static/js/preferences.js b/timetable/static/js/preferences.js → src/timetable/static/js/preferences.js
diff --git a/timetable/templates/404.html → src/timetable/templates/404.html b/timetable/templates/404.html → src/timetable/templates/404.html
diff --git a/timetable/templates/500.html → src/timetable/templates/500.html b/timetable/templates/500.html → src/timetable/templates/500.html
diff --git a/...ates/timetable/activity_requirements.html → ...ates/timetable/activity_requirements.html b/...ates/timetable/activity_requirements.html → ...ates/timetable/activity_requirements.html
diff --git a/...able/templates/timetable/allocations.html → ...able/templates/timetable/allocations.html b/...able/templates/timetable/allocations.html → ...able/templates/timetable/allocations.html
diff --git a/timetable/templates/timetable/index.html → src/timetable/templates/timetable/index.html b/timetable/templates/timetable/index.html → src/timetable/templates/timetable/index.html
diff --git a/timetable/templates/timetable/results.html → ...imetable/templates/timetable/results.html b/timetable/templates/timetable/results.html → ...imetable/templates/timetable/results.html
diff --git a/...imetable/teacher_formset_preferences.html → ...imetable/teacher_formset_preferences.html b/...imetable/teacher_formset_preferences.html → ...imetable/teacher_formset_preferences.html
diff --git a/...timetable/teacher_single_preferences.html → ...timetable/teacher_single_preferences.html b/...timetable/teacher_single_preferences.html → ...timetable/teacher_single_preferences.html
diff --git a/...ble/timetable_teacherpreference_list.html → ...ble/timetable_teacherpreference_list.html b/...ble/timetable_teacherpreference_list.html → ...ble/timetable_teacherpreference_list.html
diff --git a/timetable/templatetags/__init__.py → src/timetable/templatetags/__init__.py b/timetable/templatetags/__init__.py → src/timetable/templatetags/__init__.py
diff --git a/timetable/templatetags/timetable_extras.py → ...imetable/templatetags/timetable_extras.py b/timetable/templatetags/timetable_extras.py → ...imetable/templatetags/timetable_extras.py
diff --git a/timetable/urls.py → src/timetable/urls.py b/timetable/urls.py → src/timetable/urls.py
diff --git a/timetable/views.py → src/timetable/views.py b/timetable/views.py → src/timetable/views.py
diff --git a/unitime/__init__.py → src/unitime/__init__.py b/unitime/__init__.py → src/unitime/__init__.py
diff --git a/unitime/admin.py → src/unitime/admin.py b/unitime/admin.py → src/unitime/admin.py
diff --git a/unitime/migrations/0001_initial.py → src/unitime/migrations/0001_initial.py b/unitime/migrations/0001_initial.py → src/unitime/migrations/0001_initial.py
diff --git a/unitime/migrations/__init__.py → src/unitime/migrations/__init__.py b/unitime/migrations/__init__.py → src/unitime/migrations/__init__.py
diff --git a/unitime/models.py → src/unitime/models.py b/unitime/models.py → src/unitime/models.py
diff --git a/urnik_fri/__init__.py → src/urnik_fri/__init__.py b/urnik_fri/__init__.py → src/urnik_fri/__init__.py
diff --git a/urnik_fri/celery.py → src/urnik_fri/celery.py b/urnik_fri/celery.py → src/urnik_fri/celery.py
diff --git a/src/urnik_fri/settings.py b/src/urnik_fri/settings.py
@@ -0,0 +1,195 @@
+# Django settings for urnik project.
+import ldap
+from django_auth_ldap.config import LDAPSearch, GroupOfNamesType
+from friprosveta.ul_groupname import ULNestedGroupOfNamesType
+from django.utils.translation import gettext_lazy as _
+from urnik_fri.settings_common import *
+
+# DEBUG = False
+DEBUG = True
+
+#--- UNITIME settings ------
+UNITIME_DB_USER = "user"
+UNITIME_DB_PASSWORD = "password"
+UNITIME_DB_NAME = "db_name"
+UNITIME_DB_HOST = "db_host"
+# -------------------------
+
+
+ADMINS = (  
+    ('polz', 'polz@fri.uni-lj.si'),
+    ('gregor', 'gregor.jerse@fri.uni-lj.si'),
+    ('gregorj', 'gregor@jerse.info'),
+    ('gasperfele@fri1.uni-lj.si', 'polz@fri.uni-lj.si'),
+)
+MANAGERS = ADMINS
+
+# AUTHENTICATION_BACKENDS = (
+#     'guardian.backends.ObjectPermissionBackend',
+#     'django.contrib.auth.backends.ModelBackend', # this is default
+# )
+
+#-----------------------------------------
+# Email settings
+#-----------------------------------------
+EMAIL_HOST = '10.0.32.2'
+EMAIL_PORT = 25
+#EMAIL_HOST_USER = 'urnik'
+#EMAIL_HOST_PASSWORD = 'pogreglz'
+EMAIL_USE_TLS = True
+
+
+#-----------------------------------------
+# Database settings
+#-----------------------------------------
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': 'timetable',                      # Or path to database file if using sqlite3.
+        'USER': 'timetable',                      # Not used with sqlite3.
+        'PASSWORD': 'qOvpzZODQ4n55JKRyRU16PJBEeUde1uK',                 # Not used with sqlite3.
+        'HOST': 'simargl.jerse.info',                      # Set to empty string for localhost. Not used with sqlite3.
-        'NAME': 'timetable',                      # Or path to database file if using sqlite3.
-        'USER': 'timetable',                      # Not used with sqlite3.
-        'PASSWORD': 'qOvpzZODQ4n55JKRyRU16PJBEeUde1uK',                 # Not used with sqlite3.
-        'HOST': 'simargl.jerse.info',                      # Set to empty string for localhost. Not used with sqlite3.
+        'NAME': os.environ.get('DB_NAME', ''),                      # Or path to database file if using sqlite3.
+        'USER': os.environ.get('DB_USER', ''),                      # Not used with sqlite3.
+        'PASSWORD': os.environ.get('DB_PASSWORD', ''),                 # Not used with sqlite3.
+        'HOST': os.environ.get('DB_HOST', ''),                      # Set to empty string for localhost. Not used with sqlite3.
-        'NAME': 'timetable',                      # Or path to database file if using sqlite3.
-        'USER': 'timetable',                      # Not used with sqlite3.
-        'PASSWORD': 'qOvpzZODQ4n55JKRyRU16PJBEeUde1uK',                 # Not used with sqlite3.
-        'HOST': 'simargl.jerse.info',                      # Set to empty string for localhost. Not used with sqlite3.
+        'NAME': os.environ.get('DB_NAME', ''),                      # Or path to database file if using sqlite3.
+        'USER': os.environ.get('DB_USER', ''),                      # Not used with sqlite3.
+        'PASSWORD': os.environ.get('DB_PASSWORD', ''),                 # Not used with sqlite3.
+        'HOST': os.environ.get('DB_HOST', ''),                      # Set to empty string for localhost. Not used with sqlite3.
+    },
+}
+
+import os
+
+#-----------------------------------------
+# Django secret key
+# Make this unique, and don't share it with anybody.
+#-----------------------------------------
+SECRET_KEY = 'make_this_unique_and_dont_share_it_with_anybody_sure'
-SECRET_KEY = 'make_this_unique_and_dont_share_it_with_anybody_sure'
+SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY')
+if not SECRET_KEY:
+    raise RuntimeError("DJANGO_SECRET_KEY environment variable is not set. Please set it to a cryptographically strong random string.")
-SECRET_KEY = 'make_this_unique_and_dont_share_it_with_anybody_sure'
+SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY')
+if not SECRET_KEY:
+    raise RuntimeError("DJANGO_SECRET_KEY environment variable is not set. Please set it to a cryptographically strong random string.")
+
+
+#-----------------------------------------
+# LDAP settings
+#-----------------------------------------
+# AUTH_LDAP_SERVER_URI = "ldaps://[2001:1470:fffd:ff90::ad1]:3269"
+# AUTH_LDAP_SERVER_URI = "ldaps://dcv1fri1.fri1.uni-lj.si:3269"
+# AUTH_LDAP_BIND_DN = "CN=ldapp,OU=System;OU=admin;DC=fri1;DC=uni-lj;DC=si"
+# AUTH_LDAP_BIND_PASSWORD = "Fu3[EBu`P'JHNuktV]3cNVRN"
+# AUTH_LDAP_USER_SEARCH = LDAPSearch(
+#     "DC=uni-lj,DC=si",
+#     ldap.SCOPE_SUBTREE, "(userPrincipalName=%(user)s)")
+# # Mirror groups in LDAP
+# AUTH_LDAP_GROUP_SEARCH = LDAPSearch(
+#     "DC=uni-lj,DC=si",
+#     ldap.SCOPE_SUBTREE, "(objectClass=group)"
+# )
+# AUTH_LDAP_GROUP_TYPE = ULNestedGroupOfNamesType(name_attr="cn")
+# AUTH_LDAP_MIRROR_GROUPS = True
+# # Only users in this group can log in.
+# # AUTH_LDAP_REQUIRE_GROUP = "cn=enabled,ou=django,ou=groups,dc=example,dc=com"
+# # Populate the Django user from the LDAP directory.
+# AUTH_LDAP_USER_ATTR_MAP = {
+#     "first_name": "givenName",
+#     "last_name": "sn",
+#     "email": "mail"
+# }
+# # AUTH_LDAP_PROFILE_ATTR_MAP = {
+# #     "employee_number": "employeeNumber"
+# # }
+
+# AUTH_LDAP_USER_FLAGS_BY_GROUP = {
+# #    "is_active": "cn=active,ou=django,ou=groups,dc=example,dc=com",
+# #    "is_staff": "cn=staff,ou=django,ou=groups,dc=example,dc=com",
+# #    "is_superuser": "cn=superuser,ou=django,ou=groups,dc=example,dc=com"
+# }
+
+# # This is the default, but I like to be explicit.
+# AUTH_LDAP_ALWAYS_UPDATE_USER = True
+# # Use LDAP group membership to calculate group permissions.
+# #AUTH_LDAP_FIND_GROUP_PERMS = True
+# # Cache group memberships for an hour to minimize LDAP traffic
+# AUTH_LDAP_CACHE_GROUPS = True
+# AUTH_LDAP_GROUP_CACHE_TIMEOUT = 3600
+
+# -----------------------------------
+# Timplate settings
-# Timplate settings
+# Template settings
-# Timplate settings
+# Template settings
+# Make sure Debug is False
+# -----------------------------------
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            'templates',
+        ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'debug': False,
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+                'django.template.context_processors.debug',
+                'django.template.context_processors.i18n',
+                'django.template.context_processors.media',
+                'django.template.context_processors.request',
+                'django.template.context_processors.static',
+                'django.template.context_processors.tz',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
+# -----------------------------------
+# Logging settings
+# -----------------------------------
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': True,
+    'formatters': {
+        'verbose': {
+            'format': '%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s'
+        },
+        'simple': {
+            'format': '%(levelname)s %(message)s'
+        },
+    },
+    'handlers': {
+        'null': {
+            'level': 'DEBUG',
+            'class': 'logging.NullHandler',
+        },
+        'console':{
+            'level': 'DEBUG',
+            'class': 'logging.StreamHandler',
+            'formatter': 'simple'
+        },
+        'file':{
+            'level': 'DEBUG',
+            'class': 'logging.FileHandler',
+            'filename': '/home/gregor/urnik/django.log',
+            'formatter': 'verbose'
+        },
+    },
+    'loggers': {
+        'django': {
+            'handlers': ['file'],
+            'propagate': True,
+            'level': 'INFO',
+        },
+        'friprosveta': {
+            'handlers': ['console', 'file'],
+            # 'handlers': ['null'],
+            'level': 'INFO',
+        },
+        'friprosveta': {
+            'handlers': ['file'],
+            # 'handlers': ['null'],
-            'level': 'INFO',
-        },
-        'friprosveta': {
-            'handlers': ['file'],
-            # 'handlers': ['null'],
-            'level': 'INFO',
-        },
-        'friprosveta': {
-            'handlers': ['file'],
-            # 'handlers': ['null'],
+            'level': 'DEBUG',
+        },
+
+    }
+}
+
+# -----------------------------------
+# Studis API settings
+# -----------------------------------
+STUDIS_API_BASE_URL = 'https://studisfri.uni-lj.si/api'
+STUDIS_API_TOKEN = 'sanja-svinja-kokoruz'
+
+
+#------------------------------------
+# Exchange settings
+#------------------------------------
+STUDENT_MAPPER_PRODUCTION = True
diff --git a/urnik_fri/settings_common.py → src/urnik_fri/settings_common.py b/urnik_fri/settings_common.py → src/urnik_fri/settings_common.py
@@ -111,7 +111,6 @@
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.locale.LocaleMiddleware",
     "django.middleware.common.CommonMiddleware",
-    "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",

diff --git a/urnik_fri/settings_example.py → src/urnik_fri/settings_example.py b/urnik_fri/settings_example.py → src/urnik_fri/settings_example.py
diff --git a/urnik_fri/settings_midime.py → src/urnik_fri/settings_midime.py b/urnik_fri/settings_midime.py → src/urnik_fri/settings_midime.py
@@ -113,12 +113,12 @@
             "class": "logging.StreamHandler",
             "formatter": "simple",
         },
-        "file": {
-            "level": "DEBUG",
-            "class": "logging.FileHandler",
-            "filename": "/home/gregor/personal/urnik/debug.log",
-            "formatter": "verbose",
-        },
+        # "file": {
+        #     "level": "DEBUG",
+        #     "class": "logging.FileHandler",
+        #     "filename": "/home/gregor/personal/urnik/debug.log",
+        #     "formatter": "verbose",
+        # },
     },
     "loggers": {
         "django": {

diff --git a/urnik_fri/urls.py → src/urnik_fri/urls.py b/urnik_fri/urls.py → src/urnik_fri/urls.py
diff --git a/urnik_fri/wsgi_example.py → src/urnik_fri/wsgi_example.py b/urnik_fri/wsgi_example.py → src/urnik_fri/wsgi_example.py