Commit graph

399 commits

Author SHA1 Message Date
Henrik Levkowetz a7667fb29e Merged in branch/amsl/liaisons/6.4.1@10160 from rcross@amsl.com, bringing in the new liaison tool.
- Legacy-Id: 10161
2015-10-09 19:48:21 +00:00
Ryan Cross 1145751a9b Improve secretariat rolodex roles section, sort and identify concluded groups. Commit ready for merge.
- Legacy-Id: 10159
2015-10-09 17:55:12 +00:00
Robert Sparks f0f5a51eb6 (Rocky) merge forward.
- Legacy-Id: 10157
2015-10-09 03:16:24 +00:00
Ryan Cross e2b8bad862 Adjust audio file glob pattern. Commit ready for merge
- Legacy-Id: 10156
2015-10-08 22:56:47 +00:00
Robert Sparks f5b6465e81 mailtoken becomes mailtrigger
- Legacy-Id: 10090
2015-09-17 20:03:45 +00:00
Robert Sparks 90c3426e2f updated mailtoken utilities to match the model refactor. Morphed all the code using the utilities to match. Added paths to get Cc through as needed. Next up: Recipient selection form for the iesg save-and-send-email workflow
- Legacy-Id: 10040
2015-08-23 18:15:06 +00:00
Robert Sparks 8a74604a1b Done with the second pass focusing on test coverage. Lots of test tweaks, some new tests, a couple of bugs fixed. The session request code views need to be redone to allow testing.
- Legacy-Id: 10035
2015-08-21 16:39:00 +00:00
Robert Sparks 5db9e0d6a8 checkpoint
- Legacy-Id: 10029
2015-08-19 19:53:09 +00:00
Robert Sparks 23a2ada5f9 checkpoint
- Legacy-Id: 10027
2015-08-18 18:52:22 +00:00
Ryan Cross 1617a2d25c Fix issue with select2-field.js path in templates. Commit ready for merge.
- Legacy-Id: 10026
2015-08-18 17:10:12 +00:00
Robert Sparks f30f5c39f1 checkpoint
- Legacy-Id: 10017
2015-08-13 21:16:21 +00:00
Robert Sparks 839d0f89ad checkpoint
- Legacy-Id: 10016
2015-08-13 19:41:02 +00:00
Henrik Levkowetz 11411d2c30 Merged in an update from trunk@9942.
- Legacy-Id: 9961
2015-08-03 14:12:38 +00:00
Henrik Levkowetz 5fe1d43db2 Fixed some additional static file references.
- Legacy-Id: 9958
2015-08-01 22:02:14 +00:00
Henrik Levkowetz 984524b507 Changed additional direct static references to use the static template tag.
- Legacy-Id: 9955
2015-08-01 18:14:50 +00:00
Henrik Levkowetz 1d834801af Removed dead code.
- Legacy-Id: 9948
2015-08-01 14:58:08 +00:00
Henrik Levkowetz 9cb8f65c8e Updated templates to use the static template tag for static files.
- Legacy-Id: 9945
2015-08-01 14:53:59 +00:00
Henrik Levkowetz 3e4b419935 Moved bower externals from static/lib to ietf/externals/static. Moved secretariat statics to ietf/secr/static. Moved ietf statics to ietf/static/. Removed static/, as all static files will be handled using 'manage.py collectstatic' at deployment time now.
- Legacy-Id: 9934
2015-08-01 12:56:16 +00:00
Henrik Levkowetz fae9066c9d Merged in [9925] from rjsparks@nostrum.com:
Changed several email alias references from tools.ietf.org to ietf.org. Fixes #1759.
 - Legacy-Id: 9931
Note: SVN reference [9925] has been migrated to Git commit cd5b497acb
2015-08-01 10:23:58 +00:00
Henrik Levkowetz bef78193f5 Merged in [9901] from rcross@amsl.com:
Fix matching audio file names with rooms.
 - Legacy-Id: 9927
