Commit graph

4577 commits

Author SHA1 Message Date
Ole Laursen 04219b9d94 Fix two cycle calls that slipped past the merge, and delete file that somehow survived the merge
- Legacy-Id: 9073
2015-02-12 10:51:57 +00:00
Ole Laursen a225fd5069 Make new branch from trunk and merge facelift-r9007 into it, fixing a few merge conflicts
- Legacy-Id: 9072
2015-02-12 10:43:52 +00:00
Henrik Levkowetz f3b22aa300 Added django.setup() to some additional scripts, as required under Django 1.7.
- Legacy-Id: 9069
2015-02-11 06:52:07 +00:00
Henrik Levkowetz cebffd36d8 Added django.setup() to some additional scripts, as required under Django 1.7.
- Legacy-Id: 9068
2015-02-10 22:09:22 +00:00
Henrik Levkowetz 73e920739a Added title annotations to major release entries in the changelog back to 2010, and changelog parsing and release page support for the same.
- Legacy-Id: 9067
2015-02-10 10:59:55 +00:00
Henrik Levkowetz 278313829c Set version info and settings back to development mode
- Legacy-Id: 9033
2015-02-09 20:17:16 +00:00
Henrik Levkowetz 1df82ab941 Set version info to release version 5.11.0 before branching.
- Legacy-Id: 9031
2015-02-09 20:17:08 +00:00
Henrik Levkowetz 7ecfac6308 Merged in personal/henrik/django-1.7@9020 which upgrades Django from 1.6.0 to 1.7.4 and applies the needed changes to the datatracker code to work with release 1.7.x.
- Legacy-Id: 9028
2015-02-08 21:16:44 +00:00
Henrik Levkowetz 028b7e315a Reverted to [9025] because commit [9026] failed (it was incomplete with a broken working dir).
- Legacy-Id: 9027
Note: SVN reference [9026] has been migrated to Git commit 4a3749a66b
2015-02-08 20:03:16 +00:00
Henrik Levkowetz 4a3749a66b Merged in personal/henrik/django-1.7@9020 which upgrades Django from 1.6.0 to 1.7.4 and applies the needed changes to the datatracker code to work with release 1.7.x.
- Legacy-Id: 9026
2015-02-08 19:16:46 +00:00
Henrik Levkowetz 3b21cacecd Set version info and settings back to development mode
- Legacy-Id: 9024
2015-02-08 16:40:13 +00:00
Henrik Levkowetz d257284662 Set version info to release version 5.10.3 before branching.
- Legacy-Id: 9022
2015-02-08 16:40:07 +00:00
Henrik Levkowetz f3fcf1623d Made the cookie handling for the 'expires_soon' cookie insensitive to nonnumeric values.
- Legacy-Id: 9018
2015-02-08 10:05:24 +00:00
Henrik Levkowetz 1210f77604 With django 1.7, standalone scripts need to call django.setup() before doing any operations involving models. Modified all scripts in bin/ and ietf/bin/ which seemed to need it.
- Legacy-Id: 9017
2015-02-07 21:13:38 +00:00
Henrik Levkowetz 9f967aebea Merged in [9007] from rjsparks@nostrum.com:
Add the csrf_token to the form for editing document titles. Fixes #1597.
 - Legacy-Id: 9016
Note: SVN reference [9007] has been migrated to Git commit 0cce59b3ef
2015-02-06 19:25:44 +00:00
Henrik Levkowetz ff3603b979 Merged in [9005] from rcross@amsl.com:
Fixed the group link on the standalone Interim Meeting Proceedings
      directory page.

    Also removed some dead code.
 - Legacy-Id: 9015
