mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-10-31 07:49:57 +01:00 
			
		
		
		
	Merge branch 'master' into 'alias'
# Conflicts: # note_kfet/settings/base.py # note_kfet/urls.py
This commit is contained in:
		| @@ -6,5 +6,14 @@ | ||||
|             "domain": "localhost", | ||||
|             "name": "La Note Kfet \ud83c\udf7b" | ||||
|         } | ||||
|     }, | ||||
|     { | ||||
|         "model": "cas_server.servicepattern", | ||||
|         "pk": 1, | ||||
|         "fields": { | ||||
|             "pos": 1, | ||||
|             "pattern": ".*", | ||||
|             "name": "REPLACEME" | ||||
|         } | ||||
|     } | ||||
| ] | ||||
| @@ -55,6 +55,9 @@ INSTALLED_APPS = [ | ||||
|     # Autocomplete | ||||
|     'dal', | ||||
|     'dal_select2', | ||||
|     # CAS | ||||
|     'cas_server', | ||||
|     'cas', | ||||
|  | ||||
|     # Note apps | ||||
|     'activity', | ||||
| @@ -76,6 +79,7 @@ MIDDLEWARE = [ | ||||
|     'django.middleware.locale.LocaleMiddleware', | ||||
|     'django.contrib.sites.middleware.CurrentSiteMiddleware', | ||||
|     'note_kfet.middlewares.TurbolinksMiddleware', | ||||
|     'cas.middleware.CASMiddleware', | ||||
| ] | ||||
|  | ||||
| ROOT_URLCONF = 'note_kfet.urls' | ||||
| @@ -129,6 +133,7 @@ PASSWORD_HASHERS = [ | ||||
| AUTHENTICATION_BACKENDS = ( | ||||
|     'django.contrib.auth.backends.ModelBackend',  # this is default | ||||
|     'guardian.backends.ObjectPermissionBackend', | ||||
|     'cas.backends.CASBackend', | ||||
| ) | ||||
|  | ||||
| REST_FRAMEWORK = { | ||||
| @@ -195,3 +200,9 @@ MEDIA_URL='/media/' | ||||
| # Profile Picture Settings | ||||
| PIC_WIDTH = 200 | ||||
| PIC_RATIO = 1 | ||||
|  | ||||
| # CAS Settings | ||||
| CAS_AUTO_CREATE_USER = False | ||||
| CAS_LOGO_URL = "/static/img/Saperlistpopette.png" | ||||
| CAS_FAVICON_URL = "/static/favicon/favicon-32x32.png" | ||||
|  | ||||
|   | ||||
| @@ -48,3 +48,7 @@ CSRF_COOKIE_SECURE = False | ||||
| CSRF_COOKIE_HTTPONLY = False | ||||
| X_FRAME_OPTIONS = 'DENY' | ||||
| SESSION_COOKIE_AGE = 60 * 60 * 3 | ||||
|  | ||||
| # CAS Client settings | ||||
| # Can be modified in secrets.py | ||||
| CAS_SERVER_URL = "https://note.comby.xyz/cas/" | ||||
|   | ||||
| @@ -47,3 +47,6 @@ CSRF_COOKIE_SECURE = False | ||||
| CSRF_COOKIE_HTTPONLY = False | ||||
| X_FRAME_OPTIONS = 'DENY' | ||||
| SESSION_COOKIE_AGE = 60 * 60 * 3 | ||||
|  | ||||
| # CAS Client settings | ||||
| CAS_SERVER_URL = "https://note.crans.org/cas/" | ||||
|   | ||||
| @@ -1,11 +1,13 @@ | ||||
| # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay | ||||
| # SPDX-License-Identifier: GPL-3.0-or-later | ||||
|  | ||||
| from django.conf import settings | ||||
| from django.contrib import admin | ||||
| from django.urls import path, include | ||||
| from django.views.generic import RedirectView | ||||
| from django.conf.urls.static import static | ||||
| from django.conf import settings | ||||
|  | ||||
| from cas import views as cas_views | ||||
|  | ||||
| urlpatterns = [ | ||||
|     # Dev so redirect to something random | ||||
| @@ -14,6 +16,10 @@ urlpatterns = [ | ||||
|     # Include project routers | ||||
|     path('note/', include('note.urls')), | ||||
|  | ||||
|     # Include CAS Client routers | ||||
|     path('accounts/login/', cas_views.login, name='login'), | ||||
|     path('accounts/logout/', cas_views.logout, name='logout'), | ||||
|  | ||||
|     # Include Django Contrib and Core routers | ||||
|     path('i18n/', include('django.conf.urls.i18n')), | ||||
|     path('accounts/', include('member.urls')), | ||||
| @@ -21,6 +27,9 @@ urlpatterns = [ | ||||
|     path('admin/doc/', include('django.contrib.admindocs.urls')), | ||||
|     path('admin/', admin.site.urls), | ||||
|  | ||||
|     # Include CAS Server routers | ||||
|     path('cas/', include('cas_server.urls', namespace="cas_server")), | ||||
|  | ||||
|     # Include Django REST API | ||||
|     path('api/', include('api.urls')), | ||||
| ] | ||||
|   | ||||
| @@ -4,6 +4,8 @@ defusedxml==0.6.0 | ||||
| Django~=2.2 | ||||
| django-allauth==0.39.1 | ||||
| django-autocomplete-light==3.5.1 | ||||
| django-cas-client==1.5.3 | ||||
| django-cas-server==1.1.0 | ||||
| django-crispy-forms==1.7.2 | ||||
| django-extensions==2.1.9 | ||||
| django-filter==2.2.0 | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								static/img/Saperlistpopette.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								static/img/Saperlistpopette.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 2.6 MiB | 
		Reference in New Issue
	
	Block a user