• last updated 17 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Resolves conflicts, merging from HEAD to oacs-5-1

  1. … 3 more files in changeset.
Merge HEAD to the 5.1 branch.

  1. … 38 more files in changeset.
Updated project-manager to 1.04b1: fixes bug #1796.

  1. … 3 more files in changeset.
Removed overquoting from context bar.

Sorting on one.tcl page now sorts by first name, last name as a secondary sort.

Move comments on project view page to left column.

Removed overquoting from title

Sort assignees by first name, last name, after the deadline

If a task is assigned to multiple people, now uses the group templating tag to group them together

Improve appearance of task print page

Fix for bug 1828: link to print page for a task fails

Project manager 1.03: now allows you to edit the project for a task. Lots of

other minor bug-fixes and UI improvements. No major datamodel changes, but

there is an upgrade script run to allow you to change projects for a task.

    • -29
    • +30
    ./task-assign-add-edit-postgresql.xql
  1. … 5 more files in changeset.
Changed permissions to delete process tasks. Now required write permissions instead of delete permissions

Fixed display of title when making comments on projects

Hide unused dependency types in process task creation page. Also now correctly brings in description from processes.

Untested fix for bug where unsetting the variable bombed when the variable wasn't set in the first place

Fix a bug in the URL that is displayed in the emails

Minor UI improvements, fix to link in email messages.

Fixes a bug that occured while editing log entries.

Added a link to add tasks in the navbar

Added in filter for task roles

New task select page makes it easier to select the project

    • -5
    • +15
    ./task-select-project-postgresql.xql
Slight improvement to tasks page. Searching searches all users' tasks

Moved notifications to a separate proc. cc_users to acs_users_all

  1. … 1 more file in changeset.
Fix for bug 1787: fixes table name in admin query. Patch by Randy

O'Meara (Patch 509)

    • -1
    • +1
    ./admin/default-project-roles-postgresql.xql
Move task revisions to a separate page.

    • -0
    • +41
    ./task-revisions-postgresql.xql
    • -0
    • +98
    ./task-revisions.tcl
Fixes a potential serious bug that could occur when editing several

tasks at once. Occasionally, the tasks would trade item_ids!

  1. … 1 more file in changeset.
Improved the interface for editing tasks: you can now add a comment at

the same time as you edit a task. I backported the util::word_diff

proc to project manager. I use it to show the difference between old

and new descriptions of tasks. I'll also use it to show differences on

the revisions of tasks (not done yet). I backported it so that

project-manager won't require acs-kernel 5.2; later, we'll move to the

correct util::word_diff. There are certainly a few bugs in how

descriptions are displayed: I haven't got the mime-type settings right

yet, but it's close. The email notifications that go out are much more

informative now.

  1. … 1 more file in changeset.
Put comments in separate header.

Version 1.0 of project-manager. Numerous improvements and bug-fixes.

  1. … 39 more files in changeset.
merge all the changes on the oacs-5-1 and dotlrn-2-0 branches up to tag jcd-merge-20040420

    • -5
    • +12
    ./process-task-assign-add-edit-postgresql.xql
    • -5
    • +12
    ./task-assign-add-edit-postgresql.xql
  1. … 643 more files in changeset.
Fixed a problem with invalid date insertion.