Skip to content

Commit f2b883d

Browse files
levkowetzlevkowetz
committed
Merged in ^/trunk@17617.
 - Legacy-Id: 17618
2 parents f10ddad + e647fe4 commit f2b883d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+5606
-292025
lines changed

‎PLAN‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,13 @@ Updated: $Date$
77
Planned work in rough order
88
===========================
99

10-
* Transition to Django 2.x (depends on Python 3.x). Security updates to
11-
Django 1.11 will cease around April 2020.
10+
* Transition to Django 2.2 (via 2.0 and 2.1). This depends on Python 3.x.
11+
Security updates to Django 1.11 will cease around April 2020.
12+
13+
* Transition to PostgreSQL. This will make it easier to start using
14+
timezone-aware timestamps throughout the code, which will make it easy
15+
to present localized times on web-pages. It will also provide additional
16+
tools for performance analysis
1217

1318
* Investigate making RFCs first-class document objects to faciliate being
1419
able to model BCPs that represent groups of RFCs properly. Then fix the rfc sync
@@ -66,11 +71,6 @@ Planned work in rough order
6671
* Add support for document shepherding reports, possibly re-using or
6772
generalising some of the review plumbing. Check with IESG for details.
6873

69-
* Transition to PostgreSQL. This will make it easier to start using
70-
timezone-aware timestamps throughout the code, which will make it easy
71-
to present localized times on web-pages. It will also provide additional
72-
tools for performance analysis
73-
7474
* Performance analysis of database table and index setup
7575

7676
* Refactor Document and types into Document subclasses, with conditional code

‎changelog‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,78 @@
1+
ietfdb (6.126.0) ietf; urgency=medium
2+
3+
**Groundwork for upcoming automatic scheduling assistance**
4+
5+
* Merged in ^/branch/dash/automatic-scheduler@17395 from sasha@dashcare.nl,
6+
which adds groundwork for upcoming automatic scheduling assistance:
7+
8+
~ Added a management command to create a dummy IETF 999 meeting.
9+
10+
~ Added display of new constraints and joint sessions to agenda builder
11+
interface.
12+
13+
~ The new timerange, time_relation and wg_adjacent constraints, along with
14+
the joint_with_groups option, are now reflected in the special requests
15+
field. This allows them to be taken into account while scheduling
16+
sessions.
17+
18+
~ Clarified the wording in the session request form regarding conflicts
19+
with BOFs.
20+
21+
~ Added support for structured entry and storage of joint sessions in
22+
meetings:
23+
24+
- Also adds additional tests for the SessionForm
25+
- Fixes a javascript error in session requests for non-WG groups,
26+
that could cause incorrect form behaviour.
27+
- Expands the tests added in [17289] a bit.
28+
29+
~ Added support for the timerange, wg_adjacent and time_relation
30+
constraints. This adds three new constraints to the database and
31+
relevant UIs:
32+
33+
- timerange: "This WG can't meet during these timeframes"
34+
- wg_adjacent: "Schedule adjacent to another WG (directly following,
35+
no breaks, same room)"
36+
- time_relation: schedule the two sessions of one WG on subsequent
37+
days or with at least one day seperation
38+
39+
-- Henrik Levkowetz <henrik@levkowetz.com> 09 Apr 2020 16:25:23 +0000
40+
41+
42+
ietfdb (6.125.0) ietf; urgency=medium
43+
44+
**Various meeting-related fixes and improvements**
45+
46+
* Merged in [17590] from rcross@amsl.com:
47+
Added support for variable length meetings to secr/meetings app.
48+
49+
* Changed the handling of some exceptions during draft submission to give
50+
user feedback rather than server 500 responses, in order to deal better
51+
with severely malformed drafts.
52+
53+
* Added a workaround for the current libmagic on OpenSUSE, which quite
54+
easily can mischaracterise text/plain documents as text/x-Algol68. Fixes
55+
issues #2941 and #2956.
56+
57+
* Added validation of the session duration in interim meeting requests, with
58+
added values in settings.py for min and max duration.
59+
60+
* Clarified the standalone XML draft submission requirements, and
61+
mentioned the xml2rfc switch to use for v3 sources.
62+
63+
* Changes to accept a wider range of URLs when displaying call-in links from
64+
the Session agenda_note and remote_instructions fields.
65+
66+
* Changed some fields to raw_id_fields in the MessageAdmin, for improved
67+
admin page load times.
68+
69+
* Added 'Remote instructions' at the top of interim sesssion pages, and
70+
made the 'Meeting Details' button available to the group chairs, not only
71+
secretariat.
72+
73+
-- Henrik Levkowetz <henrik@levkowetz.com> 08 Apr 2020 16:51:46 +0000
74+
75+
176
ietfdb (6.124.0) ietf; urgency=medium
277

378
**Enhanced 'Upcoming Meetings' page, and more**

‎hold-for-merge‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# -*- conf-mode -*-
22

3+
^/personal/markd/v6.120.0.dev0@17570 # Review issues to be resolved (08 Apr 2020)
34
^/personal/mahoney/6.121.1.dev0@17473 # Test commit
45
/personal/kivinen/6.94.2.dev0@16091 # Replaced by later commit
56
/personal/rjs/6.104.1.dev0@16809 # Local changes, not for merge

‎ietf/meeting/forms.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ def clean_file(self):
339339
mime_type, encoding = validate_mime_type(file, self.mime_types)
340340
if not hasattr(self, 'file_encoding'):
341341
self.file_encoding = {}
342-
self.file_encoding[file.name] = encoding.replace('charset=','') if encoding else None
342+
self.file_encoding[file.name] = encoding or None
343343
if self.mime_types:
344344
if not file.content_type in settings.MEETING_VALID_UPLOAD_MIME_FOR_OBSERVED_MIME[mime_type]:
345345
raise ValidationError('Upload Content-Type (%s) is different from the observed mime-type (%s)' % (file.content_type, mime_type))

0 commit comments

Comments
 (0)