Note: SVN reference [9901] has been migrated to Git commit ce250e16e8
2015-07-31 19:41:43 +00:00
Robert Sparks cd5b497acb Changed several email alias references from tools.ietf.org to ietf.org. Fixes #1759. Commit ready for merge.
- Legacy-Id: 9925
2015-07-30 22:13:59 +00:00
Ryan Cross ce250e16e8 Fix matching audio file names with rooms. Commit ready for merge.
- Legacy-Id: 9901
2015-07-27 18:57:38 +00:00
Henrik Levkowetz 1d18e9676d Merged in [9775] from rcross@amsl.com:
Add proposed groups to Blue Dot Report.  Fixes #1747.
 - Legacy-Id: 9791
Note: SVN reference [9775] has been migrated to Git commit 81d4ba99ed
2015-07-18 13:11:19 +00:00
Henrik Levkowetz c1a9ec325f Merged in [9774] from lars@netapp.com:
More HTML fixes.
 - Legacy-Id: 9790
Note: SVN reference [9774] has been migrated to Git commit d9f291d7e75bb33260e986b6eddf7d15b28da305
2015-07-18 13:02:53 +00:00
Ryan Cross 81d4ba99ed Add proposed groups to Blue Dot Report. Fixes #1747. Commit ready for merge
- Legacy-Id: 9775
2015-07-18 10:25:59 +00:00
Ryan Cross 9b5a69219e Remove unused javascript reference. Fixes #1752. Commit ready for merge.
- Legacy-Id: 9773
2015-07-18 10:02:12 +00:00
Henrik Levkowetz 494af99d9a Merged in [9701] from rcross@amsl.com:
Fix settings CORRECTION_DAYS variable name.
 - Legacy-Id: 9707
Note: SVN reference [9701] has been migrated to Git commit dade901827
2015-07-09 13:05:34 +00:00
Ryan Cross dade901827 Fix settings CORRECTION_DAYS variable name. Commit ready for merge.
- Legacy-Id: 9701
2015-07-08 16:03:07 +00:00
Henrik Levkowetz 4bfcddcedc Merged in [9670] from rcross@amsl.com:
Allow edit of new leadership sessions.
 - Legacy-Id: 9684
Note: SVN reference [9670] has been migrated to Git commit 4f41d00112
2015-06-23 19:27:25 +00:00
Henrik Levkowetz b44141a655 Merged in [9671] from rcross@amsl.com:
Fixes #1724.  Convert PPT materials to PDF.
 - Legacy-Id: 9682
Note: SVN reference [9671] has been migrated to Git commit 8bf84a7e0e
2015-06-23 19:02:57 +00:00
Henrik Levkowetz d0cdc45fe8 Merged in [9666] from rcross@amsl.com:
Fixes #1723.  Area names hardcoded in Proceedings app.
 - Legacy-Id: 9680
Note: SVN reference [9666] has been migrated to Git commit 7b34252d29
2015-06-23 18:40:39 +00:00
Ryan Cross 8bf84a7e0e Fixes #1724. Convert PPT materials to PDF. Commit ready for merge.
- Legacy-Id: 9671
2015-06-19 22:43:14 +00:00
Ryan Cross 4f41d00112 Allow edit of new leadership sessions. Commit ready for merge.
- Legacy-Id: 9670
2015-06-19 22:38:49 +00:00
Ryan Cross 7b34252d29 Fixes #1723. Area names hardcoded in Proceedings app. Commit ready for merge.
- Legacy-Id: 9666
2015-06-12 17:54:00 +00:00
Henrik Levkowetz 9067f88fa7 Merged in [9650] from rjsparks@nostrum.com:
Set the parent for newly created RGs. Be more robust if an RG has no parent. Test creation of an RG. Fixes #1718 and #1719.
 - Legacy-Id: 9661
Note: SVN reference [9650] has been migrated to Git commit b9bf7594001f0014ff4c2ac3688b431f1fcd39ec
2015-06-03 16:52:49 +00:00
Henrik Levkowetz 1c54a13f68 Merged in [9649] from rjsparks@nostrum.com:
Provide a session type for sessions created to say a group is not meeting. Add a test for the no_meeting view. Fixes #1720.
 - Legacy-Id: 9660
Note: SVN reference [9649] has been migrated to Git commit 0ce13839009aed0c946750989ea0a074517028ba
2015-06-03 16:33:55 +00:00
Henrik Levkowetz 8a32ffbc05 Merged in [9618] from rcross@amsl.com:
Make proceedings generation more robust.
 - Legacy-Id: 9621
