Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync with Develop #266

Merged
merged 65 commits into from
Aug 17, 2018
Merged

Sync with Develop #266

merged 65 commits into from
Aug 17, 2018

Conversation

xadahiya
Copy link
Member

No description provided.

sandeepsajan0 and others added 30 commits March 9, 2018 19:43
@sandeepsajan0
Merge branch 'develop' of https://github.com/HTTP-APIs/hydrus
392a302
@sandeepsajan0
Merge remote-tracking branch 'upstream/master'
fd4da07
@sandeepsajan0
Merge remote-tracking branch 'upstream/agent-uuid' into agent-uuid
a74b98c
@sandeepsajan0
add uuid instead id
56ea109
@sandeepsajan0
update id_ int to string in app file
19d5ee0
@sandeepsajan0
update id_ int to string in app file
b5feb19
@sandeepsajan0
Merge branch 'sandeeppatch' of https://github.com/sandeepsajan0/hydrus …
3211b42 
…into sandeeppatch
@sandeepsajan0
remove print statement
0d37fbf
@xadahiya
Merge pull request #227 from sandeepsajan0/sandeeppatch
95b1729 
add uuid instead id
@vaibhavchellani
fixed conflicts
f07a49f
@vaibhavchellani
test_app fixed
5d0d65a
@vaibhavchellani
made changes to crud
2d34065
@vaibhavchellani
changed int to str
fc2c40d
@vaibhavchellani
added default ids in graphs , fixed tests
70c5fd0
@vaibhavchellani
fixed test
dbf5e56
@vaibhavchellani
fixed parser tests
1cf08ad
@vaibhavchellani
changes int id to string
aebf00f
@vaibhavchellani
fixed tests
a228ebf
@vaibhavchellani
created generalised tests
7a4d594
@xadahiya
Merge pull request #250 from vaibhavchellani/agent-uuid
666b3e4 
Agent UUID
@vaibhavchellani
added schema parser
627b373
@vaibhavchellani
removed support for anything other than ref
146ab94
@vaibhavchellani
added param check
a1041b8
@vaibhavchellani
adds where ref is not given
3129c21
@vaibhavchellani
removed schema parser method
5f9a67e
@vaibhavchellani
added updated hydra doc
a63dd3e
@xadahiya
Merge pull request #1 from HTTP-APIs/master
5a1912c 
sync with upstream
@xadahiya
Merge pull request #253 from xadahiya/master
c1df84c 
Update requirements.txt
@vddesai1871
Replace the use of deprecared gevent.wsgi with gevent.pywsgi
8599e92
@xadahiya
Merge pull request #255 from vddesai1998/develop
b28ea84 
Replace the use of deprecated gevent.wsgi with gevent.pywsgi
vaibhavchellani and others added 23 commits August 5, 2018 20:48
@vaibhavchellani
Merge branch 'cli_parser' of https://github.com/vaibhavchellani/hydrus …
100b67b 
…into cli_parser
@vaibhavchellani
added open api in param
2aa8f8f
@vaibhavchellani
fixes cli errors
2656a5f
@vaibhavchellani
remove sql example file
3f17d0c
@xadahiya
Merge pull request #260 from vaibhavchellani/remove
b38ebfa 
Removes sql example file
@vaibhavchellani
removed print statement
0eac4d7
@xadahiya
Merge pull request #259 from vaibhavchellani/cli_parser
d711b29 
CLI for parser
@vaibhavchellani
updated doc
caabdb1
@vaibhavchellani
added error messages
b66f1a9
@vaibhavchellani
made pep8 compliant
5b83bc8
@vaibhavchellani
updated hydra doc by parser
bb6c5f1
@vaibhavchellani
fixes merge conflicts
a51742e
@vaibhavchellani
url error fixed
cce635e
@vaibhavchellani
Merge branch 'workingParser' of https://github.com/vaibhavchellani/hy…
0f344a6 
…drus into workingParser
@xadahiya
Merge pull request #262 from vaibhavchellani/workingParser
e257ff4 
Finishing up parser
@vaibhavchellani
fixed type mismatch error
3b5b55c
@vaibhavchellani
debugging test
74e7f54
@vaibhavchellani
tests passing
bbcd5fa
@vaibhavchellani
Merge branch 'fixing#261' into generalised_tests
b38eb71
@vaibhavchellani
added give_non_collection
cd23fd2
@xadahiya
Merge pull request #263 from vaibhavchellani/fixing#261
9fd2b1c 
Fixes data base errors on collections using UUID
@xadahiya
Generalised crud tests done
3070657
@xadahiya
Merge pull request #265 from HTTP-APIs/general_test
a5766fd 
General test
@xadahiya xadahiya requested a review from Mec-iS August 11, 2018 06:31
@vaibhavchellani
Copy link
Contributor

@xadahiya writing some tests and creating a PR soon

@xadahiya xadahiya merged commit 8c2a598 into master Aug 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mec-iS Mec-iS Awaiting requested review from Mec-iS

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@xadahiya @vaibhavchellani @sandeepsajan0 @vddesai1871 @Mec-iS