Merge branch 'master' of https://github.com/Kelketek/evennia into Kelketek-master

This commit is contained in:
Griatch 2014-09-28 22:33:35 +02:00
commit 0efc371775
7 changed files with 2 additions and 7 deletions

View file

@ -45,8 +45,6 @@ Installation
python manage.py syncdb python manage.py syncdb
python manage.py migrate
Starting Evennia Starting Evennia
---------------- ----------------

View file

@ -7,7 +7,7 @@ DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "Evennia" PROJECT_NAME = "Evennia"
PROJECT_NUMBER = Git-Beta PROJECT_NUMBER = Git-Beta
PROJECT_BRIEF = Python MUD development system PROJECT_BRIEF = Python MUD development system
PROJECT_LOGO = ../../src/web/media/images/evennia_logo_small.png PROJECT_LOGO = ../../src/web/media/images/evennia_logo.png
OUTPUT_DIRECTORY = OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English OUTPUT_LANGUAGE = English

View file

@ -165,7 +165,6 @@ except DatabaseError, e:
Please run: Please run:
python manage.py syncdb python manage.py syncdb
python manage.py migrate
When you have a database set up, rerun evennia.py. When you have a database set up, rerun evennia.py.
""" % e """ % e

View file

@ -85,8 +85,6 @@ SECRET_KEY = '%s'
Once you are ready to continue, (re)run Once you are ready to continue, (re)run
python manage.py syncdb python manage.py syncdb
followed by
python manage.py migrate
""" """

Binary file not shown.

Before

Width:  |  Height:  |  Size: 678 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

View file

@ -35,7 +35,7 @@
</div> </div>
<div class="midHeader"> <div class="midHeader">
<img src="{% static "evennia_general/images/evennia_logo_small.png" %}" align='left'/> <h1 class="headerTitle" lang="la">{{game_name}}</h1> <img src="{% static "evennia_general/images/evennia_logo.png" %}" align='left'/> <h1 class="headerTitle" lang="la">{{game_name}}</h1>
<div class="headerSubTitle" title="Slogan"> <div class="headerSubTitle" title="Slogan">
<!-- Insert a slogan here if you want --> <!-- Insert a slogan here if you want -->
{{game_slogan}} &nbsp; {{game_slogan}} &nbsp;