Permalink
Commits on Mar 14, 2012
  1. Merge pull request #50 from kabirkukreti/master

    gnowgi committed Mar 14, 2012
    Models file updated with fields for content_org, nbh fields.  similar model.py for gbobjects.
  2. Models files have been updated to add an org field to store org test,…

    Kabir Kukreti committed Mar 14, 2012
    … Gbojects have been added as one of the options in Gstudio app
Commits on Mar 11, 2012
  1. Merge pull request #49 from johnsonc/master

    gnowgi committed Mar 11, 2012
    Graph changes and prior/post nodes addition to templates and graph
Commits on Mar 10, 2012
Commits on Mar 9, 2012
  1. Merge pull request #48 from kabirkukreti/master

    gnowgi committed Mar 9, 2012
    Model file bug fixed and Graphs updated in objectapp
  2. Gnobject added to gstudio model.Changes in graphs also applies to obj…

    Kabir Kukreti committed Mar 9, 2012
    …ectapp
  3. Merge pull request #47 from kabirkukreti/master

    gnowgi committed Mar 9, 2012
    Skeleton file merged
  4. Skeleton file with improvements in graph merged

    Kabir Kukreti committed Mar 9, 2012
  5. Merge pull request #46 from kabirkukreti/master

    gnowgi committed Mar 9, 2012
    Reversion bug fixed and Graph code made generic
  6. Merge remote branch 'gnowgi/master'

    Kabir Kukreti committed Mar 9, 2012
  7. New code with corrections related to reversion merged.Graph function …

    Kabir Kukreti committed Mar 9, 2012
    …made more generic
  8. Merge pull request #45 from anujag/master

    gnowgi committed Mar 9, 2012
    changed models
  9. test commit

    johnsonc committed Mar 9, 2012
  10. changed gstudio and objectapp models.py

    Anuja committed Mar 9, 2012
Commits on Mar 7, 2012
  1. Merge pull request #44 from kabirkukreti/master

    gnowgi committed Mar 7, 2012
    Bugs in registration and data addition forms corrected and form fields reordered
  2. Form fields have been reordered to make data entry easy

    Kabir Kukreti committed Mar 7, 2012
Commits on Mar 5, 2012
  1. Inheritance bug in registration forms corrected.Non authenicated acce…

    Kabir Kukreti committed Mar 5, 2012
    …ss bug in data addition forms corrected
Commits on Mar 2, 2012
  1. Merge pull request #42 from kabirkukreti/master

    gnowgi committed Mar 2, 2012
    Code merging done
  2. Graphs intgrated with main template.RSS feeds also added.Forms modifi…

    Kabir Kukreti committed Mar 2, 2012
    …ed with datepicker widget.Timepicker will be done in future
Commits on Feb 21, 2012
  1. Merge pull request #41 from kabirkukreti/master

    gnowgi committed Feb 21, 2012
    Forms created for object nodes as well. complements, intersections and unions as well.
Commits on Feb 20, 2012
  1. Forms added for objectapp and for creating complements,intersections …

    Kabir Kukreti committed Feb 20, 2012
    …and unions.Dashboard updated to include these new forms
Commits on Feb 18, 2012
  1. Merge pull request #40 from kabirkukreti/master

    gnowgi committed Feb 18, 2012
    Custom dashboard
  2. Custom dashboard with links to forms added, User account management b…

    Kabir Kukreti committed Feb 18, 2012
    …y django registration enabled (instead of admin interface)
Commits on Feb 9, 2012
  1. Merge pull request #39 from anujag/master

    gnowgi committed Feb 9, 2012
    Changed objectapp templates
  2. modified object app templates

    Anuja committed Feb 9, 2012
Commits on Jan 23, 2012
  1. Merge pull request #38 from kabirkukreti/master

    gnowgi committed Jan 23, 2012
    Johnson's d3.js graph code Integrated, basic validation for forms
  2. Basic validation done on forms

    Kabir Kukreti committed Jan 23, 2012
  3. Conflicts with Johnson's branch fixed

    Kabir Kukreti committed Jan 23, 2012
    Merge remote branch 'johnson/master'
    
    Conflicts:
    	demo/demo.db
    	gstudio/urls/__init__.py
Commits on Jan 13, 2012
  1. Merge pull request #36 from kabirkukreti/master

    gnowgi committed Jan 13, 2012
    Filter bug fixed
  2. There was a bug in the filter (it was not working for multiple values)

    Kabir Kukreti committed Jan 13, 2012
    The bug has been fixed
  3. Merge pull request #35 from kabirkukreti/master

    gnowgi committed Jan 13, 2012
    Attribute form added
Commits on Jan 9, 2012
  1. Merge pull request #34 from kabirkukreti/master

    gnowgi committed Jan 9, 2012
    the first version of a selection dependent filter for adding attributes using ajax.