mam/mamweb
11
0
Fork 0
Code Issues Pull requests 8 Projects Wiki Activity Actions

Merge branch 'treenode_editor' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into treenode_editor

Browse source
This commit is contained in:
Tomas 'Jethro' Pokorny 2020-11-18 00:24:27 +01:00
commit 90db059725
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/sitetree_new.json
View file

File diff suppressed because one or more lines are too long

2
mamweb/settings_local.py
View file

@ -28,7 +28,7 @@ INTERNAL_IPS = ['127.0.0.1']
TEMPLATES[0]['OPTIONS']['debug'] = True TEMPLATES[0]['OPTIONS']['debug'] = True
ALLOWED_HOSTS = ['127.0.0.1'] ALLOWED_HOSTS = ['127.0.0.1', '192.168.43.34']
# Database # Database
# https://docs.djangoproject.com/en/1.7/ref/settings/#databases # https://docs.djangoproject.com/en/1.7/ref/settings/#databases

2
seminar/templates/seminar/profil/nahraj_reseni.html
View file

@ -53,7 +53,7 @@
</td> </td>
<td {% if field.help_text %} class="field-with-comment"{% endif %}> <td {% if field.help_text %} class="field-with-comment"{% endif %}>
{{ field }} {{ field }}
<span class="field-comment">{{ field.help_text|safe }}</span>> <span class="field-comment">{{ field.help_text|safe }}</span>
</td> </td>
<td><span class="field-error">{{ field.errors }}</span></td> <td><span class="field-error">{{ field.errors }}</span></td>