Note: SVN reference [9005] has been migrated to Git commit 9fed6d8774
2015-02-06 15:25:28 +00:00
Ole Laursen eccd8d27c4 Make new branch from trunk (r9007) and merge facelift-r8876 into it, fixing a few merge conflicts
- Legacy-Id: 9014
2015-02-06 14:08:34 +00:00
Henrik Levkowetz 375b8d8d95 Added an admin view for the ResourceAssociation class.
- Legacy-Id: 9013
2015-02-06 12:34:11 +00:00
Henrik Levkowetz 970059617e Added back a general setting (removed from the Django framework in 1.7) to avoid base64-encoding of UTF-8 email messages.
- Legacy-Id: 9012
2015-02-06 12:33:24 +00:00
Henrik Levkowetz 24abae6d26 Added back a modified version of get_fieldsets for liaison forms; in this case the parent class doesn't have this method..
- Legacy-Id: 9011
2015-02-06 12:30:51 +00:00
Henrik Levkowetz 342b2d3cb5 Removed the unnecessary get_and_create() of community.model.DisplayConfiguration on community page GET.
- Legacy-Id: 9010
2015-02-06 11:27:50 +00:00
Henrik Levkowetz 05a617d3b2 Made the cookie handling for the 'new_enough' cookie insensitive to nonnumeric values.
- Legacy-Id: 9009
2015-02-06 10:57:17 +00:00
Ole Laursen 0fedf9312b Summary: Simplify with ... include into an include with statement
- Legacy-Id: 9008
2015-02-06 10:17:27 +00:00
Robert Sparks 0cce59b3ef Add the csrf_token to the form for editing document titles. Fixes #1597. Commit ready for merge.
- Legacy-Id: 9007
2015-02-06 04:14:03 +00:00
Ryan Cross 9fed6d8774 Fix group link on Interim Meeting Proceedings directory page. Commit ready for merge.
- Legacy-Id: 9005
2015-02-06 00:02:07 +00:00
Henrik Levkowetz c64570c6c0 Set version info and settings back to development mode
- Legacy-Id: 9001
2015-02-05 18:33:26 +00:00
Henrik Levkowetz b4f71e4e2d Set version info to release version 5.10.2 before branching.
- Legacy-Id: 8999
2015-02-05 18:33:21 +00:00
Ole Laursen a0ff3cfefb Summary: Move some of the morecss statements to ietf.css, as per
instructions in the README
 - Legacy-Id: 8996
2015-02-05 15:49:34 +00:00
Ole Laursen ea33e0e3b7 Summary: Fix a missing hide_menu in agenda edit, also delete some now
unused blocks
 - Legacy-Id: 8995
2015-02-05 15:48:17 +00:00
Henrik Levkowetz 58cc1e431f When draft email aliases are generated, the content of the doc.notify field is used to generate the .notify alias, and is also included in the .all alias. If the notify field contains either the .notify alias or the .all alias, this can create a mail loop. Changed the alias generation code to expand (or ignore, for .notify) aliases found in the notify field, and changed the code which fills in the notify field with a default value to insert the author, ad, and shepherd aliases instead of the .all alias.
- Legacy-Id: 8994
2015-02-05 15:38:01 +00:00
Ole Laursen 0edbca5f76 Summary: Fix bug in document type checkboxes
- Legacy-Id: 8993
2015-02-05 15:33:09 +00:00
Ole Laursen 1d2883a9a2 Summary: Fix some inconsistencies regarding whether to use
{% buttons %} or <div class="buttonlist"> for form buttons
 - Legacy-Id: 8992
2015-02-05 14:44:08 +00:00
Ole Laursen 78e3a620ce Summary: Fix unused import
- Legacy-Id: 8991
2015-02-05 14:14:57 +00:00
Ole Laursen 8eff2f39cf Summary: Make sure the TEMPLATE_LOADERS dev hack produces a tuple,
otherwise the tests barf
 - Legacy-Id: 8989
2015-02-05 14:05:10 +00:00
Ole Laursen 9d71ef3179 Summary: Move select2 field handling to a separate .js file, currently
we only include the select2 things on pages with forms that need it
anyway, and this makes it easier to use it in the Secretariat code
 - Legacy-Id: 8986
