Commit graph

265 commits

Author SHA1 Message Date
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
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
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
Henrik Levkowetz be1c255be1 Merged in [8854] from rjsparks@nostrum.com:
This is the second step towards ADs out of GroupInfo into Role.
The use of group.ad has been scrubbed from the code and templates.
  - Those places that set group.ad have been directly manipulate Role objects instead
  - Most places that read group.ad now use a new group.ad_role() that returns a Role object, simplifing some views.
Related to #1555 and #1557.
 - Legacy-Id: 8888
Note: SVN reference [8854] has been migrated to Git commit 65804be683
2015-01-21 19:56:57 +00:00
Henrik Levkowetz a41f247ffa Merged in [8853] from rcross@amsl.com:\n fix audio recordings not showing in proceedings.
- Legacy-Id: 8886
Note: SVN reference [8853] has been migrated to Git commit a459356043
2015-01-21 19:45:02 +00:00
Henrik Levkowetz 5c5193786c Merged in [8852] from rcross@amsl.com:\n fixes ability to replace minutes and agendas.
- Legacy-Id: 8885
Note: SVN reference [8852] has been migrated to Git commit cd8cf00c52
2015-01-21 19:38:46 +00:00
Henrik Levkowetz edc4cba1bd Merged in [8851] from rjsparks@nostrum.com:\n This is the first step towards using Role to represent Area directors. It
- Migrates the information captured in GroupInfo.ad to Role objects.
- Renames GroupInfo.ad to GroupInfo._ad (retaining the current column name) to prepare for deletion of that field.
- Provides ad property accessor and setter methods implemented using the group's role_set (so that the existing view code continues to work with minimal changes)
- Improved selection in many querysets that assumed only groups of type 'area' would have area directors.
Related to #1557 and #1555.
 - Legacy-Id: 8884
Note: SVN reference [8851] has been migrated to Git commit 4c9db8f250
2015-01-21 19:33:19 +00:00
Henrik Levkowetz 73c56ef26b Merged in [8848] from rjsparks@nostrum.com:\n Don't add the group's ad to the list of people who need to be at a meeting if the group doesn't have an ad. Protects the field formatter from occurances of None in passed in lists. Patch applied to production.
- Legacy-Id: 8881
Note: SVN reference [8848] has been migrated to Git commit fd9649abf2
2015-01-21 19:06:52 +00:00
Ryan Cross bfeb650e0e Fixes #1580. grants IRTF Chair access to proceedings. Commit ready for merge.
- Legacy-Id: 8879
2015-01-21 19:00:53 +00:00
Henrik Levkowetz 0db48f3db0 Merged in [8840] from rjsparks@nostrum.com:\n Automatically ensure Alias records exists when Person records are changed, relieving multiple code locations of that responsibility. Fixes bug #1550.
- Legacy-Id: 8873
Note: SVN reference [8840] has been migrated to Git commit b0b3a31b10bb35eb00d29f27d75d21c3cc4edc4e
2015-01-20 22:32:01 +00:00
Henrik Levkowetz c3b1e1a369 Merged in [8723] from rcross@amsl.com:\n Fixes ticket #1469, trying to add duplicate name in Rolodex causes 500 error.
- Legacy-Id: 8867
Note: SVN reference [8723] has been migrated to Git commit 9cf30a07d1
2015-01-15 19:37:56 +00:00
Ryan Cross 40efbf4f57 Changes to allow upload of bluesheets in materials upload page. Primarily for use with Interim meetings. Commit ready for merge.
- Legacy-Id: 8861
2015-01-12 18:45:50 +00:00
Ryan Cross e686c5c7f5 Allow upload of bluesheets via materials upload interface
- Legacy-Id: 8857
2015-01-09 21:29:57 +00:00
Ryan Cross 83c3393c0c Fixes #1577. Fix Back and Cancel buttons in recording views. Commit ready for merge
- Legacy-Id: 8855
2015-01-09 18:54:11 +00:00
Robert Sparks 65804be683 This is the second step towards ADs out of GroupInfo into Role.
The use of group.ad has been scrubbed from the code and templates.
  - Those places that set group.ad have been directly manipulate Role objects instead
  - Most places that read group.ad now use a new group.ad_role() that returns a Role object, simplifing some views.

Related to #1555 and #1557.

Commit ready for merge.
 - Legacy-Id: 8854