Note: SVN reference [9618] has been migrated to Git commit e99af9319c
2015-05-12 04:56:16 +00:00
Ryan Cross e99af9319c Make proceedings generation more robust. Commit ready for merge.
- Legacy-Id: 9618
2015-05-11 23:03:29 +00:00
Henrik Levkowetz 09abdf60e6 Merged in [9604] from rcross@amsl.com:
Update IAOC email in Announcement app.
 - Legacy-Id: 9607
Note: SVN reference [9604] has been migrated to Git commit 9d43c3b526
2015-05-06 18:15:57 +00:00
Henrik Levkowetz 1ba8996fd2 Merged in [9603] from rjsparks@nostrum.com:
Added functionality which allows the secretariat to manage more meeting types, including leadership meetings.
Backfilled those types of meetings from IETF91 and IETF92.
Addressed several facelift issues in the meeting application.
 - Legacy-Id: 9606
Note: SVN reference [9603] has been migrated to Git commit a85424ad23
2015-05-06 18:07:18 +00:00
Ryan Cross 9d43c3b526 Update IAOC email in Announcement app. COmmit ready for merge.
- Legacy-Id: 9604
2015-05-04 16:57:19 +00:00
Robert Sparks 3bf1beb030 fix a bug discovered with adhoc testing
- Legacy-Id: 9599
2015-05-04 15:10:18 +00:00
Robert Sparks 17b928b94b checkpoint: added room functional description, backfilled ietf92 meeting data, repaired session material views, added tests
- Legacy-Id: 9596
2015-05-01 22:31:30 +00:00
Robert Sparks 72b85fc1c7 checkpoint: views by type working
- Legacy-Id: 9592
2015-04-30 21:44:45 +00:00
Robert Sparks 1e30120710 checkpoint. Model changes done and UI tweaked to match.
- Legacy-Id: 9588
2015-04-30 15:57:48 +00:00
Robert Sparks b0ce25aa44 clean merge forward
- Legacy-Id: 9584
2015-04-27 20:24:40 +00:00
Henrik Levkowetz d6e9a10ed8 Merged in [9558] from rcross@amsl.com:
Fixes issue #1678.

    Fixes #1678.  MultipleObjectsReturned when editing draft.
 - Legacy-Id: 9572
Note: SVN reference [9558] has been migrated to Git commit 9d6fc63581
2015-04-26 21:53:17 +00:00
Henrik Levkowetz 523e4adaf6 Merged in [9554] from rcross@amsl.com:
Fixes #1692.  Drag-and-Drop slide re-ordering no longer works in secr/proceedings.  Consolidate / update JQuery-UI.
 - Legacy-Id: 9569
Note: SVN reference [9554] has been migrated to Git commit 84670f7172
2015-04-26 21:24:50 +00:00
Henrik Levkowetz 8ba082c816 Merged in [9527] from rcross@amsl.com:
Fixes issue #1680.

    Fixes #1680.  Can't add minutes / agenda after deleting them.
 - Legacy-Id: 9564
Note: SVN reference [9527] has been migrated to Git commit 5ece489701
2015-04-26 20:37:56 +00:00
Ryan Cross 9d6fc63581 Fixes #1678. MultipleObjectsReturned when editing draft. Commit ready for merge.
- Legacy-Id: 9558
2015-04-24 22:46:49 +00:00
Henrik Levkowetz acc2c59920 Updated a bunch of links from http: to https: based on a patch from lars@netapp.com.
- Legacy-Id: 9556
2015-04-24 21:47:12 +00:00
Ryan Cross 84670f7172 Fixes #1692. Drag-and-Drop slide re-ordering no longer works in secr/proceedings. Consolidate / update JQuery-UI. Commit ready for merge.
- Legacy-Id: 9554
2015-04-24 21:31:00 +00:00
Henrik Levkowetz d30981ddbd Merged in [9519] from rcross@amsl.com:
Fixes issue #1676.

    Fixes #1676.  RelatedObjectDoesNotExist when User has no Person.
 - Legacy-Id: 9538
