Commit graph

304 commits

Author SHA1 Message Date
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
Robert Sparks 2db4a3b270 First automated javascript test using PhantomJS and Selenium. Commit ready to merge
- Legacy-Id: 8137
2014-07-19 20:50:40 +00:00
Robert Sparks cb659afd2f changed call to skip to make the code more readable
- Legacy-Id: 8134
2014-07-19 20:36:55 +00:00
Henrik Levkowetz 4f0d483f91 Added django-admin support for meeting.ScheduledSession
- Legacy-Id: 8002
2014-06-30 19:12:34 +00:00
Henrik Levkowetz db7adf1fb5 Modified the code which adds non-session entries to a schedule so as to bind a Session object also to Break and Registration timeslots, through the Schedule/Timeslot/Session m2m table. This makes the agenda templates work as expected. There's also a migration and a standalone script that fills in this information for existing schedules.
- Legacy-Id: 7975
2014-06-30 17:05:40 +00:00
Henrik Levkowetz 6e3bb37ecb Merged in [7935] from liudapeng@chinamobile.com:
Add brief_display function in Constraint class to display both WG conflict and person conflict. Fixes issue #1384.
 - Legacy-Id: 7938
Note: SVN reference [7935] has been migrated to Git commit 425f88cad70f7a473c6f5bf58bbde581a85ccb39
2014-06-26 19:56:34 +00:00
Robert Sparks bdc9b7aa07 initial automated test, establishes framework
- Legacy-Id: 7933
2014-06-25 20:27:26 +00:00
Henrik Levkowetz b3c06d1e8c Patch from mcr@sandelman.ca: Correct the post data of a meeting test case.
- Legacy-Id: 7826
2014-06-02 21:40:42 +00:00
Henrik Levkowetz f86c59209f Changed the logic for what is the 'current' ietf meeting to disregard whether there's an agenda for the meeting or not. This lets people see the correct session request page for the current meeting. However, it also makes the /meeting/agenda.html page fail because there's no schedule associated with the meeting; so alternative pages saying 'No agenda available' has been added, too.
- Legacy-Id: 7641
2014-04-25 13:14:53 +00:00
Henrik Levkowetz bf1e44864d Merged in [7561] from rjsparks@nostrum.com:
Updates and bugfixes to the agenda editing features
* Removes the pattern of using ScheduledSession m2m objects with one of the relationships left as None
* Improves scheduled session state handling
* Simplifies sending email to scheduled session requestors
* Improved timeslot purpose and room editing
* Improved access controls to editing forms
* Better test coverage for the meeting views
* Improvements to the javascript driven by prototyping automated tests
* Better initialization of a new meeting
On the session request form:
  - Allows specifiying room resources (projectors, meetecho)
  - Allows specifying what people must be present
On the schedule editing page:
  - correctly calculates conflict levels
  - displays conflicts in and out of each session separately
  - italicizes BoFs
  - shows resource and people conflicts
Adds automated placement as a management command
 - Legacy-Id: 7628
Note: SVN reference [7561] has been migrated to Git commit 1221f79af9
2014-04-22 21:34:23 +00:00
Henrik Levkowetz 2c27eb481d Merged in [7519] from olau@iola.dk:
Remove uses of gzip middleware - the decorator thing breaks the ETags for some reason, as noted in issue #518, and it seems consensus is that we should do this in Apache instead for the whole site
 - Legacy-Id: 7602
Note: SVN reference [7519] has been migrated to Git commit 9ddecc1970
2014-04-12 18:50:01 +00:00
Henrik Levkowetz b02b0a96df All tests pass, except for some pyflakes tests which I believe are fixed in trunk.
- Legacy-Id: 7579
2014-04-06 20:04:36 +00:00
Robert Sparks 1221f79af9 Updates and bugfixes to the agenda editing features
* Removes the pattern of using ScheduledSession m2m objects with one of the relationships left as None
* Improves scheduled session state handling
* Simplifies sending email to scheduled session requestors
* Improved timeslot purpose and room editing
* Improved access controls to editing forms
* Better test coverage for the meeting views
* Improvements to the javascript driven by prototyping automated tests
* Better initialization of a new meeting
On the session request form:
  - Allows specifiying room resources (projectors, meetecho)
  - Allows specifying what people must be present
On the schedule editing page:
  - correctly calculates conflict levels
  - displays conflicts in and out of each session separately
  - italicizes BoFs
  - shows resource and people conflicts
Adds automated placement as a management command

Commit ready for merge.
 - Legacy-Id: 7561
2014-04-01 22:17:18 +00:00
Ryan Cross 0fafe56381 allow edit of timeslots, changes to scheduled notifications, support non-official schedules
- Legacy-Id: 7554
2014-03-28 23:16:41 +00:00
Henrik Levkowetz ff0dbe0d52 Merged in source:personal/henrik/r7446-pyflakes@7463, which adds pyflakes tests to the test suite, and makes the code pyflakes-clean.
- Legacy-Id: 7521
2014-03-19 18:48:33 +00:00
Ole Laursen 9ddecc1970 Remove uses of gzip middleware - the decorator thing breaks the ETags for some reason, as noted in issue #518, and it seems consensus is that we should do this in Apache instead for the whole site
- Legacy-Id: 7519
2014-03-19 17:40:21 +00:00
Robert Sparks be81557611 Shifted building the edit time slices from looking at scheduledsessions to looking at timeslots
- Legacy-Id: 7511
2014-03-17 21:49:01 +00:00
Robert Sparks 0d5a940f55 Create no ScheduledSessions with session=None
- Legacy-Id: 7510
2014-03-17 18:54:11 +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