datatracker/ready-for-merge
Henrik Levkowetz fb66c1856f Merged in [9669] from olau@iola.dk:
Summary: Make the meeting agenda code use the historic info available
for groups. In the process, added some select_related/prefetch_related
code to cut the number of database queries in the agenda down from
4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays
rather than a template for improved readability/reuse. Rewritten week
view to assemble its data in Python. Plus a few other minor cleanups,
e.g. lame_description is now gone.
Fixes #1088. Branch
 - Legacy-Id: 10005
Note: SVN reference [9669] has been migrated to Git commit acda84208d
2015-08-10 19:46:11 +00:00

39 lines
1.4 KiB
Plaintext

# By saying 'Commit ready for merge' in the commit message when you commit a
# change to your branch, the commit will be included in the merge list for the
# next release. However, if a commit for some reason haven't is missing that
# phrase in the commit comment, the branch and revision of the changeset can
# be added to this file in trunk/ by the merge master, and it will also be
# included in the merge list.
# --- Add entries at the top ---
branch/iola/meeting-history-r9663 @ 9669
branch/iola/milestone-editing-bugfix-r9994 @ 9996
#personal/rjs/v6.0.2.dev0@9540:9542
#personal/lars/6.0.2.dev0@9526
personal/lars/6.0.2.dev0@9525
personal/lars/6.0.2.dev0@9524
personal/willem/v5.12.4.dev0@9316
branch/iola/facelift-r8876@8970 Test crawler speed-up
branch/iola/facelift-r8510@8733
personal/rcross/v5.7.3-dev0@8641
personal/suresh/v5.7.3-dev0@8602
personal/rjs/v5.6.3-dev0-session@8305
personal/rcross/v5.6.2-dev0@8216
branch/iola/people-cleanup@8297
branch/iola/team-support@8057
personal/fanpeng/v5.5.3-dev0@8005
branch/iola/team-support@7914
personal/rjs/v5.4.0@7644
branch/iola/djangoport-fixes@7416
branch/iola/djangoport-fixes@7421
branch/iola/djangoport-fixes@7519
personal/rcross/v5.1.0@7568
personal/rcross/v5.1.0@7549 Fix tests broken in auth change
personal/rcross/v5.1.0@7454
personal/rjs/v5.1.0-dajaxice-patch@7456
personal/rcross/v5.0.2@7398
personal/rcross/v5.0.2@7378
personal/jmh/v5.0.2@7375
personal/rjs/v4.90@7138 Was waiting for additional tests