• last updated 23 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed a few more merge problems

    • -2
    • +2
    ./packages/lars-blogger/lars-blogger.info
    • -1
    • +2
    ./packages/lars-blogger/www/entry-chunk.tcl
    • -72
    • +69
    ./packages/lars-blogger/www/index.adp
Merged in changes from openacs-5-0-0-final to jcd-merge-pre503

    • -9
    • +11
    ./packages/lars-blogger/lars-blogger.info
    • -1
    • +8
    ./packages/lars-blogger/tcl/entry-procs.tcl
    • -4
    • +8
    ./packages/lars-blogger/tcl/rss-procs.tcl
    • -0
    • +2
    ./packages/lars-blogger/www/blog-oracle.xql
    • -16
    • +34
    ./packages/lars-blogger/www/blog.tcl
  1. … 4 more files in changeset.
Cleaned up user experience, added user-messages in many places

    • -10
    • +0
    ./packages/logger/tcl/project-procs-oracle.xql
    • -1
    • +2
    ./packages/logger/tcl/project-procs.tcl
    • -0
    • +15
    ./packages/logger/tcl/project-procs.xql
    • -2
    • +2
    ./packages/logger/www/project-select.tcl
    • -0
    • +10
    ./packages/logger/www/admin/project.adp
    • -5
    • +12
    ./packages/logger/www/admin/project.tcl
Fixed critical bug #1569 so that week queries don't bomb out if

there are category items.

Display message when no projects exist in this instance

Fixed context bar -- bm_context_bar_args is a really weird proc

    • -0
    • +1
    ./packages/bookmarks/www/bookmark-add-one.adp
    • -6
    • +2
    ./packages/bookmarks/www/bookmark-add-one.tcl
Use ad_return_url

    • -1
    • +1
    ./packages/lars-blogger/www/entry-chunk.tcl
action-links

Removed bgcolor, textcolor parameters; no longer user

    • -2
    • +0
    ./packages/acs-subsite/acs-subsite.info
Confirmation message on changing password

Latest version

Moved context-bar to site-master

    • -100
    • +73
    ./packages/acs-subsite/www/group-master.adp
    • -9
    • +0
    ./packages/acs-subsite/www/group-master.tcl
Default send_p variable

Added multirow unset operation

    • -2
    • +11
    ./packages/acs-templating/tcl/query-procs.tcl
Moved javascript to core.js

    • -3
    • +3
    ./packages/acs-templating/tcl/list-procs.tcl
Added @see to get_elements proc

    • -1
    • +2
    ./packages/acs-templating/tcl/form-procs.tcl
Moved configuration form style CSS here

Cleaned up, moved Javascript to core.js

    • -207
    • +160
    ./packages/acs-templating/resources/lists/table.adp
removing obsolete join with cr_item_rels that was causing objects to get duplicated in the map XML

    • -3
    • +2
    ./packages/simulation/tcl/object-procs.tcl
Added Internationalization to the package.

  1. … 3 more files in changeset.
file users-selection.de_DE.ISO-8859-1.xml was initially added on branch oacs-5-0.

file users-selection.en_US.ISO-8859-1.xml was initially added on branch oacs-5-0.

the version 1.14 change to package_instantiate_object proc would break this page because form didn't contain the rel_id column. Adding rel_id to form.

adjusted docs after merge

    • -1
    • +1
    ./packages/acs-core-docs/www/acs-admin.html
    • -9
    • +17
    ./packages/acs-core-docs/www/aolserver.html
    • -2
    • +2
    ./packages/acs-core-docs/www/aolserver4.html
    • -1
    • +1
    ./packages/acs-core-docs/www/ch10s06.html
    • -2
    • +2
    ./packages/acs-core-docs/www/credits.html
    • -1
    • +1
    ./packages/acs-core-docs/www/cvs-tips.html
    • -0
    • +0
    ./packages/acs-core-docs/www/db-api.html
  1. … 70 more files in changeset.
the group new.tcl page broke because of the change in version 1.14 to package_instantiate_object proc. Fix is to not pass in a form_id to relation_add proc

    • -2
    • +2
    ./packages/acs-subsite/www/admin/groups/new.tcl
added a hint on howe to use the repository.

Indentation, if false

Wrong syntax for optional

context_bar -> context

Class button

    • -1
    • +1
    ./contrib/packages/events/www/index.adp
    • -1
    • +1
    ./contrib/packages/events/www/admin/event.adp