Permalink
Commits on Apr 5, 2012
  1. Merged Gautam's changes

    committed Apr 5, 2012
  2. Merging Jon's hours app

    committed Apr 5, 2012
Commits on Apr 3, 2012
  1. Completed a working solution for dynamically changing the article sea…

    …rch form action.
    Gautam committed Apr 3, 2012
Commits on Apr 2, 2012
  1. After merge with DW branch

    committed Apr 2, 2012
  2. Merge branch 'dw-app-dev' of github.com:jermnelson/FRBR-Redis-Datasto…

    …re into jpn-app-dev
    
    Conflicts:
    	aristotle/settings.py
    	aristotle/urls.py
    committed Apr 2, 2012
  3. Renamed media dirs to assets dirs, modified app-base to use Bootstrap…

    … responsive and fluid classes, started working on portfolio app
    committed Apr 2, 2012
Commits on Mar 30, 2012
  1. Created new apps Book Search App and Article Search App and copied te…

    …mplates into them.
    Gautam committed Mar 30, 2012
Commits on Mar 29, 2012
Commits on Mar 28, 2012
  1. Continued working on book and journal search apps from within the Pol…

    …icies app.
    Gautam committed Mar 28, 2012
  2. Continued work on search box mock-ups.

    Gautam committed Mar 28, 2012
Commits on Mar 26, 2012
Commits on Mar 15, 2012
Commits on Mar 13, 2012
Commits on Mar 12, 2012
Commits on Mar 9, 2012
  1. Continued development of database app

    dwesterfield committed Mar 9, 2012
  2. Continued development of Policies App

    Gautam committed Mar 9, 2012
  3. Continued development of Hours app

    jdriscoll committed Mar 9, 2012
  4. On branch dw-app-dev

    Changes to be committed:
    (use "git reset HEAD <file>..." to unstage)
    new file:   aristotle/apps/database/__init__.py
    new file:   aristotle/apps/database/models.py
    new file:   aristotle/apps/database/tests.py
    new file:   aristotle/apps/database/urls.py
    new file:   aristotle/apps/database/views.py
    new file:   aristotle/apps/test/urls.py
    new file:   aristotle/templates/database/app.html
    new file:   aristotle/templates/test/app.html
    new file:   aristotle/templates/test/default.html
    modified:   aristotle/apps/test/views.py
    modified:   aristotle/urls.py
    dwesterfield committed Mar 9, 2012
Commits on Mar 2, 2012
  1. Added new Hours app

    jdriscoll committed Mar 2, 2012
  2. Added new Policies App

    Gautam committed Mar 2, 2012
  3. Add Test app

    dwesterfield committed Mar 2, 2012
  4. Added new Budget App

    committed Mar 2, 2012
Commits on Feb 29, 2012
Commits on Feb 28, 2012