• last updated 7 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge from oacs-5-10

  1. … 8099 more files in changeset.
merged changes from the oacs-5-9 branch and resolved conflicts

  1. … 7834 more files in changeset.
- fix and standardize quoting in template properties

  1. … 396 more files in changeset.
Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).

  1. … 2547 more files in changeset.
Rollingback (HEAD) implementation of TIP 113 and bugfixes committed after that.

Removing this functionality was decided by OCT on April 16 2008.

Commits removed on HEAD:

http://xarg.net/tools/cvs/change-set-details?key=28264

http://xarg.net/tools/cvs/change-set-details?key=28219

http://xarg.net/tools/cvs/change-set-details?key=28218

This needs to be correctly implemented in the future.

  1. … 14 more files in changeset.
Fixing two things I forgot

  1. … 2 more files in changeset.
Introduced (from AIMS product by Quest) the KeepLocalTranslations Parameter which allows anyone to keep their local changes even if the merge function believes the local change should be overwritten. A conflict is raised in this case. Additionally made sure we cannot register a message to a non existent package_key. Also be a little bit more conservative when deleting message keys (so they can only be deleted from the main locale, otherwise only unregistered

  1. … 14 more files in changeset.
merge of all changes on oacs-5-0 branch between tag openacs-5-0-0-final and jcd-merge-pre503 (except those in lars-blogger).

  1. … 293 more files in changeset.
ul.action-links

  1. … 11 more files in changeset.
merge of changes on oacs-5-0 branch to oacs-5-0-0b4 tag

  1. … 598 more files in changeset.
file import-messages.adp was initially added on branch oacs-5-0.