Commit graph

1342 commits

Author SHA1 Message Date
Jennifer Richards 93d3daa324 fix: handle remote_instructions field correctly on interim request form 2022-03-08 12:15:22 -04:00
Jennifer Richards 686a9150b3 Merge remote-tracking branch 'origin/main' into personal/jennifer/7.45.1.dev0.bootstrap-merge
# Conflicts:
#	ietf/templates/meeting/session_buttons_include.html
2022-03-04 15:14:52 -04:00
Jennifer Richards 077e7e2262 Merged from 7.40.1.dev0
Properly URL-encode and -decode a bunch of query parameters. [from revision 19,981]
 - Legacy-Id: 19986
2022-02-24 17:52:28 +00:00
Jennifer Richards 2610c7c736 Merged in [19978] from personal/lars/7.40.1.dev0
Hopefully fix #3556.
 - Legacy-Id: 19983
Note: SVN reference [19978] has been migrated to Git commit ca167c0172
2022-02-24 16:55:16 +00:00
Jennifer Richards 9d8f4ea207 Fix failing tests
- Legacy-Id: 19982
2022-02-24 16:47:55 +00:00
Lars Eggert 07e0eb84d9 Properly URL-encode and -decode a bunch of query parameters.
- Legacy-Id: 19981
2022-02-24 14:23:46 +00:00
Lars Eggert ca167c0172 Hopefully fix #3556.
- Legacy-Id: 19978
2022-02-24 09:11:32 +00:00
Robert Sparks 9fbc98a16d Merged in [19969] from jennifer@painless-security.com:
Use correct UTC time when creating Meetecho conferences. Fixes #3565.
 - Legacy-Id: 19970
Note: SVN reference [19969] has been migrated to Git commit 82ea659ed4
2022-02-23 21:04:25 +00:00
Jennifer Richards 82ea659ed4 Use correct UTC time when creating Meetecho conferences. Fixes #3565. Commit ready for merge.
- Legacy-Id: 19969
2022-02-23 20:51:18 +00:00
Robert Sparks bc8155f197 Add link to onsite tool to agenda. Fixes #3550. Commit ready for merge.
- Legacy-Id: 19947
2022-02-18 15:12:21 +00:00
Jennifer Richards 6c260a5b7e Merge 7.45.1.dev0 into Bootstrap 5 update branch. Made a first pass at reconciling differences.
- Legacy-Id: 19945
2022-02-17 20:09:49 +00:00
Robert Sparks f8c7be6df9 Merged in [19917] and [19930] from jennifer@painless-security.com:
Create/delete Meetecho conferences when requesting/canceling interim sessions. Fixes #3507. Fixes #3508.
 - Legacy-Id: 19934
Note: SVN reference [19917] has been migrated to Git commit 81cd64da2bc0122f733df02f7db634665c9b309a

Note: SVN reference [19930] has been migrated to Git commit c64297e495010f3c147726ad61c24ca436c324da
2022-02-14 19:08:10 +00:00
Robert Sparks d3a91b4b19 Merged in [19920] from rjsparks@nostrum.com:
Make working with session purpose easier in the admin.
 - Legacy-Id: 19928
Note: SVN reference [19920] has been migrated to Git commit 191d5b134fdab8782280eb9769beec793818975f
2022-02-14 18:14:26 +00:00
Lars Eggert bbf088e18b Hopefully the final check-ins.
- Legacy-Id: 19909
2022-02-08 17:29:15 +00:00
Lars Eggert ed30521e14 Many more HTML fixes.
- Legacy-Id: 19908
2022-02-03 07:49:34 +00:00
Robert Sparks 216ebe2b94 Provide the complete context to the template for mail about approved interim requests. Fixes #3534. Commit ready for merge.
- Legacy-Id: 19907
2022-02-03 03:16:11 +00:00
Lars Eggert 53089a94f6 And more fixes.
- Legacy-Id: 19902
2022-02-01 07:47:25 +00:00
Lars Eggert 335a39d4fc More fixes.
- Legacy-Id: 19884
2022-01-28 13:00:47 +00:00
Jennifer Richards 795d861d96 Hide timeslots type is disabled plus other schedule editor debugging/improvements. Fixes #3510. Fixes #3430. Commit ready for merge.
- Legacy-Id: 19878
2022-01-27 00:41:27 +00:00
Lars Eggert cf629a42ad And more fixes.
- Legacy-Id: 19877
2022-01-25 10:14:25 +00:00
Lars Eggert 9c05373699 More fixes.
- Legacy-Id: 19856
2022-01-18 20:04:55 +00:00
Jennifer Richards 64e904804d Link to the timeslot editor when meeting has no timeslots. Fixes #3511. Commit ready for merge.
- Legacy-Id: 19841
2022-01-14 15:48:03 +00:00
Jennifer Richards 6f3fb6930f Add timeouts to requests library calls. Fixes #3498. Commit ready for merge.
- Legacy-Id: 19839
2022-01-13 15:06:28 +00:00
Lars Eggert 5132661b06 More test fixes
- Legacy-Id: 19803
2022-01-05 11:25:25 +00:00
Robert Sparks 1d76b53215 Merged in [19788] from jennifer@painless-security.com:
Import django.conf.settings instead of ietf.settings. Fixes #3392.
 - Legacy-Id: 19798
Note: SVN reference [19788] has been migrated to Git commit ecde8a780fce609efc6539e258e57752a03aa2bd
2022-01-04 16:09:27 +00:00
Robert Sparks 9b54c9d3c9 Merged in [19763] from jennifer@painless-security.com:
Add ability to import session minutes from notes.ietf.org. Mock out calls to the requests library in tests. Call markdown library through a util method. Fixes #3489.
 - Legacy-Id: 19767
