Lars Eggert a4daf2630c Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift ... Conflicts: ietf/doc/templatetags/ietf_filters.py ietf/doc/views_charter.py ietf/templates/doc/charter/edit_notify.html ietf/templates/doc/charter/edit_telechat_date.html ietf/templates/doc/document_ballot_content.html ietf/templates/doc/document_history.html ietf/templates/doc/edit_notify.html ietf/templates/doc/edit_telechat_date.html ietf/templates/doc/notify.html ietf/templates/group/concluded_groups.html - Legacy-Id: 8429		2014-10-14 11:48:57 +00:00
..
.gitignore	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
agenda.csv	Corrected the links to WG agendas in the csv file.	2013-11-06 15:08:47 +00:00
agenda.html	Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift	2014-10-14 11:48:57 +00:00
agenda.ics	Fixed a bug in the materials urls in agenda.ics.	2013-11-06 17:03:30 +00:00
agenda.txt	Added a blank line before new session group in the text agenda.	2014-02-16 15:02:34 +00:00
agenda_list.html	From mcr@sandelman.ca:	2014-07-31 22:13:01 +00:00
group_materials.html	Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift	2014-10-14 11:48:57 +00:00
landscape_edit.html	From mcr@sandelman.ca:	2014-07-31 22:13:01 +00:00
m_agenda.html	Remove unnecessary escapes from another bunch of templates	2013-12-18 16:10:47 +00:00
materials.html	Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift	2014-10-14 11:48:57 +00:00
materials_upload_closed.html	Added a section to the meeting materials page for IAB sessions. Added a link bar at the top to make it easier to find sections like Training and IAB.	2013-04-11 09:21:12 +00:00
no-agenda-utc.html	Changed the logic for what is the 'current' ietf meeting to disregard whether there's an agenda for the meeting or not. This lets people see the correct session request page for the current meeting. However, it also makes the /meeting/agenda.html page fail because there's no schedule associated with the meeting; so alternative pages saying 'No agenda available' has been added, too.	2014-04-25 13:14:53 +00:00
no-agenda.csv	Changed the logic for what is the 'current' ietf meeting to disregard whether there's an agenda for the meeting or not. This lets people see the correct session request page for the current meeting. However, it also makes the /meeting/agenda.html page fail because there's no schedule associated with the meeting; so alternative pages saying 'No agenda available' has been added, too.	2014-04-25 13:14:53 +00:00
no-agenda.html	Changed the logic for what is the 'current' ietf meeting to disregard whether there's an agenda for the meeting or not. This lets people see the correct session request page for the current meeting. However, it also makes the /meeting/agenda.html page fail because there's no schedule associated with the meeting; so alternative pages saying 'No agenda available' has been added, too.	2014-04-25 13:14:53 +00:00
no-agenda.txt	Changed the logic for what is the 'current' ietf meeting to disregard whether there's an agenda for the meeting or not. This lets people see the correct session request page for the current meeting. However, it also makes the /meeting/agenda.html page fail because there's no schedule associated with the meeting; so alternative pages saying 'No agenda available' has been added, too.	2014-04-25 13:14:53 +00:00
no-m_agenda.html	Added a no-agenda template for the iPhone agenda, too.	2014-04-25 14:03:52 +00:00
private_agenda.html	From mcr@sandelman.ca:	2014-07-31 22:13:01 +00:00
properties_edit.html	From mcr@sandelman.ca:	2014-07-31 22:13:01 +00:00
requests.html	Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift	2014-10-14 11:48:57 +00:00
room_edit.html	From mcr@sandelman.ca:	2014-07-31 22:13:01 +00:00
timeslot_edit.html	From mcr@sandelman.ca:	2014-07-31 22:13:01 +00:00
week-view.html	Don't tack on the scheme and host in the template; if this is needed, it's now done in get_absolute_url().	2013-11-02 14:44:14 +00:00