Lars Eggert
|
a4daf2630c
|
Merge branch 'lars/5.6.3-facelift' into lars/5.6.4-facelift
Conflicts:
ietf/doc/templatetags/ietf_filters.py
ietf/doc/views_charter.py
ietf/templates/doc/charter/edit_notify.html
ietf/templates/doc/charter/edit_telechat_date.html
ietf/templates/doc/document_ballot_content.html
ietf/templates/doc/document_history.html
ietf/templates/doc/edit_notify.html
ietf/templates/doc/edit_telechat_date.html
ietf/templates/doc/notify.html
ietf/templates/group/concluded_groups.html
- Legacy-Id: 8429
|
2014-10-14 11:48:57 +00:00 |
|
Henrik Levkowetz
|
6e97c2c8da
|
Merged in the port from Django 1.2 to Django 1.6 from olau@iola.dk: branch/iola/djangoport@7121, and fixed some merge issues.
- Legacy-Id: 7152
|
2014-01-18 21:02:40 +00:00 |
|
Ole Laursen
|
36dd439027
|
Rewrite ifequal/endifequal template tags to if tags with ==/!=
- Legacy-Id: 6961
|
2013-12-17 10:42:34 +00:00 |
|
|
Henrik Levkowetz
|
b2096af196
|
The materials page now shows 'Session Cancelled' instead of 'No agenda received' etc. for cancelled sessions.
- Legacy-Id: 6728
|
2013-11-21 21:03:50 +00:00 |
|
|
Henrik Levkowetz
|
84a07d7151
|
Selectively removed the agenda and minutes warnings from the meeting materials page, for educational sessions where agenda and minutes aren't expected. Fixes issue #1115.
- Legacy-Id: 6078
|
2013-08-28 11:00:38 +00:00 |
|
|
Henrik Levkowetz
|
ee420423a0
|
Added a section to the meeting materials page for IAB sessions. Added a link bar at the top to make it easier to find sections like Training and IAB.
- Legacy-Id: 5636
|
2013-04-11 09:21:12 +00:00 |
|