• last updated 18 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merged changes from the oacs-5-9 branch and resolved conflicts

  1. … 7834 more files in changeset.
Bumping up core packages version to 5.10.0d1

  1. … 24 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.
Bumping up version numbers to 5.9.0d1 for core packages on HEAD.

  1. … 24 more files in changeset.
Merged oacs-5-7 to HEAD

  1. … 167 more files in changeset.
Bumping up version numbers for core packages to 5.8.0d1

  1. … 24 more files in changeset.
Bumped version numbers to 5.6.0d1

  1. … 23 more files in changeset.
Merged oacs-5-6 to HEAD. HEAD now installs and passes all core tests. There

may still be some lingering problems due to my screwing up the oacs-5-6

branch earlier, I'll be looking into this later.

  1. … 214 more files in changeset.
Implements TIP#137 Support for 3-chars language codes

  1. … 15 more files in changeset.
Merged info files from 5.5.0

  1. … 22 more files in changeset.
Bumped HEAD to 5.6.0d1.

  1. … 22 more files in changeset.
Bumped version numbers

  1. … 22 more files in changeset.
Bumped versions numbers to 5.5.0d1

  1. … 20 more files in changeset.
Merged from 5.4.2

  1. … 283 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.
Merged 5.3 to HEAD

  1. … 60 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.
Merged the 5.3 branch with HEAD. Look for tags with the pattern

drb-*-20070513

  1. … 324 more files in changeset.
First round of oacs-5-3 merge to HEAD commits

  1. … 96 more files in changeset.
adding locales, currently used in the development of accounting packages (from sql-ledger locales)

  1. … 4 more files in changeset.
Bumped the acs-core world (including catalog files) to 5.3.0d1.

  1. … 218 more files in changeset.
Merged acs-core oacs-5-2 (currently 5.2.3) -> HEAD.

TODO:

1. Bump acs-core package version numbers to 5.3.0d1

2. Would be nice to do a test install, wouldn't it?

  1. … 721 more files in changeset.
Added requirement for acs-translations due to new I18N procedure (not utterly necessary, as you could always provide a different package key and you do not need the package per se, just when you want to export your message keys, but I think it is still better this way)

commit to HEAD of merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20040724 and jcd-merge-5-1-20050111

  1. … 2275 more files in changeset.
merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20040628 and jcd-merge-5-1-20040712 to HEAD

  1. … 116 more files in changeset.
merge of changes on oacs-5-1 branch between tags jcd-merge-5-1-20040517 and jcd-merge-5-1-20040628 to HEAD

  1. … 687 more files in changeset.
merge changes on oacs-5-1 branch to head, changes between jcd-merge-20040420 and jcd-merge-5-1-20040517 were merged, head pre changes is jcd-merge-pre-20040517 and post is jcd-merge-post-20040517

  1. … 834 more files in changeset.
added maturity and license info

  1. … 15 more files in changeset.
merge all the changes on the oacs-5-1 and dotlrn-2-0 branches up to tag jcd-merge-20040420

  1. … 647 more files in changeset.
merge the changes between 5.0.3 and 5.0.4 to head

  1. … 249 more files in changeset.