Commit graph

143 commits

Author SHA1 Message Date
Henrik Levkowetz 4966e17158 Added 5 migrations for changes in model field help-text strings which changed in the facelift. Also fixed the expression of the help text for NomCom.reminder_interval so the text itself doesn't contain quite as much whitespace.
- Legacy-Id: 9589
2015-04-30 16:18:25 +00:00
Henrik Levkowetz 2c4785adf6 Updated an IPR test to account for facelift changes.
- Legacy-Id: 9362
2015-04-02 19:50:00 +00:00
Henrik Levkowetz 625347cd2f Merged trunk@9354 to facelift copy
- Legacy-Id: 9357
2015-04-02 06:51:34 +00:00
Henrik Levkowetz 2f54511763 Changed all explicitly set HttpResponse content_types to specify charset.
Django sets charset if you don't specify a content_type; if you specify
one you also must add a charset specification (if you want one).  
Fixes issue #1647.
 - Legacy-Id: 9348
2015-03-26 21:35:21 +00:00
Ryan Cross 415d0ad7c7 Fixes Ticket #1626. Cleanup legacy IPR models. Commit ready for merge.
- Legacy-Id: 9330
2015-03-25 16:17:45 +00:00
Robert Sparks c307b1f734 Avoid creating blank line before headers on IPR notification email. Fixes #1609. Commit ready for merge.
- Legacy-Id: 9142
2015-03-02 20:38:55 +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 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
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 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 4087a9837f End help_texts with period consistently - the default error rendering in the bootstrap3 library depends on it
- Legacy-Id: 8940
2015-01-28 13:25:21 +00:00
Ole Laursen 336cc1bd14 Summary: Fix two failing IPR tests
- Legacy-Id: 8927
2015-01-27 16:28:02 +00:00
Ole Laursen 7e736e06ff Summary: Port remaining IPR list pages obviating the need for ipr.css, fix some layout issues
- Legacy-Id: 8926
2015-01-27 16:11:55 +00:00
Ole Laursen b675c06b44 Summary: Facelift IPR details and history pages, and fix a couple of IPR glitches
- Legacy-Id: 8920
2015-01-26 16:34:25 +00:00
Ole Laursen 86b97c7573 Summary: Facelift IPR add comment page
- Legacy-Id: 8915
2015-01-26 11:37:14 +00:00
Ole Laursen 34dae91ab2 Summary: Facelift IPR change state page
- Legacy-Id: 8911
2015-01-26 11:11:03 +00:00
Ryan Cross 5a0e381985 Fix logging problem in IPR mail handling. Commit ready for merge.
- Legacy-Id: 8903
2015-01-23 21:00:13 +00:00
Ole Laursen 2ac96942b3 Summary: Port the remaining JS parts of IPR tool, still missing some
templates though
 - Legacy-Id: 8901
2015-01-23 17:09:53 +00:00
Ole Laursen 1124d6d018 Summary: Port the remaining parts of the IPR form to Bootstrap, and fix
some bugs in the port
 - Legacy-Id: 8900
