datatracker/ready-for-merge
Henrik Levkowetz 8b8a282730 Merged in [8229] from rjsparks@nostrum.com, with minor tweaks:
From mcr@sandelman.ca:
    Refactor to remove dajaxice.
    Modified the URLs that address schedules:
      - urls now always start with /agenda, removing the mix of /agenda and /schedule prefixes
      - urls to a given schedule include the schedule owner (by email address)
    Corrected issue that prevented deleting sessions.
    Changed comment mechanism in timeslot_edit.js
    Migration to change the email address for (System)
  Fixes bug #1426
 - Legacy-Id: 8319
Note: SVN reference [8229] has been migrated to Git commit fc512680d8
2014-09-18 20:27:28 +00:00

26 lines
993 B
Plaintext

# By saying '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/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