2015-02-05 13:48:27 +00:00
Henrik Levkowetz bd2cb8baaa Merged in [8970] from olau@iola.dk:
Summary: Enable support for a custom settings file for the test crawl
- and add a simple settings file that enables caching to speed up the
crawl (shaves ~35% off most pages AFAICT)
 - Legacy-Id: 8984
Note: SVN reference [8970] has been migrated to Git commit 8d4e1a8528
2015-02-04 23:17:58 +00:00
Henrik Levkowetz bf77d1e2a4 Merged in [8961] from rjsparks@nostrum.com:
Avoid an issue with python.email breaking To header field values that it has to encode in bad places. Fixes #1589.
 - Legacy-Id: 8983
Note: SVN reference [8961] has been migrated to Git commit 4988d9378c
2015-02-04 23:12:26 +00:00
Henrik Levkowetz 001ecb4372 Merged in [8949] from rjsparks@nostrum.com:
Improvements to the fix to #1592.
 - Legacy-Id: 8982
Note: SVN reference [8949] has been migrated to Git commit 3de9922d87
2015-02-04 22:44:18 +00:00
Henrik Levkowetz bcfa4aaf1d Merged in [8948] from rjsparks@nostrum.com:
Capture out-of-area ADs in draft and group aliases. Fixes #1592.
 - Legacy-Id: 8980
Note: SVN reference [8948] has been migrated to Git commit 0c4ef8c8f6
2015-02-04 22:39:03 +00:00
Henrik Levkowetz cfb332c28a Merged in [8924] from rjsparks@nostrum.com:
Restrict the gathering of ads for past meetings to groups that are areas.
 - Legacy-Id: 8978
Note: SVN reference [8924] has been migrated to Git commit 82bc8f06e1
2015-02-04 22:27:26 +00:00
Henrik Levkowetz 99e3f6514c Merged in [8923] from rjsparks@nostrum.com:
Improve the approval mail contents concerning IESG contact members. Fixes #1588.
 - Legacy-Id: 8976
Note: SVN reference [8923] has been migrated to Git commit 786fc38235
2015-02-04 22:19:31 +00:00
Henrik Levkowetz 278b30cb12 Merged in [8922] from rjsparks@nostrum.com:
Fix needed-to-pas calculation to use new representation of area directors. Fixes #1587.
 - Legacy-Id: 8974
Note: SVN reference [8922] has been migrated to Git commit 7e188d2d81
2015-02-04 22:04:28 +00:00
Henrik Levkowetz 7bb3744113 Merged in [8903] from rcross@amsl.com:
Fix logging problem in IPR mail handling.
 - Legacy-Id: 8973
Note: SVN reference [8903] has been migrated to Git commit 5a0e381985
2015-02-04 21:58:40 +00:00
Ole Laursen e78637b9fc Remove non-facelift static assets, and move the facelift assets one step up
- Legacy-Id: 8971
2015-02-04 17:03:43 +00:00
Ole Laursen 8d4e1a8528 Summary: Enable support for a custom settings file for the test crawl
- and add a simple settings file that enables caching to speed up the
crawl (shaves ~35% off most pages AFAICT)
 - Legacy-Id: 8970
2015-02-04 14:40:54 +00:00
Ole Laursen 86c6effc55 Summary: Cache template loading (speeds up some pages by 20-50 ms),
but only on production since it is really annoying while developing
 - Legacy-Id: 8969
2015-02-04 14:28:47 +00:00
Ole Laursen 12faa4a2f8 Summary: Rewrite community tags to use the much simpler built-in tag parser
- Legacy-Id: 8968
2015-02-04 14:27:49 +00:00
Ole Laursen 703d9995ea Summary: Fix bugs in implementation of add/remove from community list JS
- Legacy-Id: 8967
2015-02-04 14:25:53 +00:00
Ole Laursen a5aa58e0b2 Summary: Prettify stream links a bit by using a keyword argument
- Legacy-Id: 8966
2015-02-04 12:50:07 +00:00
Ole Laursen d61ed824cd Summary: Replace old-style wordwrap custom tag with {% filter wordwrap %}
- Legacy-Id: 8965
2015-02-04 12:48:47 +00:00