• last updated 32 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
minor UI improvement

merged changes from the oacs-5-9 branch and resolved conflicts

  1. … 7834 more files in changeset.
- modernize HTML

  1. … 206 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.
- use property "doc(title)" throughout oacs-5-8 instead of "title" to get rid of warnings in error.log of the form:

Warning: /forums/message-view has no doc(title) set.

Using doc(title) is required in blank-master.tcl but was used so far only in a few packages

  1. … 337 more files in changeset.
Rollingback (OACS-5-4 Branch) 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=29129

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.
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.
making import page report errors. Making conflict page show both new and old message and offer the option of accepting new or reverting to old message

  1. … 3 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.

Adding support for I18N message catalog upgrades. Any import of

messages from catalog files that is done after the initial import is

considered an upgrade. The message import and upgrade logic is

encapsulated in the proc lang::catalog::import_messages (invoked

through lang::catalog::import).

acs-lang package

- Bumping version of package to 5.0.0b5

- Changes to datamodel:

- Adding columns deleted_p, conflict_p, and sync_time to lang_messages table.

- Removed column upgrade_status from lang_message_keys table

- Adding columns deleted_p, sync_time, conflict_p, upgrade_status to lang_messages_audit table

- Changes to lang::catalog Tcl API:

- Added proc lang::catalog::import_messages that encapsulates the logic for import and upgrade of

messages from catalog files to database.

- Changed the lang::catalog::import_from_file and lang::catalog:import procs to use the new import_messages proc.

- Added the upgrade Tcl API test cases that extensively tests through the import_messages proc with both

en_US and de_DE locales.

- Changes to lang::message Tcl API:

- Changed lang::message::register to take new switches upgrade_sync, upgrade_status, and conlfict. Cleaned up the

proc a little and made it construct SQL dynamically.

- Added procs delete, get, and get_element.

- Added the edit proc that is used when editing attributes of a message other than the message text itself. This

proc will not create a new message revision. It is invoked for example by the delete proc.

- Added the count_conflicts proc.

- Changes to admin UI

- New canonical pages for import/export of catalog files that check for site-wide-admin priv

- Made the message delete page use appropriate Tcl API

- Added the message-conflicts page that shows conflicting messages. Linking to this page from

index page, locale-, and package index pages.

acs-admin package

- Removed the import/export messages pages and using the ones in acs-lang package instead.

  1. … 44 more files in changeset.