Commit graph

86 commits

Author SHA1 Message Date
Robert Sparks 71dd15f828 adjust mergequeue
- Legacy-Id: 19736
2021-12-01 22:58:44 +00:00
Robert Sparks 29152e5f75 hold 19698
- Legacy-Id: 19728
2021-12-01 18:49:16 +00:00
Robert Sparks 25b3e297ae hold 19697
- Legacy-Id: 19727
2021-12-01 18:48:33 +00:00
Robert Sparks 9d492f6126 adjust mergequeue (hold 19696 - missing some earlier commits)
- Legacy-Id: 19726
2021-12-01 18:45:20 +00:00
Robert Sparks fd5595039c Merged in ^/personal/jennifer/7.39.1.dev2 from jennifer@painless-security.com:
Create dev branch for session purpose work (from revision [19414])
    Snapshot of dev work to add session purpose annotation (from
    revision [19415])
    Allow non-WG-like groups to request additional sessions/durations and
    bypass approval (from revision [19424])
    Add 'closed' session purpose, assign purposes for nomcom groups, and update
    schedule editor to enforce timeslot type and allow blurring sessions by
    purpose (from revision [19427])
    Add management command to set up timeslots/sessions for testing/demoing
    'purpose' field (from revision [19430])
    Update session purposes and group type -> purpose map to match notes page,
    change 'session' purpose to 'regular' (from revision [19433])
    Redirect edit_schedule urls to edit_meeting_schedule view (from
    revision [19434])
    Allow hiding/blurring sessions and timeslots based on TimeSlotType in
    the schedule editor (from revision [19438])
    Disable session purpose/timeslot type hiding on schedule editor when
    only 0 or 1 options (from revision [19439])
    Improvements to the timeslot and schedule editors (move new toggles to
    modals, handle overflowing session names, fix timeslot editor scrolling,
    add buttons to quickly create single timeslot, accept trailing slash on
    edit URL) (from revision [19449])
    Update purpose/types after discussions, add on_agenda Session field,
    prevent session requests for groups with no allowed purpose, handle
    addition fields in session request, fix editing session requests, add
    session edit form/access from schedule editor, eliminate TimeSlotTypeName
    'private' field, add server-side timeslot type filtering to schedule editor
    (from revision [19549])
    Eliminate the officehours timeslot type, update/renumber migrations, mark
    offagenda/reserved TimeSlotTypeNames as not used, add a 'none'
    SessionPurposeName and disallow null, update agenda filter keywords/filter
    helpers, fix broken tests and general debugging (from revision [19550])
    Tear out old meeting schedule editor and related code (from
    revision [19551])
    Fix merge errors in preceding commits (from revision [19556])
    Add missing ifSeleniumEnabled guard for meeting.tests_js.EditTimeslotsTests
    (from revision [19592])
    Remove 'before' version of migrations that were renumbered before merge.
    (from revision [19595])
 - Legacy-Id: 19596
Note: SVN reference [19415] has been migrated to Git commit 1054f90873

Note: SVN reference [19424] has been migrated to Git commit 5318081608

Note: SVN reference [19427] has been migrated to Git commit 173e438aee

Note: SVN reference [19430] has been migrated to Git commit 7a2530a0a6

Note: SVN reference [19433] has been migrated to Git commit 3be50d6e39

Note: SVN reference [19434] has been migrated to Git commit 3e3d681e5f

Note: SVN reference [19438] has been migrated to Git commit b6ac3d4b1d

Note: SVN reference [19439] has been migrated to Git commit 446ac7a47e

Note: SVN reference [19449] has been migrated to Git commit 5cbe402036

Note: SVN reference [19549] has been migrated to Git commit 3dfce7b850

Note: SVN reference [19550] has been migrated to Git commit 7b35c09c40

Note: SVN reference [19551] has been migrated to Git commit d7f20342b6

Note: SVN reference [19556] has been migrated to Git commit 2b1864f5a0

Note: SVN reference [19592] has been migrated to Git commit c3f28eeedb

