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
..
management	Updates and bugfixes to the agenda editing features	2014-04-01 22:17:18 +00:00
migrations	Added migration erroneously not included in earlier merge.	2014-10-12 19:56:27 +00:00
templatetags	Removed the ams_filters template tag file from the meeting app -- it was a copy of the ams_filters under secr/, and masked it.	2013-10-22 19:01:18 +00:00
.gitignore	not sure why svn is being stupid here..this commit is worthless, and probably will fail	2007-05-09 22:04:05 +00:00
__init__.py	Adding copyright notices to all python files	2007-06-27 21:16:34 +00:00
admin.py	Added django-admin support for meeting.ScheduledSession	2014-06-30 19:12:34 +00:00
ajax.py	From mcr@sandelman.ca:	2014-07-31 22:13:01 +00:00
feeds.py	Made ietf/meeting pyflakes-clean. Removed some debug-related dead code.	2014-03-15 18:57:07 +00:00
helpers.py	From mcr@sandelman.ca:	2014-07-31 22:13:01 +00:00
models.py	Merged in [8156] and [8320] from rcross@amsl.com:	2014-10-12 19:17:51 +00:00
placement.py	Updates and bugfixes to the agenda editing features	2014-04-01 22:17:18 +00:00
test_data.py	Updates and bugfixes to the agenda editing features	2014-04-01 22:17:18 +00:00
tests_api.py	From mcr@sandelman.ca:	2014-07-31 22:13:01 +00:00
tests_js.py	Merged in [8229] from rjsparks@nostrum.com, with minor tweaks:	2014-09-18 20:27:28 +00:00
tests_views.py	From mcr@sandelman.ca:	2014-07-31 22:13:01 +00:00
timedeltafield.py	Fixed incorrect except statement syntax.	2013-10-30 21:21:28 +00:00
urls.py	Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift	2014-10-14 11:48:57 +00:00
views.py	Merged in [8229] from rjsparks@nostrum.com, with minor tweaks:	2014-09-18 20:27:28 +00:00