Commit graph

4282 commits

Author SHA1 Message Date
Robert Sparks 31da337eb2 change default notify address for IRTF stream documents. Fixes bug #1489. Commit ready for merge.
- Legacy-Id: 8506
2014-10-27 22:23:09 +00:00
Robert Sparks 0496ee1b73 Allow removing a document shepherd, and test that it works. Fixes bug #1509. Commit ready for merge.
- Legacy-Id: 8505
2014-10-27 21:27:49 +00:00
Robert Sparks 905df236c3 Added tests that would have caught bug #1508. Added message to edit_shepherd_email to match that added in edit_shepherd. Commit ready for merge
- Legacy-Id: 8504
2014-10-27 18:35:57 +00:00
Robert Sparks 055202dee4 Reworked logic flow for editing shepherds. Added message to inform the user when the shepherd is not changed. Fixes bug #1508. Commit ready for merge.
- Legacy-Id: 8498
2014-10-27 15:54:08 +00:00
Henrik Levkowetz ad2777972d Reverted erroneous commit [8495] to the tags branch.
- Legacy-Id: 8496
Note: SVN reference [8495] has been migrated to Git commit c706413064
2014-10-27 13:13:35 +00:00
Lars Eggert c706413064 Merge branch 'lars/5.6.4-facelift' into lars/5.7.1-facelift
Conflicts:
	ietf/group/edit.py
	ietf/group/views_stream.py
	ietf/nomcom/forms.py
	ietf/person/forms.py
	ietf/settings.py
	ietf/templates/doc/change_shepherd.html
	ietf/templates/doc/document_draft.html
	ietf/templates/doc/search/search_result_row.html
	ietf/templates/doc/submit_to_iesg.html
	ietf/templates/nomcom/edit_position.html
	ietf/templates/nomcom/list_positions.html
 - Legacy-Id: 8495
2014-10-27 11:08:30 +00:00
Henrik Levkowetz f6edbcd855 Set version info to release version 5.7.1 before branching.
- Legacy-Id: 8491
2014-10-27 06:15:21 +00:00
Henrik Levkowetz 06ea9a0025 Merged in [8456] from rcross@amsl.com:
fix bug when trying to edit a session request that doesn't exist.  fix bug when submitted session request form does not include conflict input fields.
 - Legacy-Id: 8489
Note: SVN reference [8456] has been migrated to Git commit 09d7255e4a
2014-10-26 21:44:03 +00:00
Henrik Levkowetz d7223b8ebc Merged in [8454] from rcross@amsl.com:\n fix IRTF proceedings to include Open IRTF Meeting (openirtf).
- Legacy-Id: 8488
Note: SVN reference [8454] has been migrated to Git commit ac5e4b9b4c
2014-10-26 21:30:29 +00:00
Henrik Levkowetz 330beb7a21 Merged in [8452] from rjsparks@nostrum.com:\n Relax ALLOWED_HOSTS when not running in production. Fixes bug #1373.
- Legacy-Id: 8487
Note: SVN reference [8452] has been migrated to Git commit 745145d5ed
2014-10-26 20:39:57 +00:00
Henrik Levkowetz b1edef1099 Merged in [8441] from rjsparks@nostrum.com:\n Remove X-Frame-Options configuration.
- Legacy-Id: 8485
Note: SVN reference [8441] has been migrated to Git commit c4fb9b5bd5
2014-10-26 20:19:09 +00:00
Henrik Levkowetz a18410cca5 Merged in [8438] from rjsparks@nostrum.com:\n Better evaluation of whether a document type is diffable. Fixes bug #1504.
- Legacy-Id: 8484
Note: SVN reference [8438] has been migrated to Git commit 71195b0a72
2014-10-26 20:00:29 +00:00
Henrik Levkowetz 55cef621bd Merged in [8305] from rjsparks@nostrum.com:\n Replaces the return_to_url notion with logic that uses the session object. Related to bug #1430.
- Legacy-Id: 8483
Note: SVN reference [8305] has been migrated to Git commit feb57a04f0
2014-10-26 19:35:10 +00:00
Henrik Levkowetz 388b271f1c Fixed a 500 error that could occur if someone manyally entered a proceedings url to upload materials to a nonexistent meeting/group combination.
- Legacy-Id: 8481
2014-10-26 13:48:57 +00:00
Henrik Levkowetz 5a6819832f Prevent 500 errors on file move race condition.
- Legacy-Id: 8480
2014-10-26 13:19:38 +00:00
Henrik Levkowetz 1d02752f01 Set version info and settings back to development mode
- Legacy-Id: 8477
2014-10-26 12:52:06 +00:00
Henrik Levkowetz e7321e1d8b Set version info to release version 5.7.0 before branching.
- Legacy-Id: 8475
2014-10-26 12:52:02 +00:00
Henrik Levkowetz df8705b187 Merged in patches from production.
- Legacy-Id: 8473
2014-10-25 21:14:00 +00:00
Henrik Levkowetz 704589b4c7 Merged in branch/iola/people-cleanup @ [8471] from olau@iola.dk, which
enhances a number of pages in the datatracker where forms contain fields
  where a person should be chosen, such as for instance when choosing the
  shepherd of a document, so that they uniformly display choices which show
  both email address and name.

  Furthermore, changes have been made so as to make the email address
  uniformly act as reference to the person record.  

  Autocompletion is now consistently provided when looking for the email
  address or name of the person to choose.  

  This solves a number of issues where it has been difficult to choose the
  correct Person/Email combination, and where the correct email address to use
  for an association has been unavailable previously.
 - Legacy-Id: 8472
