Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
6521955
Added GET Api for Graph Versions
jahandaniyal Jun 9, 2018
240fd20
Added POST Api for graph_version
jahandaniyal Jun 10, 2018
64921a3
Added DELETE API for graph_version
jahandaniyal Jun 10, 2018
4d307e3
Added Version selector dropdown
jahandaniyal Jun 10, 2018
321a432
Added API Specifications for Graph Version
jahandaniyal Jun 11, 2018
f99e668
Changes in model for version feature
jahandaniyal Jun 18, 2018
76b4acc
Added changes for upload, add graph
jahandaniyal Jun 18, 2018
50b9c7e
Update models - migrate json from graph to graph_version table
jahandaniyal Jun 23, 2018
1cdcb57
Added migration files for model changes
jahandaniyal Jun 23, 2018
e6b59cf
Added graph_version specific code to views
jahandaniyal Jun 23, 2018
9bd1573
Added graph_version specific code to controllers
jahandaniyal Jun 23, 2018
aed358b
dal changes - moved json from graph to graph_version
jahandaniyal Jun 23, 2018
9141f57
UI changes for graph_version feature
jahandaniyal Jun 23, 2018
5ba4276
Added Python Documentation for Version Feature
jahandaniyal Jun 30, 2018
3e1dffc
Fix indentations and remove unnecessary commented code
jahandaniyal Jun 30, 2018
5f7e224
Added Tests for GraphSpace models
jahandaniyal Jul 1, 2018
c2ed1d8
Fix indentation
jahandaniyal Jul 1, 2018
4135efe
Graph Version minor UI Fixes
jahandaniyal Jul 2, 2018
c2b90c8
Merge branch 'version_feature' of https://github.com/jahandaniyal/Gra…
jahandaniyal Jul 2, 2018
117a8c7
Model changes for Layout Compatibility
jahandaniyal Jul 8, 2018
44f5c26
Added URLs for Layout Compatibility Feature
jahandaniyal Jul 8, 2018
3053a27
dal tests for Layout Compatibility
jahandaniyal Jul 8, 2018
2d59317
Added templates for Layout Compatibility Tab
jahandaniyal Jul 8, 2018
52cfd74
Changes in UI for Layout Compatibility Feature
jahandaniyal Jul 8, 2018
246b83c
Added CRUD methods for server Layout Compatibility AJAX Requests
jahandaniyal Jul 8, 2018
c6d2dd5
Added scripts for Database interactions for Layout Compatibility
jahandaniyal Jul 8, 2018
b2aeab2
Update UI components in the templates
jahandaniyal Aug 2, 2018
8c06af0
Update layout compatibility feature
jahandaniyal Aug 2, 2018
ebf6de6
Fix for issues with style_json and layout compatibility
jahandaniyal Aug 10, 2018
b8d9be3
DIFF-01 [ADD] Implements basic diff for graph functionalities
jahandaniyal Jun 20, 2019
200522f
Add template and assets for DIFF-01
jahandaniyal Jun 21, 2019
18438cf
Update graph_page.js to handle basic diff functions
jahandaniyal Jun 21, 2019
ea44961
Add template and CSS for GUI
jahandaniyal Jun 28, 2019
3758498
Update graph_page.js for GUI
jahandaniyal Jun 28, 2019
9fd7df2
Update comparison logic in middleware
jahandaniyal Jun 28, 2019
02426a9
Add additional information in Nodes/Edges Table
jahandaniyal Jul 3, 2019
9634d04
Fix edge table for difference operation
jahandaniyal Jul 3, 2019
cd58c18
Disable buttons on submit and give proper error message.
HitRam Jan 31, 2018
a529abe
Added the name of the groups with which a graph is shared to the "Gra…
lohani2280 Feb 5, 2018
feb99ec
Added code to validate the email address during signup
lohani2280 Feb 11, 2018
639e40d
README.md: Added GraphSpace documentation link
lohani2280 Feb 15, 2018
c50af3e
partially done rest-api-doc
sanket0211 Feb 15, 2018
4b94961
images checked
sanket0211 Feb 15, 2018
09c9b42
issue:332-Add a documentation for RESTful APIs fixed
sanket0211 Feb 15, 2018
0ecd57d
issue:332-Add a documentation for RESTful APIs fixed
sanket0211 Feb 15, 2018
eeca2d7
Corrected Image Name
sanket0211 Feb 15, 2018
21f3c32
Credits given to Sandeep Mahapatra
sanket0211 Feb 15, 2018
ed4529b
Added functionality for default automatic layout and layout settings
lohani2280 Feb 2, 2018
5b5ab24
README.md: Added License and Maintainers section
lohani2280 Feb 22, 2018
561adeb
Update footer.html
JingVT May 22, 2018
b11c11f
Update Cytoscape.js
JingVT May 22, 2018
fdc00db
Update Cytoscape.js
JingVT May 22, 2018
d49c6c3
Update Cytoscape.js
JingVT May 22, 2018
2fceda8
Update Cytoscape.js
JingVT May 22, 2018
0c5213c
Update bower.json
JingVT Oct 23, 2018
58c2bcb
Update error.html
JingVT Oct 26, 2018
6513f63
Update reset.html
JingVT Oct 26, 2018
2968712
Update index.html
JingVT Oct 26, 2018
6da6b97
Update footer.html
JingVT Oct 26, 2018
c4b20df
Fix issue 396 -- select layout algorithm does not work for upgraded c…
JingVT Oct 26, 2018
b859717
Fix issue 398 (#3) -- Edit selected nodes or edges function
JingVT Oct 26, 2018
bd82570
Fix issue 402 (#4) -- cyTarget to Target
JingVT Oct 26, 2018
d2bfc6d
Fix issue 400 (#5) -- cyTarget to Target
JingVT Oct 26, 2018
43c891c
Fix issue 405 (#6) -- Remove applyMax funstions
JingVT Oct 26, 2018
8ad76c5
Added a Save Layout button on the Layouts pane
Jan 10, 2019
1325c60
Refactor headers in templates
jahandaniyal Jul 7, 2019
7c346bf
Refine UI for V1.1
jahandaniyal Jul 10, 2019
837e668
Utility function for V1.1
jahandaniyal Jul 10, 2019
36edbd6
Update template to accept query params
jahandaniyal Jul 17, 2019
d8541f0
Remove compare page functionalities from graph_page.js
jahandaniyal Jul 17, 2019
a6f5fca
Update js for query params & fix node styling
jahandaniyal Jul 17, 2019
f1b6d32
Set edge color same as graphs
jahandaniyal Jul 17, 2019
8990a97
Refactor variables in js
jahandaniyal Jul 17, 2019
67a80a5
Fix Duplicate node issue and use ID/Name
jahandaniyal Jul 17, 2019
45f1fc8
Remove redudant code for duplicate nodes
jahandaniyal Jul 17, 2019
daa0336
Integrate query params support
jahandaniyal Jul 17, 2019
371ec95
Fix sharedgraph dropdown
jahandaniyal Jul 23, 2019
e0eaf25
Add intersection for N-Graphs
jahandaniyal Jul 31, 2019
6748d82
Add endpoints for N-graph comparison
jahandaniyal Jul 31, 2019
7a1c4e9
Add templates for N-graph comparison
jahandaniyal Jul 31, 2019
1dcadde
Update view for N-graph comparison
jahandaniyal Jul 31, 2019
05f2dc1
Update controller for N-graph comparison
jahandaniyal Jul 31, 2019
4e68199
Add API endpoint for N-graph comparison
jahandaniyal Jul 31, 2019
328e9b7
Add functions to support N-Graph comparison
jahandaniyal Jul 31, 2019
f6fc008
Add reset function for menus
jahandaniyal Jul 31, 2019
3d0040b
Add classes to cygraph
jahandaniyal Aug 5, 2019
84d286b
Support graph comparison from index page
jahandaniyal Aug 6, 2019
31c24ff
Add compare checkbox in index-page
jahandaniyal Aug 6, 2019
9e7b970
Add graph_ids for multiple graphs
jahandaniyal Aug 6, 2019
1838631
Refactor reset button UI
jahandaniyal Aug 6, 2019
3c4e8c2
Add graph comparison dropdown in index page
jahandaniyal Aug 6, 2019
9858e8c
Respect order of selection of graphs
jahandaniyal Aug 6, 2019
194c546
Add support for multi-graph params
jahandaniyal Aug 6, 2019
fd77bfd
Rename page header
jahandaniyal Aug 6, 2019
f1b4188
Hide modal on success
jahandaniyal Aug 7, 2019
11b22c2
Refactor Add graph button name
jahandaniyal Aug 7, 2019
0e6082b
Fix dropdown bugs
jahandaniyal Aug 15, 2019
2a5ac8d
Fix checkbox layout in graphs table
jahandaniyal Aug 15, 2019
6b3989e
Fix checkbox UI bugs
jahandaniyal Aug 15, 2019
81aeb64
Fix Reset functionality
jahandaniyal Aug 15, 2019
5466527
Bug fixes and refactoring
jahandaniyal Aug 20, 2019
db1dc3f
Local settings
jahandaniyal Aug 20, 2019
07588f0
Merge branch 'layout_compatibility_feature' into DIFF-MERGE
jahandaniyal Aug 20, 2019
18ed3e8
Bug fixes and refactoring
jahandaniyal Aug 20, 2019
64b92ae
Fix custom-toolbar alignment
jahandaniyal Aug 21, 2019
f35a844
Fix selection dropdown menus
jahandaniyal Aug 25, 2019
24591b3
Merge branch 'DIFF-02' into DIFF-MERGE
jahandaniyal Aug 25, 2019
9eafef6
Integrate frontend of Version with Diff
jahandaniyal Aug 25, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,28 @@ WSGIScriptAlias / /path_to_GraphSpace/graphspace/wsgi.py
Refer to https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/modwsgi/ if any problems occur with the setup.


Documentation
=================

GraphSpace has extensive documentation on the [user interface](http://docs.graphspace.org/en/latest/Quick_Tour_of_GraphSpace.html#welcome-screen), the [REST API](http://docs.graphspace.org/en/latest/Programmers_Guide.html#graphspace-rest-api) and a [Python package for programmatic interaction](http://manual.graphspace.org/projects/graphspace-python/en/latest/tutorial/index.html).


Contributing
=================

Feel free to fork and send us pull requests. Here are the [guidelines for contribution](https://github.com/Murali-group/GraphSpace/blob/master/CONTRIBUTING.md) in GraphSpace.


Contact
=================

If you have questions or suggestions about GraphSpace, please contact

- **T.M. Murali ([@tmmurali](https://github.com/tmmurali))**
- **Aditya Bharadwaj ([@adbharadwaj](https://github.com/adbharadwaj))**


License
=================

GraphSpace is available under the GNU General Public License v2.0 license. See [LICENSE.md](https://github.com/Murali-group/GraphSpace/blob/master/LICENSE.md) for more information.
261 changes: 261 additions & 0 deletions api_specifications/api.raml
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,156 @@ types:
graph_id: number
positions_json: string
style_json: string
GraphVersion:
description: Graph Version object
example: |
{
"name": "Graph Version 1.0",
"owner_email": "[email protected]",
"description": "This is Version 1.0 of Sample Graph",
"graph_id": 1,
"graph_json": {
"elements": {
"nodes": [
{
"position": {
"y": 277.5,
"x": 297.5
},
"data": {
"k": 0,
"id": "P4314611",
"name": "P4314611",
"label": ""
}
},
{
"position": {
"y": 277.5,
"x": 892.5
},
"data": {
"k": 0,
"id": "P0810711",
"name": "P0810711",
"label": ""
}
}
],
"edges": [
{
"data": {
"target": "P0810711",
"k": 0,
"source": "P4314611",
"is_directed": 1,
"id": "P4314611-P0810711",
"name": "P4314611-P0810711"
},
"style": {
"line-color": "blue",
"target-arrow-shape": "triangle",
"source-arrow-color": "yellow",
"width": "12px",
"curve-style": "bezier",
"line-style": "dotted"
}
}
]
},
"data": {
"description": "Description of graph.. can also point to an image hosted elsewhere",
"name": "My first graph",
"tags": [
"tutorial", "sample"
]
}
}
}
properties:
name: string
owner_email: string
description: string
graph_id: number
graph_json: GraphJSON
GraphVersionResponse:
description: Graph Version Response object
example: |
{
"name": "Graph Version 1.0",
"updated_at": "2017-03-25T15:37:20.728954",
"graph_id": 25,
"created_at": "2017-03-25T15:37:20.728954",
"owner_email": "[email protected]",
"description": "This is Version 1.0 of Sample Graph",
"id": 21384,
"graph_json": {
"elements": {
"nodes": [
{
"position": {
"y": 277.5,
"x": 297.5
},
"data": {
"k": 0,
"id": "P4314611",
"name": "P4314611",
"label": ""
}
},
{
"position": {
"y": 277.5,
"x": 892.5
},
"data": {
"k": 0,
"id": "P0810711",
"name": "P0810711",
"label": ""
}
}
],
"edges": [
{
"data": {
"target": "P0810711",
"k": 0,
"source": "P4314611",
"is_directed": 1,
"id": "P4314611-P0810711",
"name": "P4314611-P0810711"
},
"style": {
"line-color": "blue",
"target-arrow-shape": "triangle",
"source-arrow-color": "yellow",
"width": "12px",
"curve-style": "bezier",
"line-style": "dotted"
}
}
]
},
"data": {
"description": "Description of graph.. can also point to an image hosted elsewhere",
"name": "My first graph",
"tags": [
"tutorial", "sample"
]
}
}
}
properties:
id: number
name: string
owner_email: string
graph_id: number
graph_json: GraphJSON
created_at: string
updated_at: string
description: string
Member:
description: Member Response object
example: |
Expand Down Expand Up @@ -808,6 +958,117 @@ types:
body:
application/json:
type: Error
/versions:
description: APIs to access versions of a specific graph on GraphSpace.
displayName: Graph Versions
get:
description: List all Graph Versions matching query criteria, if provided; otherwise list all Graph Versions.
queryParameters:
owner_email?: string
name?:
description: Search for Graph Versions with given name. In order to search for versions with given name as a substring, wrap the name with percentage symbol. For example, %xyz% will search for all versions with xyz in their name.
type: string
limit?:
description: Number of entities to return.
default: 20
type: number
offset?:
description: Offset the list of returned entities by this number.
default: 0
type: number
order?:
description: Defines the column sort order, can only be 'asc' or 'desc'.
type: string
sort?:
description: Defines which column will be sorted.
type: string
example: "name"
responses:
200:
description: SUCCESS
body:
application/json:
type: object
properties:
total: number
versions: GraphVersionResponse[]
400:
description: BAD REQUEST
body:
application/json:
type: Error
403:
description: FORBIDDEN
body:
application/json:
type: Error
post:
description: Create a new Graph Version.
body:
application/json:
type: GraphVersion
responses:
201:
description: SUCCESS
body:
application/json:
type: GraphVersionResponse
400:
description: BAD REQUEST
body:
application/json:
type: Error
/{version_id}:
description: APIs to access a specific graph version on GraphSpace.
displayName: Graph Version
get:
description: Get a Graph Version by id
responses:
200:
description: SUCCESS
body:
application/json:
type: GraphVersionResponse
403:
description: FORBIDDEN
body:
application/json:
type: Error
put:
description: Update a Graph Version by id
body:
application/json:
type: GraphVersion
responses:
200:
description: SUCCESS
body:
application/json:
type: GraphVersionResponse
403:
description: FORBIDDEN
body:
application/json:
type: Error
delete:
description: Delete a Graph Version by id
responses:
200:
description: SUCCESS
body:
application/json:
type: object
properties:
message: string
example: |
{
"message": "Successfully deleted graph version with id=21341"
}
403:
description: FORBIDDEN
body:
application/json:
type: Error

/groups:
description: APIs to access groups on GraphSpace.
Expand Down
Loading