{"action":"created","comment":{"url":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/comments/60495417","id":60495417,"diff_hunk":"@@ -1133,13 +1141,20 @@ define([\n         return null;\n       }\n       return (\n-        <i className=\"icon fonticon-ok-circled\" />\n+        <i className={\"icon \" + this.props.customIcon} />\n       );\n     },\n \n     render: function () {\n       return (\n-        <button onClick={this.props.onClick} type=\"submit\" className=\"btn btn-success save\" id={this.props.id}>\n+        <button\n+          onClick={this.props.onClick}\n+          type=\"submit\"\n+          data-id={this.props['data-id']}\n+          className={'btn save ' + this.props.buttonType}\n+          id={this.props.id}\n+          style={this.props.style}\n+        >","path":"app/addons/components/react-components.react.jsx","position":42,"original_position":42,"commit_id":"592adc13962457a58a26395dfef57274be33ac5a","original_commit_id":"592adc13962457a58a26395dfef57274be33ac5a","user":{"login":"robertkowalski","id":298166,"avatar_url":"https://avatars.githubusercontent.com/u/298166?v=3","gravatar_id":"","url":"https://api.github.com/users/robertkowalski","html_url":"https://github.com/robertkowalski","followers_url":"https://api.github.com/users/robertkowalski/followers","following_url":"https://api.github.com/users/robertkowalski/following{/other_user}","gists_url":"https://api.github.com/users/robertkowalski/gists{/gist_id}","starred_url":"https://api.github.com/users/robertkowalski/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/robertkowalski/subscriptions","organizations_url":"https://api.github.com/users/robertkowalski/orgs","repos_url":"https://api.github.com/users/robertkowalski/repos","events_url":"https://api.github.com/users/robertkowalski/events{/privacy}","received_events_url":"https://api.github.com/users/robertkowalski/received_events","type":"User","site_admin":false},"body":"if data-id is undefined it will not render, it is optional","created_at":"2016-04-20T22:00:30Z","updated_at":"2016-04-20T22:00:30Z","html_url":"https://github.com/apache/couchdb-fauxton/pull/670#discussion_r60495417","pull_request_url":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/670","_links":{"self":{"href":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/comments/60495417"},"html":{"href":"https://github.com/apache/couchdb-fauxton/pull/670#discussion_r60495417"},"pull_request":{"href":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/670"}}},"pull_request":{"url":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/670","id":63374304,"html_url":"https://github.com/apache/couchdb-fauxton/pull/670","diff_url":"https://github.com/apache/couchdb-fauxton/pull/670.diff","patch_url":"https://github.com/apache/couchdb-fauxton/pull/670.patch","issue_url":"https://api.github.com/repos/apache/couchdb-fauxton/issues/670","number":670,"state":"open","locked":false,"title":"conflict-solving: first pass on revision browser ","user":{"login":"robertkowalski","id":298166,"avatar_url":"https://avatars.githubusercontent.com/u/298166?v=3","gravatar_id":"","url":"https://api.github.com/users/robertkowalski","html_url":"https://github.com/robertkowalski","followers_url":"https://api.github.com/users/robertkowalski/followers","following_url":"https://api.github.com/users/robertkowalski/following{/other_user}","gists_url":"https://api.github.com/users/robertkowalski/gists{/gist_id}","starred_url":"https://api.github.com/users/robertkowalski/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/robertkowalski/subscriptions","organizations_url":"https://api.github.com/users/robertkowalski/orgs","repos_url":"https://api.github.com/users/robertkowalski/repos","events_url":"https://api.github.com/users/robertkowalski/events{/privacy}","received_events_url":"https://api.github.com/users/robertkowalski/received_events","type":"User","site_admin":false},"body":"This adds the first iteration of a revision browsing tool for\r\nconflicts that is able to diff documents and to select\r\nconflicting revs as a winner.\r\n\r\nAdditional changes:\r\n\r\n - adjust button colors\r\n - add a helper to create an animal db, which also contains the\r\n   zebra doc, which has a conflict from replication\r\n\r\n- display a small indicator in table view, given a doc has conflicts\r\n\r\nTesting instructions:\r\n\r\n`npm run create:animaldb` creates a fresh version of the animaldb\r\nwith a conflicting doc, the `zebra`.","created_at":"2016-03-18T13:32:38Z","updated_at":"2016-04-20T22:00:30Z","closed_at":null,"merged_at":null,"merge_commit_sha":"c199eacd419875fb3ef344d464040af3e89f6bca","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/670/commits","review_comments_url":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/670/comments","review_comment_url":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/comments{/number}","comments_url":"https://api.github.com/repos/apache/couchdb-fauxton/issues/670/comments","statuses_url":"https://api.github.com/repos/apache/couchdb-fauxton/statuses/592adc13962457a58a26395dfef57274be33ac5a","head":{"label":"robertkowalski:demo","ref":"demo","sha":"592adc13962457a58a26395dfef57274be33ac5a","user":{"login":"robertkowalski","id":298166,"avatar_url":"https://avatars.githubusercontent.com/u/298166?v=3","gravatar_id":"","url":"https://api.github.com/users/robertkowalski","html_url":"https://github.com/robertkowalski","followers_url":"https://api.github.com/users/robertkowalski/followers","following_url":"https://api.github.com/users/robertkowalski/following{/other_user}","gists_url":"https://api.github.com/users/robertkowalski/gists{/gist_id}","starred_url":"https://api.github.com/users/robertkowalski/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/robertkowalski/subscriptions","organizations_url":"https://api.github.com/users/robertkowalski/orgs","repos_url":"https://api.github.com/users/robertkowalski/repos","events_url":"https://api.github.com/users/robertkowalski/events{/privacy}","received_events_url":"https://api.github.com/users/robertkowalski/received_events","type":"User","site_admin":false},"repo":{"id":21752686,"name":"couchdb-fauxton","full_name":"robertkowalski/couchdb-fauxton","owner":{"login":"robertkowalski","id":298166,"avatar_url":"https://avatars.githubusercontent.com/u/298166?v=3","gravatar_id":"","url":"https://api.github.com/users/robertkowalski","html_url":"https://github.com/robertkowalski","followers_url":"https://api.github.com/users/robertkowalski/followers","following_url":"https://api.github.com/users/robertkowalski/following{/other_user}","gists_url":"https://api.github.com/users/robertkowalski/gists{/gist_id}","starred_url":"https://api.github.com/users/robertkowalski/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/robertkowalski/subscriptions","organizations_url":"https://api.github.com/users/robertkowalski/orgs","repos_url":"https://api.github.com/users/robertkowalski/repos","events_url":"https://api.github.com/users/robertkowalski/events{/privacy}","received_events_url":"https://api.github.com/users/robertkowalski/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/robertkowalski/couchdb-fauxton","description":"Mirror of Apache CouchDB","fork":true,"url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton","forks_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/forks","keys_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/keys{/key_id}","collaborators_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/teams","hooks_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/hooks","issue_events_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/issues/events{/number}","events_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/events","assignees_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/assignees{/user}","branches_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/branches{/branch}","tags_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/tags","blobs_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/git/refs{/sha}","trees_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/git/trees{/sha}","statuses_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/statuses/{sha}","languages_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/languages","stargazers_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/stargazers","contributors_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/contributors","subscribers_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/subscribers","subscription_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/subscription","commits_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/commits{/sha}","git_commits_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/git/commits{/sha}","comments_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/comments{/number}","issue_comment_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/issues/comments{/number}","contents_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/contents/{+path}","compare_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/compare/{base}...{head}","merges_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/merges","archive_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/downloads","issues_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/issues{/number}","pulls_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/pulls{/number}","milestones_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/milestones{/number}","notifications_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/labels{/name}","releases_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/releases{/id}","deployments_url":"https://api.github.com/repos/robertkowalski/couchdb-fauxton/deployments","created_at":"2014-07-11T21:57:44Z","updated_at":"2015-01-08T14:27:52Z","pushed_at":"2016-04-20T13:07:17Z","git_url":"git://github.com/robertkowalski/couchdb-fauxton.git","ssh_url":"git@github.com:robertkowalski/couchdb-fauxton.git","clone_url":"https://github.com/robertkowalski/couchdb-fauxton.git","svn_url":"https://github.com/robertkowalski/couchdb-fauxton","homepage":null,"size":44309,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":2,"mirror_url":null,"open_issues_count":0,"forks":2,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"apache:master","ref":"master","sha":"978ae690f1bf83770d09e6dc8ef25b490c155eb5","user":{"login":"apache","id":47359,"avatar_url":"https://avatars.githubusercontent.com/u/47359?v=3","gravatar_id":"","url":"https://api.github.com/users/apache","html_url":"https://github.com/apache","followers_url":"https://api.github.com/users/apache/followers","following_url":"https://api.github.com/users/apache/following{/other_user}","gists_url":"https://api.github.com/users/apache/gists{/gist_id}","starred_url":"https://api.github.com/users/apache/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apache/subscriptions","organizations_url":"https://api.github.com/users/apache/orgs","repos_url":"https://api.github.com/users/apache/repos","events_url":"https://api.github.com/users/apache/events{/privacy}","received_events_url":"https://api.github.com/users/apache/received_events","type":"Organization","site_admin":false},"repo":{"id":15993612,"name":"couchdb-fauxton","full_name":"apache/couchdb-fauxton","owner":{"login":"apache","id":47359,"avatar_url":"https://avatars.githubusercontent.com/u/47359?v=3","gravatar_id":"","url":"https://api.github.com/users/apache","html_url":"https://github.com/apache","followers_url":"https://api.github.com/users/apache/followers","following_url":"https://api.github.com/users/apache/following{/other_user}","gists_url":"https://api.github.com/users/apache/gists{/gist_id}","starred_url":"https://api.github.com/users/apache/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/apache/subscriptions","organizations_url":"https://api.github.com/users/apache/orgs","repos_url":"https://api.github.com/users/apache/repos","events_url":"https://api.github.com/users/apache/events{/privacy}","received_events_url":"https://api.github.com/users/apache/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/apache/couchdb-fauxton","description":"Mirror of Apache CouchDB","fork":false,"url":"https://api.github.com/repos/apache/couchdb-fauxton","forks_url":"https://api.github.com/repos/apache/couchdb-fauxton/forks","keys_url":"https://api.github.com/repos/apache/couchdb-fauxton/keys{/key_id}","collaborators_url":"https://api.github.com/repos/apache/couchdb-fauxton/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/apache/couchdb-fauxton/teams","hooks_url":"https://api.github.com/repos/apache/couchdb-fauxton/hooks","issue_events_url":"https://api.github.com/repos/apache/couchdb-fauxton/issues/events{/number}","events_url":"https://api.github.com/repos/apache/couchdb-fauxton/events","assignees_url":"https://api.github.com/repos/apache/couchdb-fauxton/assignees{/user}","branches_url":"https://api.github.com/repos/apache/couchdb-fauxton/branches{/branch}","tags_url":"https://api.github.com/repos/apache/couchdb-fauxton/tags","blobs_url":"https://api.github.com/repos/apache/couchdb-fauxton/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/apache/couchdb-fauxton/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/apache/couchdb-fauxton/git/refs{/sha}","trees_url":"https://api.github.com/repos/apache/couchdb-fauxton/git/trees{/sha}","statuses_url":"https://api.github.com/repos/apache/couchdb-fauxton/statuses/{sha}","languages_url":"https://api.github.com/repos/apache/couchdb-fauxton/languages","stargazers_url":"https://api.github.com/repos/apache/couchdb-fauxton/stargazers","contributors_url":"https://api.github.com/repos/apache/couchdb-fauxton/contributors","subscribers_url":"https://api.github.com/repos/apache/couchdb-fauxton/subscribers","subscription_url":"https://api.github.com/repos/apache/couchdb-fauxton/subscription","commits_url":"https://api.github.com/repos/apache/couchdb-fauxton/commits{/sha}","git_commits_url":"https://api.github.com/repos/apache/couchdb-fauxton/git/commits{/sha}","comments_url":"https://api.github.com/repos/apache/couchdb-fauxton/comments{/number}","issue_comment_url":"https://api.github.com/repos/apache/couchdb-fauxton/issues/comments{/number}","contents_url":"https://api.github.com/repos/apache/couchdb-fauxton/contents/{+path}","compare_url":"https://api.github.com/repos/apache/couchdb-fauxton/compare/{base}...{head}","merges_url":"https://api.github.com/repos/apache/couchdb-fauxton/merges","archive_url":"https://api.github.com/repos/apache/couchdb-fauxton/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/apache/couchdb-fauxton/downloads","issues_url":"https://api.github.com/repos/apache/couchdb-fauxton/issues{/number}","pulls_url":"https://api.github.com/repos/apache/couchdb-fauxton/pulls{/number}","milestones_url":"https://api.github.com/repos/apache/couchdb-fauxton/milestones{/number}","notifications_url":"https://api.github.com/repos/apache/couchdb-fauxton/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/apache/couchdb-fauxton/labels{/name}","releases_url":"https://api.github.com/repos/apache/couchdb-fauxton/releases{/id}","deployments_url":"https://api.github.com/repos/apache/couchdb-fauxton/deployments","created_at":"2014-01-17T08:00:08Z","updated_at":"2016-04-10T11:46:40Z","pushed_at":"2016-04-20T13:07:17Z","git_url":"git://github.com/apache/couchdb-fauxton.git","ssh_url":"git@github.com:apache/couchdb-fauxton.git","clone_url":"https://github.com/apache/couchdb-fauxton.git","svn_url":"https://github.com/apache/couchdb-fauxton","homepage":null,"size":9804,"stargazers_count":83,"watchers_count":83,"language":"JavaScript","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":87,"mirror_url":"git://git.apache.org/couchdb-fauxton.git","open_issues_count":20,"forks":87,"open_issues":20,"watchers":83,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/670"},"html":{"href":"https://github.com/apache/couchdb-fauxton/pull/670"},"issue":{"href":"https://api.github.com/repos/apache/couchdb-fauxton/issues/670"},"comments":{"href":"https://api.github.com/repos/apache/couchdb-fauxton/issues/670/comments"},"review_comments":{"href":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/670/comments"},"review_comment":{"href":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/apache/couchdb-fauxton/pulls/670/commits"},"statuses":{"href":"https://api.github.com/repos/apache/couchdb-fauxton/statuses/592adc13962457a58a26395dfef57274be33ac5a"}}}}