Note: SVN reference [19763] has been migrated to Git commit fd0df6f619
2021-12-09 22:43:19 +00:00
Jennifer Richards fd0df6f619 Add ability to import session minutes from notes.ietf.org. Mock out calls to the requests library in tests. Call markdown library through a util method. Fixes #3489. Commit ready for merge.
- Legacy-Id: 19763
2021-12-09 17:16:19 +00:00
Lars Eggert f974fd3c04 Fix more things
- Legacy-Id: 19762
2021-12-09 06:41:00 +00:00
Robert Sparks 640855f786 Merged in [19744] from jennifer@painless-security.com:
Treat application/octet-stream as text/markdown for '.md' materials uploads. Refactor FileUploadForm hierarchy to reduce boilerplate. Fixes #3163.
 - Legacy-Id: 19746
Note: SVN reference [19744] has been migrated to Git commit b04254a293
2021-12-02 21:31:06 +00:00
Jennifer Richards b04254a293 Treat application/octet-stream as text/markdown for '.md' materials uploads. Refactor FileUploadForm hierarchy to reduce boilerplate. Fixes #3163. Commit ready for merge.
- Legacy-Id: 19744
2021-12-02 19:50:19 +00:00
Robert Sparks ec78569b83 Merged in [19675] from jennifer@painless-security.com:
Update uploaded_filename when modifying agenda through the interim meeting request edit view. Fixes #3395.
 - Legacy-Id: 19721
Note: SVN reference [19675] has been migrated to Git commit 9d853d3de3
2021-12-01 18:08:15 +00:00
Robert Sparks 0e5da15838 Merged in [19672] from jennifer@painless-security.com:
Add tests of meeting forms for the new session purpose work and a few other untested parts. Fix a few bugs uncovered.
 - Legacy-Id: 19720
Note: SVN reference [19672] has been migrated to Git commit 71ca72d8b8
2021-12-01 18:05:22 +00:00
Lars Eggert 5174cb3e6f Merge ^/personal/lars/7.39.1.dev4
- Legacy-Id: 19705
2021-11-24 09:35:06 +00:00
Lars Eggert e195a00d1b And more agenda fixes.
- Legacy-Id: 19682
2021-11-18 15:18:48 +00:00
Jennifer Richards 9d853d3de3 Update uploaded_filename when modifying agenda through the interim meeting request edit view. Fixes #3395. Commit ready for merge.
- Legacy-Id: 19675
2021-11-17 17:23:12 +00:00
Jennifer Richards 71ca72d8b8 Add tests of meeting forms for the new session purpose work and a few other untested parts. Fix a few bugs uncovered. Commit ready for merge.
- Legacy-Id: 19672
2021-11-17 01:43:15 +00:00
Robert Sparks b243d4aab4 Merged in [19670] from rjsparks@nostrum.com:
Escape . in agenda url patterns. Guard against unrecognized extensions.
 - Legacy-Id: 19671
Note: SVN reference [19670] has been migrated to Git commit 58bd89c99e
2021-11-16 19:17:46 +00:00
Robert Sparks 58bd89c99e Escape . in agenda url patterns. Guard against unrecognized extensions. Commit ready for merge.
- Legacy-Id: 19670
2021-11-16 19:16:50 +00:00
Jennifer Richards 347b62cbb5 Fix error in assignment_display_name() and fix broken test from previous commit. Range 19665:19666 ready for merge.
- Legacy-Id: 19666
2021-11-15 21:48:43 +00:00
Jennifer Richards b77e6627a4 Guard against null timeslot location in agenda.html and add test of location_anchor tag
- Legacy-Id: 19665
2021-11-15 21:01:19 +00:00
Lars Eggert a8764f225f Track CSS class name changes in bs5.
- Legacy-Id: 19663
2021-11-15 16:49:09 +00:00
Lars Eggert dec56ffb96 Merge my bs5 changes over.
There is definitely still quite some breakage, my main focus during
the conflict resolution was not to drop any changes made by others.
 - Legacy-Id: 19632
2021-11-11 13:09:23 +00:00
Lars Eggert 6b7beb17bf panel -> card
- Legacy-Id: 19618
2021-11-10 12:59:12 +00:00
Lars Eggert 726b29bf74 fontawesome -> bootstrap-icons
- Legacy-Id: 19608
2021-11-10 09:28:38 +00:00
Jennifer Richards 83f5c7e9b6 Remove "before" versions of migrations that were renumbered during merge
- Legacy-Id: 19595
2021-11-09 18:03:06 +00:00
Jennifer Richards c3f28eeedb Add missing ifSeleniumEnabled guard for meeting.tests_js.EditTimeslotsTests
- Legacy-Id: 19592
2021-11-09 16:50:40 +00:00
Jennifer Richards 0706f8519f Update migrations and fix a few failing tests. Branch ready for merge.
- Legacy-Id: 19571
2021-11-09 02:40:54 +00:00
Jennifer Richards bcd37edfcd Merged from session_purpose_dev
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])
 - Legacy-Id: 19570
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
2021-11-09 01:35:25 +00:00
Robert Sparks 5c28a85cf1 Merged in [19555] from jennifer@painless-security.com:
Use temporary directories instead of 'real' filesystem for tests. Fixes #3414.
 - Legacy-Id: 19561
Note: SVN reference [19555] has been migrated to Git commit 81d9234d54
2021-11-08 18:16:56 +00:00
Jennifer Richards 2b1864f5a0 Fix merge errors in preceding commits
- Legacy-Id: 19556
2021-11-08 16:35:23 +00:00