Note: SVN reference [9519] has been migrated to Git commit 80d6564458
2015-04-21 20:17:39 +00:00
Henrik Levkowetz 881c9cb8f6 Provide the IRTF chair with access to the session request tool. Fixes issue #1687.
- Legacy-Id: 9529
2015-04-21 12:36:46 +00:00
Henrik Levkowetz 88300e5d50 Removed emtpy items from the must-be-there list before handing the list to Person.objects.filter(pk__in=...). Fixes issues #1684, #1685
- Legacy-Id: 9528
2015-04-21 11:53:00 +00:00
Ryan Cross 5ece489701 Fixes #1680. Can't add minutes / agenda after deleting them. Commit ready for merge.
- Legacy-Id: 9527
2015-04-20 21:49:10 +00:00
Ryan Cross 80d6564458 Fixes #1676. RelatedObjectDoesNotExist when User has no Person. Commit ready for merge.
- Legacy-Id: 9519
2015-04-16 22:24:40 +00:00
Henrik Levkowetz 02cd366ff0 Merged in trunk@9440, containing the changes for version 5.13.1; and updated tests which look at HTML content to work with the facelift changes.
- Legacy-Id: 9446
2015-04-11 18:24:20 +00:00
Henrik Levkowetz 422869611b Merged in [9426] from rcross@amsl.com:
Add several 'From' options for IAD user of announcement tool.
 - Legacy-Id: 9433
Note: SVN reference [9426] has been migrated to Git commit e5309ab73a
2015-04-09 20:38:30 +00:00
Henrik Levkowetz b8f84dc8d7 Merged in [9375] from rjsparks@nostrum.com:
Put old style slides directly into archived. Migrate IETF92 materials to match.
 - Legacy-Id: 9432
Note: SVN reference [9375] has been migrated to Git commit d46035003e
2015-04-09 20:22:03 +00:00
Henrik Levkowetz 2cf0c74561 Merged in [9351] from rjsparks@nostrum.com:
Remove sessonly, replacing the idea with a separate State. Add tests checking how materials show on agenda views.
 - Legacy-Id: 9430
Note: SVN reference [9351] has been migrated to Git commit a6c64d2b12
2015-04-09 19:46:04 +00:00
Ryan Cross e5309ab73a Add several 'From' options for IAD user of announcement tool. Commit ready for merge.
- Legacy-Id: 9426
2015-04-08 18:11:49 +00:00
Robert Sparks d46035003e Put old style slides directly into archived. Migrate IETF92 materials to match. Commit ready for merge.
- Legacy-Id: 9375
2015-04-03 20:53:13 +00:00
Henrik Levkowetz 625347cd2f Merged trunk@9354 to facelift copy
- Legacy-Id: 9357
2015-04-02 06:51:34 +00:00
Robert Sparks a6c64d2b12 Remove sessonly, replacing the idea with a separate State. Add tests checking how materials show on agenda views. Commit ready for merge.
- Legacy-Id: 9351
2015-04-01 16:00:05 +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
Henrik Levkowetz c16b7c555f Merged in [9307] from rcross@amsl.com:
Improve test coverage of secr.drafts.
 - Legacy-Id: 9312
Note: SVN reference [9307] has been migrated to Git commit 34a16483fa
2015-03-21 21:45:19 +00:00
Ryan Cross 9c9ac7ea3a Fix pyflakes errors in secr/drafts/tests_views.py. Commit ready for merge
- Legacy-Id: 9308
2015-03-21 20:36:28 +00:00
Ryan Cross 34a16483fa Improve test coverage of secr.drafts. Commit ready for merge.
- Legacy-Id: 9307
2015-03-21 20:26:53 +00:00
Robert Sparks 8f0b8a9225 Checkpoint for demonstration/discussion in Dallas. More development expected afterwards.
- Legacy-Id: 9250
2015-03-19 18:41:02 +00:00
Henrik Levkowetz 6f285a12f4 Changed the handling of some test directory creation and removal code, to be more consistent. Fixed a problem where a test didn't create and remove a test directory it used.
- Legacy-Id: 9203
2015-03-15 16:01:15 +00:00
Henrik Levkowetz 9e0c178e79 Merged in [9143] from rcross@amsl.com:
Add AG Secretary to Proceedings authorized roles.
 - Legacy-Id: 9152