Note: SVN reference [19595] has been migrated to Git commit 83f5c7e9b6
2021-11-09 18:26:47 +00:00
Robert Sparks d8629461c3 Hold the "give us your xml" modal commit at 19495 for later merge
- Legacy-Id: 19530
2021-11-02 18:13:20 +00:00
Robert Sparks ba13d2c29a adjusted merge queue
- Legacy-Id: 19337
2021-09-04 15:35:34 +00:00
Robert Sparks a937200b94 adjusted merge queue
- Legacy-Id: 19325
2021-09-03 18:08:51 +00:00
Robert Sparks 0f1c7731e5 Moved 19195 and 19197 out of the mergequeue.
- Legacy-Id: 19225
2021-07-15 19:29:14 +00:00
Robert Sparks 77881658d2 Putting 19103 back in the mergequeue.
- Legacy-Id: 19110
2021-06-10 23:15:05 +00:00
Robert Sparks 69a4220f31 defer 19103 until the release after next
- Legacy-Id: 19105
2021-06-10 20:49:49 +00:00
Robert Sparks b0590c838f Grooming mergequeue
- Legacy-Id: 19000
2021-05-18 17:21:04 +00:00
Robert Sparks 5ecd47009d managing merge queue entries.
- Legacy-Id: 18942
2021-04-12 14:34:08 +00:00
Robert Sparks 8beda6c5d1 removing 18860 and 18858 from hold-for-merge
- Legacy-Id: 18883
2021-03-03 17:13:07 +00:00
Robert Sparks c5dc71bc39 Holding r1860 for test issues
- Legacy-Id: 18877
2021-03-02 21:03:42 +00:00
Robert Sparks 810331c748 Hold r18859. Will probably address a different way.
- Legacy-Id: 18876
2021-03-02 20:22:22 +00:00
Robert Sparks d3914cf2a9 Capturing 18858 in old for merge
- Legacy-Id: 18874
2021-03-02 18:45:21 +00:00
Robert Sparks 09809b874e Merged in [18689] from kivinen@iki.fi:
New version of the timezone support for agenda. Now the ongoing
bars work. This also moves the javascript from the agenda.html
to separate timezone.js file. This commit does not include the
moment and moment-timezone javascript libraries that are
needed to get this working, they need to be added to
ietf/externals/static separately.
 - Legacy-Id: 18800
Note: SVN reference [18689] has been migrated to Git commit f18fe23ea5
2021-01-25 16:28:34 +00:00
Robert Sparks 159b8fe37c Merged in [18712] from jennifer@painless-security.com:
Add timezone support to agenda weekview; display UTC on UTC agenda page. Fixes #3111.
 - Legacy-Id: 18796
Note: SVN reference [18712] has been migrated to Git commit d29553c0bc
2021-01-15 19:59:56 +00:00
Robert Sparks 22de976120 bringing agenda work in now that the timezone aware migrations deferred
- Legacy-Id: 18795
2021-01-15 19:09:43 +00:00
Henrik Levkowetz 80f667589b Updated hold-for-merge and ready-for-merge lists
- Legacy-Id: 18732
2020-12-04 16:20:26 +00:00
Henrik Levkowetz c9f805f8e5 - Legacy-Id: 18699 2020-11-16 17:36:36 +00:00
Henrik Levkowetz 35f4f4c8a8 Merged in [18651] from jennifer@painless-security.com:
Retrieve session agenda, slides, and minutes each time agenda modal is opened. Fixes #3050.
 - Legacy-Id: 18658
Note: SVN reference [18651] has been migrated to Git commit bbf04c3fbe
2020-11-06 15:53:28 +00:00
Henrik Levkowetz 2ed49e24ba - Legacy-Id: 18404 2020-08-22 18:55:43 +00:00
Henrik Levkowetz 9be854429e Updated hold-for-merge
- Legacy-Id: 18317
2020-07-30 10:42:48 +00:00
Henrik Levkowetz a8829bdaee - Legacy-Id: 18303 2020-07-29 10:58:45 +00:00
Henrik Levkowetz 868598955b - Legacy-Id: 17729 2020-05-04 19:39:56 +00:00
Henrik Levkowetz 267bd59040 Updated merge hold and ready lists.
- Legacy-Id: 17726
2020-05-04 13:00:17 +00:00
Henrik Levkowetz 9b8d9c8305 - Legacy-Id: 17596 2020-04-08 14:53:51 +00:00
Henrik Levkowetz db635fe7b3 - Legacy-Id: 17499 2020-03-22 10:57:59 +00:00
Henrik Levkowetz d5f18de71f - Legacy-Id: 17066 2019-11-20 09:58:11 +00:00
Henrik Levkowetz 290a98631f Merged in [16564] from pusateri@bangj.com and added tests:
Convert markdown to html if Accept header prioritizes text/html over text/markdown. Fixes #1926.
 - Legacy-Id: 16982
