• last updated 19 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge with missing files

  1. … 1460 more files in changeset.
merge from oacs-5-10

  1. … 8085 more files in changeset.
whitespace changes

Whitespace changes

  1. … 1 more file in changeset.
Localize notification subscribers and bump version number

  1. … 4 more files in changeset.
allow passing of pretty_names that contain content including less and greater sign

  1. … 2 more files in changeset.
Undeprecate and reimplement: require_admin_request, can_admin_request_p, require_notify_object and can_notify_object_p. Fixes in two templates (request-delete, request-change-frequency). (Many thanks to Felix Mödritscher for the patch!)

  1. … 2 more files in changeset.
Port a few downstream modifications to the main codebase

When changing notification frequency, show also name and creation date for the object

Driver is making easier to merge this script

Trim whitespace

Fix proc and contract doc elements, so they are properly parsed by apidoc::api_*_documentation.

- @cvs_id -> @cvs-id

- @version -> @cvs-id

- @creation_date -> @creation-date

- @date -> @creation-date

- Different variations of $Id$

- Remove wrong @param entry

- Fix typos

  1. … 368 more files in changeset.
Prefer 'person::name' to 'acs_user::get_element ... -name'

  1. … 8 more files in changeset.
Prefer again 'person::name', as the proc has been reimplemented using 'person::get_person_info', which uses the new 'person_info_cache' cache.

  1. … 13 more files in changeset.
Whitespace changes

  1. … 11 more files in changeset.
Prefer 'acs_user::get_element ...' to 'person::name ...', in cases when 'person' is a user, as it doesn't rely on util_memoize_cache.

  1. … 13 more files in changeset.
Remove unnecessary join, as users are always persons and unnecessary stored procedure in order_by as we compute this in the column already

Remove divergency between oracle and postgres, bring all sql inline

    • -17
    • +0
    ./request-change-frequency-oracle.xql
    • -17
    • +0
    ./request-change-frequency-postgresql.xql
fix adp expressions

  1. … 2 more files in changeset.
Replace deprecated procs with 'permission::require_permission'

  1. … 1 more file in changeset.
Use api to avoid join

As username variable is not used, don't rely on side effects to check for user existance. Indentation changes.

Fix typos

  1. … 1 more file in changeset.
fix invalid meta-data

    • -1
    • +1
    ./request-unsubscribe-notification.tcl
merged changes from the oacs-5-9 branch and resolved conflicts

    • -1
    • +1
    ./request-unsubscribe-notification.adp
    • -1
    • +6
    ./request-unsubscribe-notification.tcl
  1. … 7820 more files in changeset.
- fix and standardize quoting in template properties

    • -2
    • +2
    ./request-unsubscribe-notification.adp
  1. … 39 more files in changeset.
- fix unsubscription message in german

- ensure html-encoding

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

    • -1
    • +1
    ./request-unsubscribe-notification.adp
    • -3
    • +3
    ./request-unsubscribe-notification.tcl
  1. … 2533 more files in changeset.
Update documentation

Merged 5.5.1 to HEAD

  1. … 176 more files in changeset.
Non-info file merge results, with conflicts fixed

  1. … 726 more files in changeset.
Abort ADP so we don't get an error message after returning the error message.