Note: SVN reference [9143] has been migrated to Git commit 096bd5e83e
2015-03-04 19:39:46 +00:00
Henrik Levkowetz 86997e1e95 Turned the api.py file into a module. Moved the makeresources management command to the api module. Added some api tests. Added crawling of api files to the test-crawler. Adjusted some resource files discovered by the test suite and test-crawler. Removed a bunch of empty model files.
- Legacy-Id: 9144
2015-03-03 20:23:36 +00:00
Ryan Cross 096bd5e83e Add AG Secretary to Proceedings authorized roles. Commit ready to merge.
- Legacy-Id: 9143
2015-03-02 23:40:17 +00:00
Henrik Levkowetz 99233abff5 Merged in [9121] from rcross@amsl.com:
resolve issues with proceedings progress repport.
 - Legacy-Id: 9123
Note: SVN reference [9121] has been migrated to Git commit a77c81cdd5
2015-02-24 20:29:42 +00:00
Ryan Cross a77c81cdd5 resolve issues with proceedings progress repport. Commit ready for merge
- Legacy-Id: 9121
2015-02-24 19:11:31 +00:00
Henrik Levkowetz 048319edbc Merged in [9097] from rcross@amsl.com:
Fixes #1605.  Editing session request causes KeyError.
 - Legacy-Id: 9120
Note: SVN reference [9097] has been migrated to Git commit a660c433bb
2015-02-24 18:44:00 +00:00
Henrik Levkowetz ca8d554b78 Undid previous commit -- it contained too much.
- Legacy-Id: 9118
2015-02-24 18:31:53 +00:00
Henrik Levkowetz 2b73f24c94 Merged in [9097] from rcross@amsl.com:
Fixes #1605.  Editing session request causes KeyError.
 - Legacy-Id: 9117
Note: SVN reference [9097] has been migrated to Git commit a660c433bb
2015-02-24 18:29:45 +00:00
Ole Laursen a23d80ea40 Commit patch from Lars Eggert to update the JS/CSS libraries
- Legacy-Id: 9116
2015-02-24 10:25:20 +00:00
Henrik Levkowetz 298adf3e20 Added 4 new fields to the meeting class, to hold draft submission cutoff information for the meeting. On request, changed the presentation of the cutoff times to show the last submission time, rather than the beginning of the cutoff time. Changed the cutoff hour format to support full timedelta information, not just a given hour (this was necessary in order to be able to set the requested 23:59:59 submission stop time).
- Legacy-Id: 9107
2015-02-21 20:48:29 +00:00
Ryan Cross a660c433bb Fixes #1605. Editing session request causes KeyError. Commit ready for merge.
- Legacy-Id: 9097
2015-02-17 19:55:54 +00:00
Henrik Levkowetz 7bd647c0d6 Don't create empty Alias records. Fixes issue #1603.
- Legacy-Id: 9086
2015-02-13 13:04:42 +00:00
Henrik Levkowetz a85725e146 Added a guard against crashing because of missing timeslot location or time in check_audio_files(), which is called by create_proceedings() after changes to meeting materials. Fixes issue 1604.
- Legacy-Id: 9085
2015-02-13 12:09:56 +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
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
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
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
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 6da1939c7c Remove apparently dead template file
- Legacy-Id: 8954
2015-02-02 17:18:20 +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
Robert Sparks 3f6503722c Get the leadership timeslots to show in the secr pages
- Legacy-Id: 8931
2015-01-27 21:22:45 +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 d9e202c4a5 Merged in [8879] from rcross@amsl.com:
Fixes #1580.  grants IRTF Chair access to proceedings.
 - Legacy-Id: 8895
Note: SVN reference [8879] has been migrated to Git commit bfeb650e0e
2015-01-21 21:25:51 +00:00
Henrik Levkowetz 49d86d691b Merged in [8861] from rcross@amsl.com:
Changes to allow upload of bluesheets in materials upload page.  Primarily for use with Interim meetings.
 - Legacy-Id: 8891
Note: SVN reference [8861] has been migrated to Git commit 40efbf4f57
2015-01-21 20:32:18 +00:00
Henrik Levkowetz 05b048bfc4 Merged in [8855] from rcross@amsl.com:
Fixes #1577.  Fix Back and Cancel buttons in recording views.
 - Legacy-Id: 8889
Note: SVN reference [8855] has been migrated to Git commit 83c3393c0c
2015-01-21 20:02:24 +00:00