• last updated 3 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
merge from oacs-5-10

  1. … 8099 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.
- 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.
Use new inclueable template for displaying and editing user information

  1. … 3 more files in changeset.
Added username to user page

  1. … 2 more files in changeset.
merge of 4.6.3b1 to HEAD

  1. … 101 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.
merge from oacs-4-6

  1. … 110 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.
query was displaying all objects anyone had read permission on.

Merged with the 4.5 branch (oacs-4-5 tag "don-merge-1")

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

  1. … 2 more files in changeset.
*** empty log message ***

  1. … 1 more file in changeset.

More porting changes ...

  1. … 13 more files in changeset.

Fixed extractor and re-ran it, causing some file shuffling.

  1. … 11 more files in changeset.

Removed more of the "default '' not null" kludge.

  1. … 18 more files in changeset.

1. Fixed apm_load_queries. Again? Yes, again. I fixed it real good this

time.

2. Added .xql files for acs-admin. APM .xql files have mostly but not

completely been ported. It sort of works though, cool!

1. Fixed apm_load_queries. Again? Yes, again. I fixed it real good this

time.

2. Added .xql files for acs-admin. APM .xql files have mostly but not

completely been ported. It sort of works though, cool!

  1. … 60 more files in changeset.