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
Update docker/README.md to reflect the merge of Lars' branch.
- Legacy-Id: 19599
Note: SVN reference [19579] has been migrated to Git commit 8c830e10e1
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
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
Separating the relateddocument query results in python when building the document main page is slightly faster
- Legacy-Id: 19564
Note: SVN reference [19554] has been migrated to Git commit 3dc41033c7