Note: SVN reference [8471] has been migrated to Git commit d62f2343e8
2014-10-25 21:05:50 +00:00
Henrik Levkowetz 51bc4430bc Set version info and settings back to development mode
- Legacy-Id: 8468
2014-10-25 16:14:27 +00:00
Henrik Levkowetz f872eaaa11 Set version info to release version 5.6.5 before branching.
- Legacy-Id: 8466
2014-10-25 16:14:22 +00:00
Henrik Levkowetz fd82d280e6 Moved the location of the test-crawler, to co-reside with other code and release management scripts.
- Legacy-Id: 8463
2014-10-24 12:20:22 +00:00
Henrik Levkowetz 6e38e974f5 Merged in [8237] from rcross@amsl.com:
Changes to support video content in proceedings ('recording' document type).
 - Legacy-Id: 8462
Note: SVN reference [8237] has been migrated to Git commit 96bccc7b17
2014-10-24 12:18:25 +00:00
Henrik Levkowetz 28f8b30bf5 Added migration and fixtures for NameModels subclass changes.
- Legacy-Id: 8461
2014-10-24 12:12:11 +00:00
Henrik Levkowetz 0d61e270d6 Normalized a couple of NameModels subclasses.
- Legacy-Id: 8460
2014-10-23 21:14:41 +00:00
Henrik Levkowetz c7bf774bad Tweaked the name slug migration to set the blank and null keywords correctly.
- Legacy-Id: 8459
2014-10-23 21:12:14 +00:00
Henrik Levkowetz 28b31061b4 Normalized the naming of a couple of NameModel subclasses.
- Legacy-Id: 8458
2014-10-23 19:54:24 +00:00
Henrik Levkowetz 6e6dd79e0f Removed unused imports from name slug migration.
- Legacy-Id: 8457
2014-10-23 18:56:36 +00:00
Ryan Cross 09d7255e4a fix bug when trying to edit a session request that doesn't exist. fix bug when submitted session request form does not include conflict input fields. Commit ready for merge.
- Legacy-Id: 8456
2014-10-21 23:22:25 +00:00
Ryan Cross ac5e4b9b4c fix IRTF proceedings to include Open IRTF Meeting (openirtf). Commit ready for merge.
- Legacy-Id: 8454
2014-10-21 21:29:09 +00:00
Robert Sparks 745145d5ed Relax ALLOWED_HOSTS when not running in production. Fixes bug #1373. Commit ready for merge.
- Legacy-Id: 8452
2014-10-21 20:20:31 +00:00
Robert Sparks 41f0905689 Fixed condition check problem introduced with adjustments to setting the returning item bit. Fixes bug #1505. Commit ready to merge.
- Legacy-Id: 8444
2014-10-20 13:31:23 +00:00
Henrik Levkowetz c13258c8c8 Added a migration to change foreign keys to NameModel models from 8 to 32 bytes.
- Legacy-Id: 8442
2014-10-18 15:24:19 +00:00
Robert Sparks c4fb9b5bd5 Remove X-Frame-Options configuration. Commit ready for merge.
- Legacy-Id: 8441
2014-10-17 14:22:44 +00:00
Robert Sparks 71195b0a72 Better evaluation of whether a document type is diffable. Fixes bug #1504. Commit ready for merge.
- Legacy-Id: 8438
2014-10-16 18:36:29 +00:00
Henrik Levkowetz 96f99e72d6 Set version info and settings back to development mode
- Legacy-Id: 8399
2014-10-13 20:14:44 +00:00
Henrik Levkowetz a5f49b3fcf Set version info to release version 5.6.4 before branching.
- Legacy-Id: 8397
2014-10-13 20:14:40 +00:00
Henrik Levkowetz 0a5a8bc3d9 In the document-history template, the use of doc.canonical_name caused bad links for /feed/document-changes/* for charter documents. Changed to use doc.name instead, which gave no errors with the test-crawler.
- Legacy-Id: 8395
2014-10-13 20:14:03 +00:00
Henrik Levkowetz 272c738471 Added migration erroneously not included in earlier merge.
- Legacy-Id: 8393
2014-10-12 19:56:27 +00:00
Henrik Levkowetz 3f130f393d Merged in [8359] from rcross@amsl.com:\n fix get_or_create_nominee() to create Alias for new Person.
- Legacy-Id: 8392
Note: SVN reference [8359] has been migrated to Git commit c71d1d1ef6
2014-10-12 19:23:06 +00:00
Henrik Levkowetz f3afb556c2 Merged in [8156] and [8320] from rcross@amsl.com:
Do not allow editing or submitting new session requests when the tool is locked.  Fixes Ticket #1443.
 - Legacy-Id: 8391
Note: SVN reference [8156] has been migrated to Git commit f9d614528b

Note: SVN reference [8320] has been migrated to Git commit faa6469e27
2014-10-12 19:17:51 +00:00
Henrik Levkowetz a4d206074a Merged in [8308] from rjsparks@nostrum.com:\n Build the links to about_url for concluded groups correctly. Fixes bug #1487.
- Legacy-Id: 8390
Note: SVN reference [8308] has been migrated to Git commit 5f9e8123381f3846caca58dfe7b676cd99996cb4
2014-10-12 18:52:47 +00:00
Henrik Levkowetz c1c892e3ac Merged in [8303] from rjsparks@nostrum.com:\n Only show comment/discuss document version on the ballot page when the text is for a version of the document other than the current one. Fixes bug #1482.
- Legacy-Id: 8389
Note: SVN reference [8303] has been migrated to Git commit 75f46e78e51c7312e9e31e1330f5f1f4eee58deb
2014-10-12 18:47:35 +00:00
Henrik Levkowetz 90fa82476b Merged in [8301] from rcross@amsl.com:
changes to support consensus status.
 - Legacy-Id: 8387
Note: SVN reference [8301] has been migrated to Git commit feec6899be
2014-10-12 18:31:39 +00:00
Henrik Levkowetz d4e5f070af Merged in [8293] from rjsparks@nostrum.com:\n XXX: Should what is now captured in the list of STATUSCHANGE_RELATIONS instead be captured in the database in name_docrelationshipname?
Refactored editing the notify field to remove redundant code.
Changed the default notification list to include .all for documents, and the wg list for wg documents.
Allowed recalculating the notification list for all document types.
Improved the calculated notification list value for charters, conflict-reviews, and status-changes.
Adds shepherds to the notification list when they are assigned to a document.
Adds the working group email list to the notification list when a document is adopted.
Fixes #1438
 - Legacy-Id: 8385
Note: SVN reference [8293] has been migrated to Git commit 640c5eb52ace8bb6d2c1b3ca6c14ef10ad0f324f
2014-10-12 17:32:11 +00:00
Henrik Levkowetz 6f7a2cceb6 Merged in [8285] from rjsparks@nostrum.com:\n Removed templates that were no longer being used.
- Legacy-Id: 8384
Note: SVN reference [8285] has been migrated to Git commit 89313c8eb8ca6d51e5c1e400d33fe9ad301da879
2014-10-12 17:13:26 +00:00
Henrik Levkowetz 320051213e Merged in [8271] and [8292] from rjsparks@nostrum.com:
Send email when a the telechat date (or returning item bit) changes for a document.
Fixes #1452
 - Legacy-Id: 8383
Note: SVN reference [8271] has been migrated to Git commit 80fc0c7caa4feac2966722324e42a53cabe67a6b

Note: SVN reference [8292] has been migrated to Git commit 7c56f8bad35b6ed06f6c6eff7436c178209d4143
2014-10-12 17:07:45 +00:00
Henrik Levkowetz 25423f6779 Added some formset attributes which are needed by the current Django (1.6) code. A better way would maybe be to use formset_factory(), but a simple invocation of that gives other problems. Leaving as is for now, to get a patch out so the nomcom chair can get on with things.
- Legacy-Id: 8370
2014-09-29 21:16:55 +00:00
Henrik Levkowetz ec3e247732 Merged in [8262] and [8263] from rjsparks@nostrum.com:
Changes when returning_item is automatically set to match the
    current IESGs preferences.  Removes several chunks of dead code
    related to editing telechat dates.  Improves returning item tests.

    Refactored multiple edit_telechat functions into one function in
    doc_views.  Added a helper function for determining if ballots have
    changed to isolate the implementation.  Fixed the issue with
    update_agenda setting the returning item bit even when the user
    explicitly said not to.  Added prompting to encourage proper setting
    of the returning item bit to the edit_telechat view.

    Fixes #1209
 - Legacy-Id: 8369
Note: SVN reference [8262] has been migrated to Git commit 9d8d0d63e2338d6fa81a82c553b8c6a1c3a105c1

Note: SVN reference [8263] has been migrated to Git commit 35a7436b782fc45e224ac9ea29bfb535fd3ce959
2014-09-28 19:57:01 +00:00
Henrik Levkowetz d9787d87a3 Merged in [8355] from rjsparks@nostrum.com:\n Add the owners email address to the json path for schedule objects. Fixes ticket #1492.
- Legacy-Id: 8368
Note: SVN reference [8355] has been migrated to Git commit 19b31576eb
2014-09-28 19:32:29 +00:00