mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-07-31 04:51:15 +02:00
Merge remote-tracking branch 'origin/master' into activity
# Conflicts: # note_kfet/urls.py # templates/base.html
This commit is contained in:
.env_example.gitignore.gitmodulesDockerfileREADME.mdentrypoint.sh
apps
activity
api
logs
member
note
permission
__init__.pyadmin.py
scriptsapi
apps.pybackends.pyfixtures
migrations
models.pypermissions.pysignals.pytemplatetags
treasury
locale
media/pic
nginx_note.conf_examplenote_kfet
requirements
static
admin
css
autocomplete.cssbase.csschangelists.cssdashboard.cssfonts.cssforms.csslogin.cssresponsive.cssresponsive_rtl.cssrtl.css
vendor
widgets.cssfonts
img
LICENSEREADME.txtcalendar-icons.svg
gis
icon-addlink.svgicon-alert.svgicon-calendar.svgicon-changelink.svgicon-clock.svgicon-deletelink.svgicon-no.svgicon-unknown-alt.svgicon-unknown.svgicon-viewlink.svgicon-yes.svginline-delete.svgsearch.svgselector-icons.svgsorting-icons.svgtooltag-add.svgtooltag-arrowright.svgjs
SelectBox.jsSelectFilter2.jsactions.jsactions.min.js
admin
autocomplete.jscalendar.jscancel.jschange_form.jscollapse.jscollapse.min.jscore.jsinlines.jsinlines.min.jsjquery.init.jspopup_response.jsprepopulate.jsprepopulate.min.jsprepopulate_init.jstimeparse.jsurlify.jsvendor
jquery
select2
LICENSE.md
i18n
ar.jsaz.jsbg.jsca.jscs.jsda.jsde.jsel.jsen.jses.jset.jseu.jsfa.jsfi.jsfr.jsgl.jshe.jshi.jshr.jshu.jsid.jsis.jsit.jsja.jskm.jsko.jslt.jslv.jsmk.jsms.jsnb.jsnl.jspl.jspt-BR.jspt.jsro.jsru.jssk.jssr-Cyrl.jssr.jssv.jsth.jstr.jsuk.jsvi.jszh-CN.jszh-TW.js
select2.full.jsselect2.full.min.jsxregexp
autocomplete_light
django_tables2
bootstrap.css
themes
img
js
polymorphic
rest_framework
css
bootstrap-theme.min.cssbootstrap-tweaks.cssbootstrap.min.cssdefault.cssfont-awesome-4.0.3.cssprettify.css
docs
css
img
js
fonts
fontawesome-webfont.eotfontawesome-webfont.svgfontawesome-webfont.ttffontawesome-webfont.woffglyphicons-halflings-regular.eotglyphicons-halflings-regular.svgglyphicons-halflings-regular.ttfglyphicons-halflings-regular.woffglyphicons-halflings-regular.woff2
img
js
vendor
select2
Gruntfile.jsbower.jsoncomponent.jsoncomposer.json
docs
package.jsonsrc
js
banner.end.jsbanner.start.jsjquery.mousewheel.shim.jsjquery.select2.jsjquery.shim.jswrapper.end.jswrapper.start.js
select2
compat
core.jsdata
ajax.jsarray.jsbase.jsmaximumInputLength.jsmaximumSelectionLength.jsminimumInputLength.jsselect.jstags.jstokenizer.js
defaults.jsdiacritics.jsdropdown.jsdropdown
attachBody.jsattachContainer.jscloseOnSelect.jshidePlaceholder.jsinfiniteScroll.jsminimumResultsForSearch.jssearch.jsselectOnClose.jsstopPropagation.js
i18n
af.jsar.jsaz.jsbg.jsbn.jsbs.jsca.jscs.jsda.jsde.jsdsb.jsel.jsen.jses.jset.jseu.jsfa.jsfi.jsfr.jsgl.jshe.jshi.jshr.jshsb.jshu.jshy.jsid.jsis.jsit.jsja.jska.jskm.jsko.jslt.jslv.jsmk.jsms.jsnb.jsne.jsnl.jspl.jsps.jspt-BR.jspt.jsro.jsru.jssk.jssl.jssq.jssr-Cyrl.jssr.jssv.jsth.jstk.jstr.jsuk.jsvi.jszh-CN.jszh-TW.js
keys.jsoptions.jsresults.jsselection
allowClear.jsbase.jsclickMask.jseventRelay.jsmultiple.jsplaceholder.jssearch.jssingle.jsstopPropagation.js
translation.jsutils.jstests
a11y
data
array-tests.jsbase-tests.jsinputData-tests.jsmaximumInputLength-tests.jsmaximumSelectionLength-tests.jsminimumInputLength-tests.jsselect-tests.jstags-tests.jstokenizer-tests.js
dropdown
helpers.jsintegration-jq1.htmlintegration-jq2.htmlintegration-jq3.htmlintegration
options
results
selection
allowClear-tests.jscontainerCss-tests.jsmultiple-tests.jsplaceholder-tests.jssearch-tests.jssingle-tests.jsstopPropagation-tests.js
unit-jq1.htmlunit-jq2.htmlunit-jq3.htmlutils
vendor
templates
base.html
tox.inicas_server
base.htmlform.htmllogged.htmllogin.htmllogout.htmlproxy.xmlsamlValidate.xmlsamlValidateError.xmlserviceValidate.xmlserviceValidateError.xmlwarn.html
django_filters
member
club_detail.htmlclub_form.htmlclub_info.htmlclub_list.htmlclub_picture_update.htmlclub_tables.htmlnoteowner_detail.htmlpicture_update.htmlprofile_alias.htmlprofile_detail.htmlprofile_info.htmlprofile_picture_update.htmlprofile_tables.htmlsignup.html
note
registration
treasury
@ -1,10 +1,14 @@
|
||||
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
|
||||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.contrib import admin
|
||||
from django.urls import path, include
|
||||
from django.views.generic import RedirectView
|
||||
|
||||
from member.views import CustomLoginView
|
||||
|
||||
urlpatterns = [
|
||||
# Dev so redirect to something random
|
||||
path('', RedirectView.as_view(pattern_name='note:transfer'), name='index'),
|
||||
@ -13,13 +17,37 @@ urlpatterns = [
|
||||
path('note/', include('note.urls')),
|
||||
path('accounts/', include('member.urls')),
|
||||
path('activity/', include('activity.urls')),
|
||||
path('treasury/', include('treasury.urls')),
|
||||
|
||||
# Include Django Contrib and Core routers
|
||||
path('i18n/', include('django.conf.urls.i18n')),
|
||||
path('accounts/', include('django.contrib.auth.urls')),
|
||||
path('admin/doc/', include('django.contrib.admindocs.urls')),
|
||||
path('admin/', admin.site.urls),
|
||||
|
||||
# Include Django REST API
|
||||
path('accounts/', include('member.urls')),
|
||||
path('accounts/login/', CustomLoginView.as_view()),
|
||||
path('accounts/', include('django.contrib.auth.urls')),
|
||||
path('api/', include('api.urls')),
|
||||
]
|
||||
|
||||
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
|
||||
|
||||
|
||||
if "cas_server" in settings.INSTALLED_APPS:
|
||||
urlpatterns += [
|
||||
# Include CAS Server routers
|
||||
path('cas/', include('cas_server.urls', namespace="cas_server")),
|
||||
]
|
||||
if "cas" in settings.INSTALLED_APPS:
|
||||
from cas import views as cas_views
|
||||
urlpatterns += [
|
||||
# Include CAS Client routers
|
||||
path('accounts/login/cas/', cas_views.login, name='cas_login'),
|
||||
path('accounts/logout/cas/', cas_views.logout, name='cas_logout'),
|
||||
|
||||
]
|
||||
if "debug_toolbar" in settings.INSTALLED_APPS:
|
||||
import debug_toolbar
|
||||
urlpatterns = [
|
||||
path('__debug__/', include(debug_toolbar.urls)),
|
||||
] + urlpatterns
|
||||
|
Reference in New Issue
Block a user