2015-01-09 18:52:06 +00:00
Ryan Cross a459356043 fix audio recordings not showing in proceedings. Commit ready for merge.
- Legacy-Id: 8853
2015-01-09 00:01:43 +00:00
Ryan Cross cd8cf00c52 fixes ability to replace minutes and agendas. Commit ready for merge.
- Legacy-Id: 8852
2015-01-08 21:42:32 +00:00
Robert Sparks 4c9db8f250 This is the first step towards using Role to represent Area directors. It
- Migrates the information captured in GroupInfo.ad to Role objects.
- Renames GroupInfo.ad to GroupInfo._ad (retaining the current column name) to prepare for deletion of that field.
- Provides ad property accessor and setter methods implemented using the group's role_set (so that the existing view code continues to work with minimal changes)
- Improved selection in many querysets that assumed only groups of type 'area' would have area directors.

Related to #1557 and #1555.

Commit ready to merge.
 - Legacy-Id: 8851
2015-01-08 20:22:23 +00:00
Robert Sparks fd9649abf2 Don't add the group's ad to the list of people who need to be at a meeting if the group doesn't have an ad. Protects the field formatter from occurances of None in passed in lists. Patch applied to production. Commit ready for merge.
- Legacy-Id: 8848
2015-01-07 21:24:42 +00:00
Henrik Levkowetz b5dad67b05 Fix django 1.7 deprecation warnings: get_query_set() --> get_queryset().
- Legacy-Id: 8827
2014-12-22 17:38:49 +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 39389bf163 Added a migrations directory for secr/proceedings, needed for the django 1.7 makemigrations command to run properly, because there is a subclass of meeting.models.Meeting in proceedings ...
- Legacy-Id: 8821
2014-12-22 16:48:54 +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
Ryan Cross 9cf30a07d1 Fixes ticket #1469, trying to add duplicate name in Rolodex causes 500 error. Commit ready for merge
- Legacy-Id: 8723
2014-12-02 18:30:35 +00:00
Ole Laursen cebc979282 Summary: Resolve person/email/document multiselect issue by importing
select2 and switching the widgets over to using that. Port the
milestones editing page to Bootstrap.
 - Legacy-Id: 8713
2014-11-25 16:47:48 +00:00
Robert Sparks b4448a8faa Added functionality for management of group materials,
focusing on groups of type 'team'.

* Simplifies managing the Abstract for uploaded group materials. 
  Displays the abstract on the groups materials page
* Provides SessionPresentation: a binding between 
  Document and Session objects, that tracks doc version.
* Adds helpers for finding upcoming sessions, and the 
  most recent SessionPresentations whose sessions have passed
* Generalizes the snippet concept (as a templatetage) used 
  in the history tab for use on other pages
* Adds a variant of the snippet that can be styled as an edit link
* Provides several ways to address sessions, using sequence, 
  dates, group acronyms, and day of week
* Adds a 'Materials Manager' Role

Commit ready for merge.
 - Legacy-Id: 8711
2014-11-25 00:09:05 +00:00
Ole Laursen 6a7f3d981d Summary: Update Secretariat jQuery version to the same as the rest of
the site (1.11.1) to make the people selection widget work
 - Legacy-Id: 8704
2014-11-24 15:33:55 +00:00
Henrik Levkowetz 8675c1e5ad Added a setting for the temporary bluesheets directory used during testing.
- Legacy-Id: 8648
2014-11-12 01:49:55 +00:00
Henrik Levkowetz 184662f5e0 Merged in [8641] from rcross@amsl.com:
Fixed the check_permissions() decorator to handle not authenticated users.
 - Legacy-Id: 8645
Note: SVN reference [8641] has been migrated to Git commit 0ad5828b0f42abc2b0af0564f7b01935d0c326f5
2014-11-11 22:29:50 +00:00
Ryan Cross 097b936ca8 Remove secauth middleware. Replace with role_required decorators. Commit ready for merge
- Legacy-Id: 8624
2014-11-09 02:32:41 +00:00
Robert Sparks c436607039 merged forward. Adjusted new proceedings code to new models. Found bug in earlier work on proceedings code exposing places that tests are not covering.
- Legacy-Id: 8589
2014-11-05 21:19:09 +00:00
Henrik Levkowetz be4e45e16d Temporary patch for exception when trying to generate proceedings for a session which doesn't have an assigned timeslot in an official schedule. Happens all the time for interims, for example.
- Legacy-Id: 8534
2014-10-31 21:52:19 +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 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 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 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