Permalink
Commits on Oct 8, 2013
  1. Merge pull request #59 from kluther/Jackson_Dev

    Updating README and fixing EOL handling for upload utility.
    jgonzales8 committed Oct 8, 2013
Commits on Oct 7, 2013
Commits on Oct 3, 2013
  1. Updated README

    jaxoncreed committed Oct 3, 2013
Commits on May 6, 2013
  1. Merge pull request #53 from kluther/Joe_Development

    Including Trusted members in chat
    jgonzales8 committed May 6, 2013
  2. Including Trusted members in chat

    A trusted user is not considered a member, so need to include a check
    for trusted members before showing the chat window.
    jgonzales8 committed May 6, 2013
  3. Merge pull request #52 from kluther/Joe_Development

    Fix SQL typo
    jgonzales8 committed May 6, 2013
  4. Fix SQL typo

    Fixing typo in user table (from heatbeat to heartbeat). Also adding
    support for Project Creators to see the chat room for a project.
    jgonzales8 committed May 6, 2013
  5. Merge pull request #51 from kluther/Joe_Development

    Adding chat room functionality at the project level
    jgonzales8 committed May 6, 2013
  6. Adding chat room functionality at the project level

    This update will allow each project to host one chat room at the project
    level.
    jgonzales8 committed May 6, 2013
Commits on Apr 19, 2013
  1. Close Tasks Change

    Close tasks are not allowed to join, comment on or contribute. A
    variable $openTask is created as a flag.
    chloeclalad committed Apr 19, 2013
Commits on Apr 18, 2013
  1. Merge pull request #46 from hughbragg/master

    Fix exception when fileinfo isn't avaliable
    jgonzales8 committed Apr 18, 2013
Commits on Apr 5, 2013
  1. class terminating bracket missing

    Hugh Bragg committed Apr 5, 2013
  2. Graceful degradation for mime type determination

    Hugh Bragg committed Apr 5, 2013
Commits on Mar 28, 2013
  1. Merge pull request #45 from kluther/Joe_Development

    Updating README
    jgonzales8 committed Mar 28, 2013
  2. Updating README

    Updating README with instructions on how to validate file upload dll is
    present
    jgonzales8 committed Mar 28, 2013
Commits on Mar 26, 2013
  1. Merge pull request #43 from kluther/joe

    Fix Issue #42
    jgonzales8 committed Mar 26, 2013
  2. Fix Issue #42

    Fixes a syntax error (extra comma) in database.sql
    jgonzales8 committed Mar 26, 2013
  3. Merge pull request #41 from kluther/Joe

    Extending the "Join Task" Button
    jgonzales8 committed Mar 26, 2013
Commits on Mar 15, 2013
  1. Adding new sections to the Task page

    This update will add two new sections to the "Task" page:
    
    1) "Unclaimed Tasks" - These are all the open tasks that would normally
    show in the "More Tasks" section, that have 0 participants signed up for
    the task. If you are the leader of a task but there are 0 participants,
    the task will not show in this section (it will continue to show in the
    "Your Tasks" section)
    
    2)"Closed Tasks" - All of the closed tasks for a project will show in
    this section.
    
    ==================================================
    Change to existing behavior (1 change):
    
    1) Closed tasks will no longer show in the "More Tasks" section. They
    will now show in the "Closed Tasks" section
    jgonzales8 committed Mar 15, 2013
Commits on Mar 11, 2013
  1. Extending the "Join Task" Button

    For some projects where only one user is needed to perform a task, the
    wording "Claim" can be more intuitive than "Join Task". This change
    checks to see whether the number of accepted people on a task is equal
    to zero, while the number of needed people is equal to one. If this is
    the case, then the text on the Join Task button will be "Claim".
    
    For all other cases, the wording on the task will be "Join Task"
    jgonzales8 committed Mar 11, 2013
  2. Merge pull request #40 from kluther/Joe

    Admin Upload CSVs
    committed Mar 11, 2013
Commits on Mar 6, 2013
  1. Admin Upload CSVs

    This development log will add the ability for the administrator of a
    Pipeline to upload a CSV of task files into a project.
    jgonzales8 committed Mar 6, 2013
Commits on Jan 21, 2013
Commits on Jan 16, 2013
  1. Adding Username Filter in filter class

    To shot the problem of assigning a task leader whose username has a
    hyphen, and to avoid any possible damage to the existing filter
    (alphanum). A username filter is added, and task.process and
    register.process are changed accordingly.
    chloeclalad committed Jan 16, 2013
Commits on Jan 14, 2013
  1. Adding username filter in filter class

    To fix the bug of usernames with hyphen, a username filter is created.
    Incorrect use of filter in task.process.php was fixed.
    Register.process.php is aligned with the new change. Other files
    concerning with username have functioning AJAX auto matching, which are
    not changed.
    chloeclalad committed Jan 14, 2013
Commits on Dec 5, 2012
  1. Merge pull request #39 from kluther/Joe

    Fix for private projects
    committed Dec 5, 2012
Commits on Nov 30, 2012
  1. Fix for private projects

    Fixes #38
    jgonzales8 committed Nov 30, 2012
Commits on Nov 29, 2012
  1. Update model/classes/filter.class.php

    The original filter class filters out "-", and replace it with "".
    chloeclalad committed Nov 29, 2012
  2. Revert "Update model/classes/filter.class.php"

    This reverts commit af81ae4.
    chloeclalad committed Nov 29, 2012
  3. Update model/classes/filter.class.php

    The original filter class filters out "-", and replace it with "".
    chloeclalad committed Nov 29, 2012
Commits on Nov 13, 2012
  1. Merge pull request #36 from jcutrell/master

    Added the interest table to the sql file
    committed Nov 13, 2012
Commits on Nov 9, 2012
Commits on Nov 7, 2012
  1. Merge pull request #35 from kluther/Joe

    Add video file type support MP4/3GP + README update
    committed Nov 7, 2012
  2. Add video file type support MP4/3GP + README update

    Adding in the ability to upload MP4 videos and 3GP video formats. Also
    adding Joe Gonzales to the README.txt
    jgonzales8 committed Nov 7, 2012