{"action":"opened","number":27,"pull_request":{"url":"https://api.github.com/repos/superberny70/pelisalacarta/pulls/27","id":123883415,"html_url":"https://github.com/superberny70/pelisalacarta/pull/27","diff_url":"https://github.com/superberny70/pelisalacarta/pull/27.diff","patch_url":"https://github.com/superberny70/pelisalacarta/pull/27.patch","issue_url":"https://api.github.com/repos/superberny70/pelisalacarta/issues/27","number":27,"state":"open","locked":false,"title":"Fix/control parental+buscador global pr#26","user":{"login":"divadres","id":12673480,"avatar_url":"https://avatars2.githubusercontent.com/u/12673480?v=3","gravatar_id":"","url":"https://api.github.com/users/divadres","html_url":"https://github.com/divadres","followers_url":"https://api.github.com/users/divadres/followers","following_url":"https://api.github.com/users/divadres/following{/other_user}","gists_url":"https://api.github.com/users/divadres/gists{/gist_id}","starred_url":"https://api.github.com/users/divadres/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/divadres/subscriptions","organizations_url":"https://api.github.com/users/divadres/orgs","repos_url":"https://api.github.com/users/divadres/repos","events_url":"https://api.github.com/users/divadres/events{/privacy}","received_events_url":"https://api.github.com/users/divadres/received_events","type":"User","site_admin":false},"body":"Buenas, te hago este PR mergeando la rama develop y corrigiendo los conflictos.\r\n\r\nSi vamos a probar, mejor probarlo así, ya que si no nos arriesgamos a que al corregir los conflictos hayan mas errores. ya que aquí están mergeados los cambios en servertools y configuración de servidores, y hay bastantes conflictos...\r\n\r\nHe corregido:\r\n - Al guardar los canales incluidos en el buscador, se quedaba el dialog abierto\r\n - En mediaserver si el pin de los canales para adultos era incorrecto, se quedaba 'cargando...' todo el rato","created_at":"2017-06-04T16:27:19Z","updated_at":"2017-06-04T16:27:19Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"milestone":null,"commits_url":"https://api.github.com/repos/superberny70/pelisalacarta/pulls/27/commits","review_comments_url":"https://api.github.com/repos/superberny70/pelisalacarta/pulls/27/comments","review_comment_url":"https://api.github.com/repos/superberny70/pelisalacarta/pulls/comments{/number}","comments_url":"https://api.github.com/repos/superberny70/pelisalacarta/issues/27/comments","statuses_url":"https://api.github.com/repos/superberny70/pelisalacarta/statuses/5d6c6b02b635c4b44cc7a049b9274105d2264db5","head":{"label":"divadres:fix/control_parental+buscador_global_PR#26","ref":"fix/control_parental+buscador_global_PR#26","sha":"5d6c6b02b635c4b44cc7a049b9274105d2264db5","user":{"login":"divadres","id":12673480,"avatar_url":"https://avatars2.githubusercontent.com/u/12673480?v=3","gravatar_id":"","url":"https://api.github.com/users/divadres","html_url":"https://github.com/divadres","followers_url":"https://api.github.com/users/divadres/followers","following_url":"https://api.github.com/users/divadres/following{/other_user}","gists_url":"https://api.github.com/users/divadres/gists{/gist_id}","starred_url":"https://api.github.com/users/divadres/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/divadres/subscriptions","organizations_url":"https://api.github.com/users/divadres/orgs","repos_url":"https://api.github.com/users/divadres/repos","events_url":"https://api.github.com/users/divadres/events{/privacy}","received_events_url":"https://api.github.com/users/divadres/received_events","type":"User","site_admin":false},"repo":{"id":46171703,"name":"pelisalacarta-oficial","full_name":"divadres/pelisalacarta-oficial","owner":{"login":"divadres","id":12673480,"avatar_url":"https://avatars2.githubusercontent.com/u/12673480?v=3","gravatar_id":"","url":"https://api.github.com/users/divadres","html_url":"https://github.com/divadres","followers_url":"https://api.github.com/users/divadres/followers","following_url":"https://api.github.com/users/divadres/following{/other_user}","gists_url":"https://api.github.com/users/divadres/gists{/gist_id}","starred_url":"https://api.github.com/users/divadres/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/divadres/subscriptions","organizations_url":"https://api.github.com/users/divadres/orgs","repos_url":"https://api.github.com/users/divadres/repos","events_url":"https://api.github.com/users/divadres/events{/privacy}","received_events_url":"https://api.github.com/users/divadres/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/divadres/pelisalacarta-oficial","description":"Media center plugins for spanish TV and movies on demand","fork":true,"url":"https://api.github.com/repos/divadres/pelisalacarta-oficial","forks_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/forks","keys_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/keys{/key_id}","collaborators_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/teams","hooks_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/hooks","issue_events_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/issues/events{/number}","events_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/events","assignees_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/assignees{/user}","branches_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/branches{/branch}","tags_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/tags","blobs_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/git/refs{/sha}","trees_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/git/trees{/sha}","statuses_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/statuses/{sha}","languages_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/languages","stargazers_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/stargazers","contributors_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/contributors","subscribers_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/subscribers","subscription_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/subscription","commits_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/commits{/sha}","git_commits_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/git/commits{/sha}","comments_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/comments{/number}","issue_comment_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/issues/comments{/number}","contents_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/contents/{+path}","compare_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/compare/{base}...{head}","merges_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/merges","archive_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/downloads","issues_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/issues{/number}","pulls_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/pulls{/number}","milestones_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/milestones{/number}","notifications_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/labels{/name}","releases_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/releases{/id}","deployments_url":"https://api.github.com/repos/divadres/pelisalacarta-oficial/deployments","created_at":"2015-11-14T11:16:13Z","updated_at":"2016-10-24T22:30:17Z","pushed_at":"2017-06-04T16:23:52Z","git_url":"git://github.com/divadres/pelisalacarta-oficial.git","ssh_url":"git@github.com:divadres/pelisalacarta-oficial.git","clone_url":"https://github.com/divadres/pelisalacarta-oficial.git","svn_url":"https://github.com/divadres/pelisalacarta-oficial","homepage":"http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta","size":45579,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":0,"forks":1,"open_issues":0,"watchers":0,"default_branch":"develop"}},"base":{"label":"superberny70:FIX/control_parental+buscador_global_PR#26","ref":"FIX/control_parental+buscador_global_PR#26","sha":"83869c8e4b5bd8bbe0ed35a0f63f358129c94886","user":{"login":"superberny70","id":7559559,"avatar_url":"https://avatars2.githubusercontent.com/u/7559559?v=3","gravatar_id":"","url":"https://api.github.com/users/superberny70","html_url":"https://github.com/superberny70","followers_url":"https://api.github.com/users/superberny70/followers","following_url":"https://api.github.com/users/superberny70/following{/other_user}","gists_url":"https://api.github.com/users/superberny70/gists{/gist_id}","starred_url":"https://api.github.com/users/superberny70/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/superberny70/subscriptions","organizations_url":"https://api.github.com/users/superberny70/orgs","repos_url":"https://api.github.com/users/superberny70/repos","events_url":"https://api.github.com/users/superberny70/events{/privacy}","received_events_url":"https://api.github.com/users/superberny70/received_events","type":"User","site_admin":false},"repo":{"id":43489272,"name":"pelisalacarta","full_name":"superberny70/pelisalacarta","owner":{"login":"superberny70","id":7559559,"avatar_url":"https://avatars2.githubusercontent.com/u/7559559?v=3","gravatar_id":"","url":"https://api.github.com/users/superberny70","html_url":"https://github.com/superberny70","followers_url":"https://api.github.com/users/superberny70/followers","following_url":"https://api.github.com/users/superberny70/following{/other_user}","gists_url":"https://api.github.com/users/superberny70/gists{/gist_id}","starred_url":"https://api.github.com/users/superberny70/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/superberny70/subscriptions","organizations_url":"https://api.github.com/users/superberny70/orgs","repos_url":"https://api.github.com/users/superberny70/repos","events_url":"https://api.github.com/users/superberny70/events{/privacy}","received_events_url":"https://api.github.com/users/superberny70/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/superberny70/pelisalacarta","description":"Media center plugins for spanish TV and movies on demand","fork":true,"url":"https://api.github.com/repos/superberny70/pelisalacarta","forks_url":"https://api.github.com/repos/superberny70/pelisalacarta/forks","keys_url":"https://api.github.com/repos/superberny70/pelisalacarta/keys{/key_id}","collaborators_url":"https://api.github.com/repos/superberny70/pelisalacarta/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/superberny70/pelisalacarta/teams","hooks_url":"https://api.github.com/repos/superberny70/pelisalacarta/hooks","issue_events_url":"https://api.github.com/repos/superberny70/pelisalacarta/issues/events{/number}","events_url":"https://api.github.com/repos/superberny70/pelisalacarta/events","assignees_url":"https://api.github.com/repos/superberny70/pelisalacarta/assignees{/user}","branches_url":"https://api.github.com/repos/superberny70/pelisalacarta/branches{/branch}","tags_url":"https://api.github.com/repos/superberny70/pelisalacarta/tags","blobs_url":"https://api.github.com/repos/superberny70/pelisalacarta/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/superberny70/pelisalacarta/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/superberny70/pelisalacarta/git/refs{/sha}","trees_url":"https://api.github.com/repos/superberny70/pelisalacarta/git/trees{/sha}","statuses_url":"https://api.github.com/repos/superberny70/pelisalacarta/statuses/{sha}","languages_url":"https://api.github.com/repos/superberny70/pelisalacarta/languages","stargazers_url":"https://api.github.com/repos/superberny70/pelisalacarta/stargazers","contributors_url":"https://api.github.com/repos/superberny70/pelisalacarta/contributors","subscribers_url":"https://api.github.com/repos/superberny70/pelisalacarta/subscribers","subscription_url":"https://api.github.com/repos/superberny70/pelisalacarta/subscription","commits_url":"https://api.github.com/repos/superberny70/pelisalacarta/commits{/sha}","git_commits_url":"https://api.github.com/repos/superberny70/pelisalacarta/git/commits{/sha}","comments_url":"https://api.github.com/repos/superberny70/pelisalacarta/comments{/number}","issue_comment_url":"https://api.github.com/repos/superberny70/pelisalacarta/issues/comments{/number}","contents_url":"https://api.github.com/repos/superberny70/pelisalacarta/contents/{+path}","compare_url":"https://api.github.com/repos/superberny70/pelisalacarta/compare/{base}...{head}","merges_url":"https://api.github.com/repos/superberny70/pelisalacarta/merges","archive_url":"https://api.github.com/repos/superberny70/pelisalacarta/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/superberny70/pelisalacarta/downloads","issues_url":"https://api.github.com/repos/superberny70/pelisalacarta/issues{/number}","pulls_url":"https://api.github.com/repos/superberny70/pelisalacarta/pulls{/number}","milestones_url":"https://api.github.com/repos/superberny70/pelisalacarta/milestones{/number}","notifications_url":"https://api.github.com/repos/superberny70/pelisalacarta/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/superberny70/pelisalacarta/labels{/name}","releases_url":"https://api.github.com/repos/superberny70/pelisalacarta/releases{/id}","deployments_url":"https://api.github.com/repos/superberny70/pelisalacarta/deployments","created_at":"2015-10-01T09:51:13Z","updated_at":"2016-10-24T16:32:12Z","pushed_at":"2017-06-04T14:53:55Z","git_url":"git://github.com/superberny70/pelisalacarta.git","ssh_url":"git@github.com:superberny70/pelisalacarta.git","clone_url":"https://github.com/superberny70/pelisalacarta.git","svn_url":"https://github.com/superberny70/pelisalacarta","homepage":"http://blog.tvalacarta.info/plugin-xbmc/pelisalacarta","size":45542,"stargazers_count":1,"watchers_count":1,"language":"Python","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":4,"mirror_url":null,"open_issues_count":3,"forks":4,"open_issues":3,"watchers":1,"default_branch":"develop"}},"_links":{"self":{"href":"https://api.github.com/repos/superberny70/pelisalacarta/pulls/27"},"html":{"href":"https://github.com/superberny70/pelisalacarta/pull/27"},"issue":{"href":"https://api.github.com/repos/superberny70/pelisalacarta/issues/27"},"comments":{"href":"https://api.github.com/repos/superberny70/pelisalacarta/issues/27/comments"},"review_comments":{"href":"https://api.github.com/repos/superberny70/pelisalacarta/pulls/27/comments"},"review_comment":{"href":"https://api.github.com/repos/superberny70/pelisalacarta/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/superberny70/pelisalacarta/pulls/27/commits"},"statuses":{"href":"https://api.github.com/repos/superberny70/pelisalacarta/statuses/5d6c6b02b635c4b44cc7a049b9274105d2264db5"}},"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":true,"commits":129,"additions":11562,"deletions":3427,"changed_files":258}}
{"actor":{"display_login":"divadres"}}