Commit graph

322 commits

Author SHA1 Message Date
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
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 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 b56580b847 Added tests for the presence of a VTIMEZONE section in generated agenda iCalendar files.
- Legacy-Id: 9191
2015-03-13 16:06:16 +00:00
Henrik Levkowetz cb70eb6a88 Removed a superfluous import.
- Legacy-Id: 9169
2015-03-08 14:33:50 +00:00
Henrik Levkowetz 29c674ca59 Captured the change in ScheduledSession sort order in a migration.
- Legacy-Id: 9164
2015-03-08 11:49:03 +00:00
Henrik Levkowetz 4dbdf475fa Merged in [9141] from rjsparks@nostrum.com:
Fix ordering issue on agenda.html.
 - Legacy-Id: 9150
Note: SVN reference [9141] has been migrated to Git commit 29ac6363a1
2015-03-04 19:16:21 +00:00
Henrik Levkowetz 7619186e6a Added a field capturing changed information for the idsubmission-cutoff-related fields of Meeting.
- Legacy-Id: 9148
2015-03-04 17:51: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
Robert Sparks 29ac6363a1 Fix ordering issue on agenda.html. Commit ready for merge
- Legacy-Id: 9141
2015-03-01 16:08:02 +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
Henrik Levkowetz fed0e17ac1 Made the selector for Agenda.groups() match that of Agenda.area_list() by adding parent__isnull=False. Without this, the two won't match if split by area. Fixes issue #1607.
- Legacy-Id: 9108
2015-02-23 12:21:00 +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 071dfc6f8e Cleanup after Django 1.7 migration
- Legacy-Id: 9082
2015-02-12 16:38:01 +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 375b8d8d95 Added an admin view for the ResourceAssociation class.
- Legacy-Id: 9013
2015-02-06 12:34:11 +00:00
Robert Sparks 82bc8f06e1 Restrict the gathering of ads for past meetings to groups that are areas. Commit ready for merge.
- Legacy-Id: 8924
2015-01-26 23:35:32 +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 71057d309a From rjsparks@nostrum.com: Fixed Room.__unicode__() to handle capacity None.
- Legacy-Id: 8864
2015-01-14 17:18:40 +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
Henrik Levkowetz 30b5d6f229 Added admin support for meeting.models.ResourceAssociation.
- Legacy-Id: 8834
2014-12-22 20:11:54 +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 5133e59c9b Merged in [8711] from rjsparks@nostrum.com:\n 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
 - Legacy-Id: 8765
Note: SVN reference [8711] has been migrated to Git commit b4448a8faa
2014-12-18 18:47:14 +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
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
Henrik Levkowetz c462e63adb Added settings for the PhantomJS ghostdriver.log and the temporary meeting materials directory used during testing, so that it's possible to place them in other places than the working copy.
- Legacy-Id: 8646
2014-11-12 01:45:58 +00:00
Henrik Levkowetz 334d11837a Merged in [8614] from harald@alvestrand.no:
Second try on #1425. Returns to agenda and uses message.
    Builds on [8604]. Fixes issue #1425, agenda view save-as.
 - Legacy-Id: 8621
Note: SVN reference [8604] has been migrated to Git commit c0c608ae1c

Note: SVN reference [8614] has been migrated to Git commit 502dede548
2014-11-09 02:15:18 +00:00
Harald T. Alvestrand 502dede548 Second try on #1425. Returns to agenda and uses message. Commit ready for merge.
- Legacy-Id: 8614
2014-11-09 01:21:16 +00:00
Harald T. Alvestrand c0c608ae1c Fixed agenda view save-as. Fixes #1425. Commit ready for merge.
- Legacy-Id: 8604
2014-11-08 23:11:03 +00:00
Robert Sparks c05d734cf3 one more tweak before refactoring
- Legacy-Id: 8455
2014-10-21 22:38:06 +00:00
Robert Sparks 2f6799ece6 Have working selectors for sessions related to a meeting and sessions related to a document, views for listing such sections that can be edited, and an edit form for changing the presented version. Checkpointing before big refactor to move the URI components around
- Legacy-Id: 8453
2014-10-21 21:16:27 +00:00
Robert Sparks e889177a32 merged forward
- Legacy-Id: 8432
2014-10-16 15:07:33 +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 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
Robert Sparks 19b31576eb Add the owners email address to the json path for schedule objects. Fixes ticket #1492. Commit ready for merge.
- Legacy-Id: 8355
2014-09-23 21:39:09 +00:00
Robert Sparks 67782ade34 merge forward complete
- Legacy-Id: 8354
2014-09-23 15:48:27 +00:00
Robert Sparks c3f460cbe9 Refactored history snippets for general use
Moved from VersionedMaterials to SessionPresentation for the through table name
Added the abstract and most recent presentation to the documents on the group materials page
Working snapshot before building historic edu-team documents
 - Legacy-Id: 8349
2014-09-19 21:33:30 +00:00
Henrik Levkowetz 8b8a282730 Merged in [8229] from rjsparks@nostrum.com, with minor tweaks:
From mcr@sandelman.ca:
    Refactor to remove dajaxice.
    Modified the URLs that address schedules:
      - urls now always start with /agenda, removing the mix of /agenda and /schedule prefixes
      - urls to a given schedule include the schedule owner (by email address)
    Corrected issue that prevented deleting sessions.
    Changed comment mechanism in timeslot_edit.js
    Migration to change the email address for (System)
  Fixes bug #1426
 - Legacy-Id: 8319
Note: SVN reference [8229] has been migrated to Git commit fc512680d8
2014-09-18 20:27:28 +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
Robert Sparks 75b94bd114 sketch that uses a through table, preserving most, but not all, of the current interface
- Legacy-Id: 8302
2014-09-09 21:56:33 +00:00
Robert Sparks fc512680d8 From mcr@sandelman.ca:
Refactor to remove dajaxice.
  Modified the URLs that address schedules:
    - urls now always start with /agenda, removing the mix of /agenda and /schedule prefixes
    - urls to a given schedule include the schedule owner (by email address)
  Corrected issue that prevented deleting sessions.
  Changed comment mechanism in timeslot_edit.js
  Migration to change the email address for (System)

  Fixes bug #1426

Commit ready to merge
 - Legacy-Id: 8229
2014-07-31 22:13:01 +00:00
Henrik Levkowetz 660bd42ccc Merged in [8137] from rjsparks@nostrum.com:
First automated javascript test using PhantomJS and Selenium.
 - Legacy-Id: 8151
Note: SVN reference [8137] has been migrated to Git commit 2db4a3b270
2014-07-20 14:54:47 +00:00