• last updated 1 hour 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.
- standardize argument passing to adp-includes, don't perform double i18n and double quoting

  1. … 124 more files in changeset.
- fix and standardize quoting in template properties

  1. … 396 more files in changeset.
- fix validty of HTML

Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).

  1. … 2547 more files in changeset.
Noquote the return URL since it is not displayed to the browser and its quoted in the form under display mode, causing a double quoting.

add option to delete users from the admin pages (acs-admin/users/one)

  1. … 2 more files in changeset.
HTML Strict cleanup: removed trailing slash of input, img, link, meta tags

  1. … 21 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.
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.
Cleaned up user admin page -- still quite crappy

  1. … 2 more files in changeset.
Fixed creation_date bug

- Cleaned up page

- Added page to reset a password, since our new framework generally doesn't allow users to change passwords without knowing the current password

  1. … 3 more files in changeset.
Changed wording of 'Become this user' to 'Login as this user'

Use new inclueable template for displaying and editing user information

  1. … 3 more files in changeset.
Prevent users from changing state for themselves, thus shutting themselves out of the system

  1. … 1 more file in changeset.
Added username to user page

  1. … 2 more files in changeset.
Merged 4.6.4d1 (unreleased) to HEAD. This marks the end of the life of the oacs-4-6 branch.

  1. … 816 more files in changeset.
- Merge "Warn if site-wide admin" fix to HEAD.

  1. … 1 more file in changeset.
noquote changes (Dirk Gomez)

  1. … 53 more files in changeset.
Merge of all changes from oacs-4-6 to HEAD. All changes up to tag jcd-merge-2

on oacs-4-6 are included.

  1. … 33 more files in changeset.
I've added Andrew Spencer's changes that allow admins to designate users

as sitewide admins.

  1. … 6 more files in changeset.
remove superfluous package local masters and use sitewide master by default

  1. … 701 more files in changeset.
move title and context bar into master.adp for acs-admin/users

  1. … 12 more files in changeset.
patch 157 applied

  1. … 2 more files in changeset.
Initial revision

  1. … 1321 more files in changeset.