summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-06-19Merge pull request #59 from kabirkukreti/mastergnowgi4-14/+6
404 errors fixed and defective fixture removed
2012-06-19Merge branch 'master' of https://github.com/gnowgi/gnowsys-studioKabir2-8/+9
2012-06-19404 errors removed.Faulty fixture also removedKabir4-14/+6
2012-06-19Merge pull request #58 from anujag/mastergnowgi2-8/+9
modified models.py files for fixing the prior and post nodes symmetrical addition.
2012-06-19modified models.py in both apps for symmetrical many-to-many relationshipsanuja2-8/+9
2012-06-16Merge pull request #57 from Dhiru/mastergnowgi15-35/+502
home pages, search and rss feed in header, and cleaned up the third column in the template.
2012-06-16cleaned up the interface, search and rss feeds in the header, home page, ↵Dhiru15-35/+502
third column removed, versions as a series of '+' marks below the title.
2012-06-15Merge pull request #56 from supriyasawant/mastergnowgi34-10137/+137
save & wrap working in the gnowmacs text editor
2012-06-15wrap added to gnowmacs & save button is workingsupriya34-10137/+137
2012-06-11Merge pull request #55 from supriyasawant/mastergnowgi2270-5/+175282
Gnowmacs editor added to gnowsys-studio, currently works only on chromium browser.
2012-06-11Gnowmacs editor added to gnowsys-studiosupriya2270-5/+175282
2012-06-11Merge branch 'master' of github.com:gnowgi/gnowsys-studioNagarjuna G28-71/+331
2012-06-10Merge pull request #54 from anujag/mastergnowgi28-71/+331
Attribute admin classes changed for dynamic add/change
2012-06-11Modified Attribute datatype admin classes for dynamically add/change attributesAnuja28-71/+331
2012-06-10Sync-related methods for GbobjectsNikita Karetnikov2-56/+17
2012-06-10Client-side code for Gbobjects-related synchroniztionNikita Karetnikov1-0/+71
2012-06-07Merge pull request #53 from sruthirajagopal/mastergnowgi19-885/+139
naming conventions changed, added arguments, url of rss feeds, default path
2012-06-07Init.py functions made convention compliant.Metaweblog functions take input ↵Neha shah19-885/+139
at list.URLs in demo changed to default django-xmlrpc.Bug in Rss feed fixed.setup.py bug fixed
2012-06-06Merge pull request #43 from amitaarunsingh/mastergnowgi7-2/+938
dump all data as rdf, submit rdf into 4store.
2012-06-06dump_all_rdf.py dumps the rdf of all the objects in one file and ↵amita singh27-259/+2036
fstore_rdf_import imports the rdf to the 4store
2012-06-06dump_all_rdf.py generates the rdf for all objects in one file and ↵amita singh2-2/+204
4store_rdf_import.pytransfers all the rdf into 4store
2012-06-05Merge pull request #52 from shefalishetty/mastergnowgi4-124/+366
values bug fixed and Conl+click merges and collapses
2012-06-05collapsing done with ctrl+click eventshefali shetty3-9/+15
2012-06-05Merge remote branch 'gn/master'shefali shetty23-134/+1483
2012-06-05collapsing done with Ctrl+click eventshefali shetty46-5359/+3779
2012-06-02Merge pull request #51 from kabirkukreti/mastergnowgi1-2/+3
Dependencies added in setup.py
2012-06-02Depedencies for diff-match-patch library,django and PIL added in setupKabir Kukreti1-2/+3
2012-06-01Merge pull request #50 from sruthirajagopal/mastergnowgi21-130/+1477
Get methods and Set methods updated in XMLRPC. gnowql functions.
2012-06-01Get and Set methods updated in XMLRPCNeha shah8-6/+11
2012-06-01Merge branch 'master' of https://github.com/gnowgi/gnowsys-studioNeha shah4-6/+7
2012-06-01minor change in the README.rst, restored to Arun's mergeNagarjuna G1-4/+4
2012-06-01Revert "Small error in get_graph_json in models file corrected"Nagarjuna G1-1/+1
This reverts commit e43d13d7c65fb15f61911a9e0bdec410ace7dc77.
2012-06-01Merge pull request #39 from kabirkukreti/mastergnowgi2-1/+2
Fixture added for initial data
2012-06-01conflicts with gnowgi's branch fixedNeha shah1-61/+86
2012-06-01Merge remote-tracking branch 'gn6/master'amita singh18-419/+3049
2012-06-01gstudio_rdffile_path added in settings.pyamita singh4-9/+24
2012-06-01Merge branch 'master' of https://github.com/gnowgi/gnowsys-studioNeha shah16-417/+3047
2012-06-01unused arrays removedshefali shetty1-45/+27
2012-06-01Attributes values were not visible.Bug correctedshefali shetty1-22/+25
2012-05-31Merge pull request #48 from arunkumar5587/mastergnowgi18-419/+3049
Version control merging,revert and other work done. .
2012-05-30Small error in get_graph_json in models file correctedArun yadav1-1/+1
2012-05-30Merge branch 'master' of https://github.com/gnowgi/gnowsys-studioArun yadav35-4929/+536
Conflicts with the main branch fixed
2012-05-30Full version control for OTs,Objects,ATs,RTs done.Merge and revert also ↵Arun yadav18-418/+3047
done.Extra history field added in nbhood
2012-05-30It displays the rdf of all the objects.amita singh1-5/+5
2012-05-30Merge remote branch 'rs/master'Neha shah3-14/+126
2012-05-30VERSIONING disabled, and minor changesNeha shah3-3/+2
2012-05-30registered the set and get functionsNeha shah1-0/+192
2012-05-30dispatcher.pyNeha shah1-0/+76
2012-05-30decorators.pyNeha shah1-0/+175
2012-05-30changed url for xmlrpcNeha shah1-1/+1