diff --git a/changelog b/changelog index 9903656c7..e21753344 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,11 @@ +ietfdb (2.23) + + * Fixed a wrong link in the html agenda + + * Removed the explicit database server ip address in settings.py + + -- Henrik Levkowetz <henrik@levkowetz.com> 22 Mar 2009 18:16:48 +0100 + ietfdb (2.22) * Fixed the menubar nomcom link. @@ -6,15 +14,14 @@ ietfdb (2.22) WG overview page, the 1wg-summary.txt and 1wg-summary-by-acronym.txt pages. - - -- Henrik Levkowetz <henrik@levkowetz.com> 22 Mar 2009 0:20:03 +0100 + -- Henrik Levkowetz <henrik@levkowetz.com> 22 Mar 2009 2:22:09 +0100 ietfdb (2.21) * Merged in Adams django-based replacement for the old perl-based nomcom announcement pages. - -- Henrik Levkowetz <henrik@levkowetz.com> 22 Mar 2009 0:20:03 +0100 + -- Henrik Levkowetz <henrik@levkowetz.com> 22 Mar 2009 1:09:00 +0100 ietfdb (2.20) diff --git a/ietf/settings.py b/ietf/settings.py index dc6783713..77a448734 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -35,9 +35,9 @@ MANAGERS = ADMINS DATABASE_ENGINE = 'mysql' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. DATABASE_NAME = 'ietf' # Or path to database file if using sqlite3. DATABASE_USER = 'ietf' # Not used with sqlite3. -DATABASE_PASSWORD = 'ietf' # Not used with sqlite3. +#DATABASE_PASSWORD = 'ietf' # Not used with sqlite3. DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. -DATABASE_HOST = '130.129.52.254' # Set to empty string for localhost. Not used with sqlite3. +DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. # Local time zone for this installation. Choices can be found here: # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index 567456013..4c4f306f2 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -7,7 +7,7 @@ Agenda of the {{ meeting.num|ordinal }} IETF Meeting<br /> {{ meeting.start_date|date:"F j" }}-{% ifnotequal meeting.start_date.month meeting.end_date.month %}{{ meeting.end_date|date:"F " }}{% endifnotequal %}{{ meeting.end_date|date:"j, Y" }}<br /> Updated {{ update.updated|date:"Y-m-d H:i:s T" }}<br /> -(There's also a <a href="./agenda.txt">plaintext agenda</a> and a <a href="http://tools.ietf.org/agenda/{{meeting.num}}/">tools-style agenda</a> available)<br /> +(There's also a <a href="/meeting/{meeting.num}/agenda.txt">plaintext agenda</a> and a <a href="http://tools.ietf.org/agenda/{{meeting.num}}/">tools-style agenda</a> available)<br /> <br /> IETF agendas are subject to change, up to and during the meeting.<br /> </p>