Daniël Visser 4bc3f38f69 Merge branch 'marietje-zuid' into 'feature/improve-queueable' ...

# Conflicts:
#   marietje/queues/templates/queues/queue.html

2024-09-10 17:19:12 +02:00

..

api

Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap

2023-09-14 19:55:51 +02:00

management/commands

Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap

2023-09-14 19:55:51 +02:00

migrations

Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap

2023-09-14 19:55:51 +02:00

settings

Reimplement personal queue length overview

2023-10-12 15:43:01 +02:00

static/marietje

Merge branch 'marietje-zuid' into 'feature/improve-queueable'

2024-09-10 17:19:12 +02:00

templates/marietje

Marietje in header and fix load times for upload page

2024-02-21 15:40:41 +01:00

__init__.py

Clear reset_token upon successful login.

2017-01-30 03:57:53 +01:00

admin.py

Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap

2023-09-14 19:55:51 +02:00

context_processors.py

Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap

2023-09-14 19:55:51 +02:00

forms.py

Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap

2023-09-14 19:55:51 +02:00

models.py

Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap

2023-09-14 19:55:51 +02:00

signals.py

Clear reset_token upon successful login.

2017-01-30 03:57:53 +01:00

urls.py

Fix bug for Forgot Password page

2023-10-06 20:49:18 +02:00

utils.py

Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap

2023-09-14 19:55:51 +02:00

views.py

Marietje 4.1: Addition of Django REST framework, Swagger, Dark mode and updates to Django and Bootstrap

2023-09-14 19:55:51 +02:00

wsgi.py

Update settings layout for uWSGI

2023-10-13 08:47:45 +02:00