{"action":"created","issue":{"url":"https://api.github.com/repos/scitran/api/issues/20","labels_url":"https://api.github.com/repos/scitran/api/issues/20/labels{/name}","comments_url":"https://api.github.com/repos/scitran/api/issues/20/comments","events_url":"https://api.github.com/repos/scitran/api/issues/20/events","html_url":"https://github.com/scitran/api/pull/20","id":90444598,"number":20,"title":"Hbm merge attempt #1","user":{"login":"kofalt","id":265071,"avatar_url":"https://avatars.githubusercontent.com/u/265071?v=3","gravatar_id":"","url":"https://api.github.com/users/kofalt","html_url":"https://github.com/kofalt","followers_url":"https://api.github.com/users/kofalt/followers","following_url":"https://api.github.com/users/kofalt/following{/other_user}","gists_url":"https://api.github.com/users/kofalt/gists{/gist_id}","starred_url":"https://api.github.com/users/kofalt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kofalt/subscriptions","organizations_url":"https://api.github.com/users/kofalt/orgs","repos_url":"https://api.github.com/users/kofalt/repos","events_url":"https://api.github.com/users/kofalt/events{/privacy}","received_events_url":"https://api.github.com/users/kofalt/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/scitran/api/labels/in%20progress","name":"in progress","color":"ededed"}],"state":"open","locked":false,"assignee":{"login":"gsfr","id":712594,"avatar_url":"https://avatars.githubusercontent.com/u/712594?v=3","gravatar_id":"","url":"https://api.github.com/users/gsfr","html_url":"https://github.com/gsfr","followers_url":"https://api.github.com/users/gsfr/followers","following_url":"https://api.github.com/users/gsfr/following{/other_user}","gists_url":"https://api.github.com/users/gsfr/gists{/gist_id}","starred_url":"https://api.github.com/users/gsfr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gsfr/subscriptions","organizations_url":"https://api.github.com/users/gsfr/orgs","repos_url":"https://api.github.com/users/gsfr/repos","events_url":"https://api.github.com/users/gsfr/events{/privacy}","received_events_url":"https://api.github.com/users/gsfr/received_events","type":"User","site_admin":false},"milestone":null,"comments":1,"created_at":"2015-06-23T17:29:56Z","updated_at":"2015-06-24T23:35:04Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/scitran/api/pulls/20","html_url":"https://github.com/scitran/api/pull/20","diff_url":"https://github.com/scitran/api/pull/20.diff","patch_url":"https://github.com/scitran/api/pull/20.patch"},"body":"First attempt at merging in divergence from `master` and `demo`. Several functions had changes in both branches, sometimes mostly copies of the same code, so this merge desires careful review by @gsfr, @andynemzek, and maybe @josschne, in particular file handling code.\r\n\r\nResult appears to work, with two exceptions \r\n\r\n* `/sessions` 404s out. This is expected as that's the current behaviour on master; that bug should be fixed separately.\r\n* I'm getting `Upload failed: Server responded with 0 code` on file upload from FDM, despite the `?fdm=1` flag being present. Not sure how to approach that.\r\n\r\nSuggestions welcome, up to and including that this merge should be abandoned & retried by another."},"comment":{"url":"https://api.github.com/repos/scitran/api/issues/comments/115045766","html_url":"https://github.com/scitran/api/pull/20#issuecomment-115045766","issue_url":"https://api.github.com/repos/scitran/api/issues/20","id":115045766,"user":{"login":"gsfr","id":712594,"avatar_url":"https://avatars.githubusercontent.com/u/712594?v=3","gravatar_id":"","url":"https://api.github.com/users/gsfr","html_url":"https://github.com/gsfr","followers_url":"https://api.github.com/users/gsfr/followers","following_url":"https://api.github.com/users/gsfr/following{/other_user}","gists_url":"https://api.github.com/users/gsfr/gists{/gist_id}","starred_url":"https://api.github.com/users/gsfr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gsfr/subscriptions","organizations_url":"https://api.github.com/users/gsfr/orgs","repos_url":"https://api.github.com/users/gsfr/repos","events_url":"https://api.github.com/users/gsfr/events{/privacy}","received_events_url":"https://api.github.com/users/gsfr/received_events","type":"User","site_admin":false},"created_at":"2015-06-24T23:35:04Z","updated_at":"2015-06-24T23:35:04Z","body":"Thanks, @kofalt. After careful review, I think we should simply drop this PR and the demo branch. The only actually useful thing from here was the reset functionality, which I have just hand-ported to master. Next, I will email examples of how to use the new upload functionality."}}