Robert Sparks 7c90ea5aa3 Merged in Michael's update to newer dajaxice. ... Repaired the existing tests in trunk except for one. That one points to a real bug in the code - the access protection for the functions that change visible and public for an agenda are not right, leading to pages that can't work (see the failing test for more notes). This should be ready to start porting the updated tests into the make_test_data framework. - Legacy-Id: 7283		2014-02-20 21:50:37 +00:00
bin	Merged in branch/iola/shimfree@6856. This pretty much completes the shim removal. Next step is upgrading Django to 1.6, and then doing some final polishing.	2013-12-17 21:29:05 +00:00
django	Fix bug in Django admin login redirect	2014-01-10 13:19:23 +00:00
django-dajaxice	Merged in Michael's update to newer dajaxice.	2014-02-20 21:50:37 +00:00
docutils	dded docutils library to allow RST to HTML transformation. See #908	2012-11-27 12:01:47 +00:00
etc	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
form_utils	Merged in branch/amsl/trunkmerge@5449 from rcross@amsl.com, with some tweaks. This provides the secretariat apps.	2013-03-05 22:43:31 +00:00
html5lib	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
ietf	Merged in Michael's update to newer dajaxice.	2014-02-20 21:50:37 +00:00
redesign	Merged in fixes to the migration from olau@iola.dk. Merged in charter branch from olau@iola.dk. Added various fixes and correction of merge errors.	2012-05-02 19:35:32 +00:00
south	Replace South with South 0.8.4	2013-12-11 14:07:19 +00:00
static	reasonably complete merge, but some of the newer-style tests are failing because the js API changed	2014-01-31 01:13:53 +00:00
test	Port test/ from django.core.management.setup_environ to DJANGO_SETTINGS_MODULE	2013-12-18 15:51:29 +00:00
vzic	Newly generated .ics files, from http://www.iana.org/time-zones/repository/releases/tzdata2013h.tar.gz. This updates the .ics files to use timezone information current as of 27 Oct 2013.	2013-10-27 20:10:29 +00:00
.gitignore	- Legacy-Id: 5678	2013-04-21 14:46:00 +00:00
changelog	Merged in the port from Django 1.2 to Django 1.6 from olau@iola.dk: branch/iola/djangoport@7121, and fixed some merge issues.	2014-01-18 21:02:40 +00:00
changelog.py	Added a simple page to show release information parsed from a release's changelog file.	2012-10-25 21:29:53 +00:00
control	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
debug.py	Move decorator import in debug.py closer to actual usage points so the	2013-11-27 13:15:52 +00:00
INSTALL	With the secretariat now using the secr/ code deployed with the datatracker, there is no concern any more about divergence between production secretariat and datatracker secretariat code, and no need to have two different patch numbering systems for secretariat patches and other patches. Removing the secretariat-specific patch section.	2013-11-06 22:16:09 +00:00
LICENSE	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
LICENSE.django	Merged from log:branch/2.00@2363: Current release branch head to trunk.	2010-07-21 12:48:05 +00:00
tzparse.py	Added a module which handles parsing of time strings which include timezone information, tzparse.py.	2012-10-31 10:13:52 +00:00