2015-01-23 16:47:22 +00:00
Ole Laursen d0999c8b5e Merge facelift-r8510 branch with trunk. The IPR tool still has some non-facelifted parts and ideosyncracies. Fix a couple of minor bugs (including infamous empty licensing choice) in the IPR code, and port the IPR views to use the render shortcut.
- Legacy-Id: 8896
2015-01-22 17:38:05 +00:00
Henrik Levkowetz af8cd51409 Merged in [8845] from rcross@amsl.com:\n allow editing of legacy disclosures which don't have required fields (set required=False).
- Legacy-Id: 8877
Note: SVN reference [8845] has been migrated to Git commit c957f3383b
2015-01-21 18:44:33 +00:00
Ryan Cross c957f3383b allow editing of legacy disclosures which don't have required fields (set required=False). Commit ready for merge.
- Legacy-Id: 8845
2015-01-06 23:32:23 +00:00
Ryan Cross 8130d244d8 Fixes #1569. Fixes link to IPR search from doc page. Commit ready for merge.
- Legacy-Id: 8841
2015-01-05 23:48:48 +00:00
Henrik Levkowetz 43dbe3bfd1 Fix django 1.7 deprecation warnings: Always set fields= or exclude= in Meta for ModelForm subclasses.
- Legacy-Id: 8828
2014-12-22 17:46:29 +00:00
Henrik Levkowetz 25eb00c925 New django-1.7 initial migrations. Circular references exist, requiring explicit --fake migration for doc, dbtemplate and community apps.
- Legacy-Id: 8823
2014-12-22 17:07:38 +00:00
Henrik Levkowetz dd15785936 Removing south migrations as part of the django 1.7 changeover to builtin migrations.
- Legacy-Id: 8820
2014-12-22 16:44:35 +00:00
Henrik Levkowetz 5183042d58 Merged in branch/amsl/iprtool/5.7.4@8734 from rcross@amsl.com, providing new IPR models, refactored code, and improved list, search, and management interfaces.
- Legacy-Id: 8808
2014-12-21 19:26:33 +00:00
Henrik Levkowetz 770b36d575 Added generated (and sometimes manually tweaked) resources.py files.
- Legacy-Id: 8744
2014-12-14 20:33:25 +00:00
Henrik Levkowetz 9bcdf342fb Merged in [8634] from rcross@amsl.com:\n Remove none-selected option from licensing options of new IPR form.
- Legacy-Id: 8638
Note: SVN reference [8634] has been migrated to Git commit 5016baeb30
2014-11-11 02:05:35 +00:00
Ryan Cross 5016baeb30 Remove none-selected option from licensing options of new IPR form. Commit ready for merge
- Legacy-Id: 8634
2014-11-11 01:10:52 +00:00
Dapeng Liu 136bce88b4 Add RG in the search popup. Change to use Django Q object. fixed issue #1355. Commit ready for merge
- Legacy-Id: 8617
2014-11-09 01:54:21 +00:00
Dapeng Liu f5a0cd00da add RG in the search popup. fixed issue #1355. Commit ready for merge
- Legacy-Id: 8605
2014-11-09 00:00:50 +00:00
Ole Laursen 87870ca954 Fix more test errors - now only two not yet fully ported views remain
- Legacy-Id: 8571
2014-11-03 16:39:41 +00:00
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
Henrik Levkowetz cbb5b84652 Merged in [8209] from rjsparks@nostrum.com:\n Fixed several places where files were not being closed.
- Legacy-Id: 8315
Note: SVN reference [8209] has been migrated to Git commit 4aae3ff6785ca2649e54a212bd669369950f4b86
2014-09-16 19:48:30 +00:00
Ryan Cross 373865076c allow no IPR license selection on update. Commit ready for merge
- Legacy-Id: 7924
2014-06-18 16:47:10 +00:00
Henrik Levkowetz 02031a01b9 Cleaned out some (arbitrary) submodule name imports into ietf.utils, and made the corresponding import statements import the names directly from the correct submodules.
- Legacy-Id: 7495
2014-03-16 07:09:38 +00:00
Henrik Levkowetz 3ed711336d Made ietf/ipr pyflakes-clean
- Legacy-Id: 7470
2014-03-15 17:54:37 +00:00
Henrik Levkowetz 6e97c2c8da 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.
- Legacy-Id: 7152
2014-01-18 21:02:40 +00:00
Ole Laursen 3db6ae14a9 Add missing test of IPR details page, as found by coverage check
- Legacy-Id: 7083
2014-01-08 18:07:43 +00:00
Ole Laursen 2cc2323b06 Speed up IPR list by adding a prefetch_related() call
- Legacy-Id: 7017
2013-12-19 11:53:41 +00:00
Henrik Levkowetz ecb5cd6526 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.
- Legacy-Id: 6966
2013-12-17 21:29:05 +00:00
Ole Laursen 84a9f49053 mimetype -> content_type (mimetype is deprecated)
- Legacy-Id: 6945
2013-12-16 16:53:47 +00:00
Ole Laursen e6b12350d2 Port IPR and liaisons feed setup to new feed API too
- Legacy-Id: 6943
2013-12-16 16:33:18 +00:00
Ole Laursen a2c13b70d1 Make sure all BooleanFields have an explicit default value (with
Django < 1.6 it used to be False implicitly)
 - Legacy-Id: 6908
2013-12-13 13:30:07 +00:00
Ole Laursen d1e60e533c Fix a couple of problems in previous URL conversion commit
- Legacy-Id: 6887
2013-12-11 17:13:49 +00:00
Ole Laursen b3b7154890 Port ipr/feeds.py to django.core.urlresolvers.reverse_lazy
- Legacy-Id: 6884
2013-12-11 17:06:41 +00:00
Ole Laursen c15063f3c2 Adjust the import path for feeds
- Legacy-Id: 6879
2013-12-11 16:40:49 +00:00