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

    • -77
    • +100
    ./acs-kernel.en_US.ISO-8859-1.xml
  1. … 7834 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.
Added attributes for "user" columns "screen_name" and "username", as well as the

new "bio" column which replaces the old generic storage attribute assigned to

"person".

  1. … 4 more files in changeset.
Remove some package versions in catalog files.

  1. … 4 more files in changeset.
Removed version info from catalog file code as was TIP'd ages ago, which

will make merging much easier in the future. I had en_US and de_DE installed

so the catalogs for these languages in core have been exported and don't

have version numbers. The rest of the packages and locales for core and

dotlrn will be exported from the translation server as part of our release

process and will get fixed up then.

  1. … 17 more files in changeset.
changeing message key acs-kernel.common_no to acs-kernel.common_No (since the label is No as well), adding a new message key acs-kernel.common_no (with lower case "no")

  1. … 51 more files in changeset.
fix typo in message catalog: common_lastt -> common_last

  1. … 9 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.
Fix for deadlock condition (or so Gustav and I hope)

  1. … 2 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 another missing message key

added missing message key

yet even more I18N fixes..

  1. … 3 more files in changeset.
Added message keys

  1. … 34 more files in changeset.
More common terms

Forgot the catalog file

  1. … 1 more file in changeset.
adds missing key for common_Submit

add an Actions common key

add a common key: Permissions

add a details common key

fix missing rdbms things and a few oracle or postgresisms that snuck in the wrong files

  1. … 57 more files in changeset.
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-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

    • -39
    • +38
    ./acs-kernel.en_US.ISO-8859-1.xml
  1. … 834 more files in changeset.
merge changes on 5.1 for common keys

    • -34
    • +74
    ./acs-kernel.en_US.ISO-8859-1.xml
merge the changes between 5.0.3 and 5.0.4 to head

  1. … 249 more files in changeset.
added new keys

  1. … 291 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.
Added acs-kernel.common_Administration message key