{"action":"created","issue":{"url":"https://api.github.com/repos/greenelab/scihub/issues/12","repository_url":"https://api.github.com/repos/greenelab/scihub","labels_url":"https://api.github.com/repos/greenelab/scihub/issues/12/labels{/name}","comments_url":"https://api.github.com/repos/greenelab/scihub/issues/12/comments","events_url":"https://api.github.com/repos/greenelab/scihub/issues/12/events","html_url":"https://github.com/greenelab/scihub/pull/12","id":231819001,"number":12,"title":"Journals table improvements","user":{"login":"arielsvn","id":1882507,"avatar_url":"https://avatars2.githubusercontent.com/u/1882507?v=3","gravatar_id":"","url":"https://api.github.com/users/arielsvn","html_url":"https://github.com/arielsvn","followers_url":"https://api.github.com/users/arielsvn/followers","following_url":"https://api.github.com/users/arielsvn/following{/other_user}","gists_url":"https://api.github.com/users/arielsvn/gists{/gist_id}","starred_url":"https://api.github.com/users/arielsvn/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/arielsvn/subscriptions","organizations_url":"https://api.github.com/users/arielsvn/orgs","repos_url":"https://api.github.com/users/arielsvn/repos","events_url":"https://api.github.com/users/arielsvn/events{/privacy}","received_events_url":"https://api.github.com/users/arielsvn/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"assignees":[],"milestone":null,"comments":2,"created_at":"2017-05-27T18:18:35Z","updated_at":"2017-05-29T14:28:05Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/greenelab/scihub/pulls/12","html_url":"https://github.com/greenelab/scihub/pull/12","diff_url":"https://github.com/greenelab/scihub/pull/12.diff","patch_url":"https://github.com/greenelab/scihub/pull/12.patch"},"body":"Follow up for #10, this PR includes:\r\n\r\n- Add `active` and `open_access` status to the table\r\n- Use a different library for the table, to speed it up\r\n\r\nThis version can bee seen at http://arielrodriguezromero.com/scihub\r\n\r\n/cc @dhimmel \r\n\r\n"},"comment":{"url":"https://api.github.com/repos/greenelab/scihub/issues/comments/304674195","html_url":"https://github.com/greenelab/scihub/pull/12#issuecomment-304674195","issue_url":"https://api.github.com/repos/greenelab/scihub/issues/12","id":304674195,"user":{"login":"dhimmel","id":1117703,"avatar_url":"https://avatars2.githubusercontent.com/u/1117703?v=3","gravatar_id":"","url":"https://api.github.com/users/dhimmel","html_url":"https://github.com/dhimmel","followers_url":"https://api.github.com/users/dhimmel/followers","following_url":"https://api.github.com/users/dhimmel/following{/other_user}","gists_url":"https://api.github.com/users/dhimmel/gists{/gist_id}","starred_url":"https://api.github.com/users/dhimmel/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dhimmel/subscriptions","organizations_url":"https://api.github.com/users/dhimmel/orgs","repos_url":"https://api.github.com/users/dhimmel/repos","events_url":"https://api.github.com/users/dhimmel/events{/privacy}","received_events_url":"https://api.github.com/users/dhimmel/received_events","type":"User","site_admin":false},"created_at":"2017-05-29T14:28:05Z","updated_at":"2017-05-29T14:28:05Z","body":"This [network view](https://github.com/greenelab/scihub/network) is sometimes helpful regarding conflicts:\r\n\r\n![](https://cloud.githubusercontent.com/assets/1117703/26553062/fd4c4c3a-4457-11e7-8bc6-149c7899ea3f.png)\r\n\r\nThe conflicts have arisen since you started this pull request from a branch other than `greenelab:master`. As general advice, always try to start your pull requests from the most recent version of the upstream master.\r\n\r\nYou will have to manually resolve the conflicts. You can do this by either:\r\n\r\n1. merging the current `greenelab:master` into your `support/datagrid-improvements` branch.\r\n2. rebasing `support/datagrid-improvements` on the current `greenelab:master` and then force pushing.\r\n\r\nOption 2 gives a cleaner result, but rewrites history! In both cases you will likely have to resolve conflicts manually... tell git which version of a conflicting file you want to keep."}}
{"actor":{"display_login":"dhimmel"}}