Note: SVN reference [16564] has been migrated to Git commit 65b3f93afe
2019-11-09 17:15:39 +00:00
Henrik Levkowetz d798196f5a Merged in [16703] from sasha@dashcare.nl:
Ref #2231 - Fix send-review-reminders and add it to daily cron
This fixes a syntax error and a Python 3 incompatibility, and adds
send-review-reminders to the daily cron script.
Important notes:
- I have not tested to what degree the existing reminders work as they
  should, as that's out of scope. It does have tests.
- I can't assess whether the virtualenv activation works in the
  production setup, and it may be obsolete as bin/daily also
  activates the virtualenv.
- The same Python 3 incompatibility (execfile() no longer exists) seems
  to exist in various other scripts.
 - Legacy-Id: 16821
Note: SVN reference [16703] has been migrated to Git commit 296b126c70
2019-10-04 13:04:37 +00:00
Henrik Levkowetz 565d24cbbc - Legacy-Id: 16766 2019-09-30 15:12:49 +00:00
Henrik Levkowetz f6db442fc4 - Legacy-Id: 16692 2019-09-03 11:30:45 +00:00
Henrik Levkowetz a9b9d30eab Tweaked mergeready, and added/changed some items in the merge support files.
- Legacy-Id: 16605
2019-07-31 21:31:55 +00:00
Henrik Levkowetz 0606c6dd5f - Legacy-Id: 16595 2019-07-26 19:33:51 +00:00
Henrik Levkowetz ef3cbf4684 Merged in [15595] from rjsparks@nostrum.com:
Converted stats, submit, sync. and utils/test to use factories. Excluded utils/test_data from coverage checks.
 - Legacy-Id: 15599
Note: SVN reference [15595] has been migrated to Git commit 39e76a836996ec9ed8ea449c92bdfae91c3dbaae
2018-10-19 12:54:58 +00:00
Henrik Levkowetz 977b3ca74a Merged in [15580] from rjsparks@nostrum.com:
Better constrain a liaison test object to match the preconditions for the test.
 - Legacy-Id: 15594
Note: SVN reference [15580] has been migrated to Git commit 8004ba367a
2018-10-17 13:50:34 +00:00
Henrik Levkowetz a74055c922 - Legacy-Id: 15542 2018-10-08 14:09:16 +00:00
Henrik Levkowetz 50b546338a Merged in [15314] from rjsparks@nostrum.com:
Converted the community app tests to use factories.
 - Legacy-Id: 15346
Note: SVN reference [15314] has been migrated to Git commit ae70706faf
2018-07-14 19:50:22 +00:00
Henrik Levkowetz 54f36359b0 Updated hold-for-merge
- Legacy-Id: 15343
2018-07-14 18:09:34 +00:00
Henrik Levkowetz cf6354608a - Legacy-Id: 14093 2017-09-01 13:07:21 +00:00
Henrik Levkowetz 73c4a7b397 - Legacy-Id: 13981 2017-07-26 21:34:29 +00:00
Henrik Levkowetz 7d443e5577 Merged in [13955] from kivinen@iki.fi:
Changed links to previous reviews go to the doc page of the last
result, not the review request page. The doc page will contain the
actual review, so it has all information that is needed. Fixes #2090.
 - Legacy-Id: 13961
Note: SVN reference [13955] has been migrated to Git commit 7154166e74
2017-07-21 15:57:03 +00:00
Henrik Levkowetz 7ecf7dfa44 Merged in [13615] and [13627]from rcross@amsl.com:
Changed views that use GET requests to delete objects to use POST.
Fixes #1796.
 - Legacy-Id: 13654
Note: SVN reference [13615] has been migrated to Git commit 3ccb550888

Note: SVN reference [13627] has been migrated to Git commit b908caf95c
2017-06-16 14:20:01 +00:00
Henrik Levkowetz 2c1acdcbea Removed temporary merge holds
- Legacy-Id: 13354
2017-05-15 12:29:29 +00:00
Henrik Levkowetz 849c69ea11 Hold part of 2 commits for next release, to avoid mixing schema and data migrations.
- Legacy-Id: 13312
2017-05-11 09:27:47 +00:00
Henrik Levkowetz 7dafab0b30 Hold a merge for fix of test failure.
- Legacy-Id: 13155
2017-03-27 20:35:26 +00:00
Henrik Levkowetz 1a92efb77e Merged in ^/branch/proceedings/6.33.1.dev0@12141 from rcross@amsl.com:
Added meeting proceedings introduction pages: Progress Report and Attendees.  Added a data migration to provide proceedings introduction information for IETF 95 and 96.
 - Legacy-Id: 12150
2016-10-14 15:48:10 +00:00