{"action":"created","comment":{"url":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/comments/207177514","pull_request_review_id":142733745,"id":207177514,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDIwNzE3NzUxNA==","diff_hunk":"@@ -79,10 +79,14 @@ def decorated_includes(func, includes):\n     url(r'^pages/(?P<page_name>[\\w-]+)/(?P<language_code>[\\w-]+)/$', views.pages, name='pages'),\n     url(r'^securitypages/(?P<page_action>[\\w-]+)/$', views.security_pages, name='security_pages'),\n     url(r'^securitypages/$', views.security_pages, name='security_pages'),\n-    url(r'^password_reset/$', auth_views.password_reset, { 'template_name': 'password_reset.html', 'subject_template_name': 'emails/reset_password_subject.txt', 'email_template_name': 'emails/reset_password.txt', 'html_email_template_name': 'emails/reset_password.html' }, name='password_reset'),\n-    url(r'^password_reset/done/$', auth_views.password_reset_done, { 'template_name': 'password_reset_done.html' }, name='password_reset_done'),\n-    url(r'^reset/(?P<uidb64>[0-9A-Za-z_\\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.password_reset_confirm, { 'template_name': 'password_reset_confirm.html' }, name='password_reset_confirm'),\n-    url(r'^reset/done/$', auth_views.password_reset_complete, { 'template_name': 'password_reset_complete.html' }, name='password_reset_complete'),\n+    #url(r'^password_reset/$', auth_views.PasswordResetView.as_view(template_name='password_reset.html', subject_template_name='emails/reset_password_subject.txt', email_template_name='emails/reset_password.txt', html_email_template_name='emails/reset_password.html'), name='password_reset'),\n+    url(r'^password_reset/$', view=PasswordResetView.as_view(template_name='password_reset.html', subject_template_name='emails/reset_password_subject.txt', email_template_name='emails/reset_password.txt', html_email_template_name='emails/reset_password.html'), name='password_reset'),\n+    #url(r'^password_reset/done/$', auth_views.PasswordResetDoneView.as_view(template_name='password_reset_done.html'), name='password_reset_done'),\n+    url(r'^password_reset/done/$', views.password_reset_done, name='password_reset_done'),\n+    #url(r'^reset/(?P<uidb64>[0-9A-Za-z_\\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', auth_views.PasswordResetConfirmView.as_view(template_name='password_reset_confirm.html'), name='password_reset_confirm'),\n+    url(r'^reset/(?P<uidb64>[0-9A-Za-z_\\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', view=PasswordResetConfirmView.as_view(template_name='password_reset_confirm.html'), name='password_reset_confirm'),\n+    #url(r'^reset/done/$', auth_views.PasswordResetCompleteView.as_view(template_name='password_reset_complete.html'), name='password_reset_complete'),","path":"concierge/urls.py","position":23,"original_position":23,"commit_id":"abdc943813e188b9cc99a5f5cc54b47655e8b9ae","original_commit_id":"abdc943813e188b9cc99a5f5cc54b47655e8b9ae","user":{"login":"bartjkdp","id":5213690,"node_id":"MDQ6VXNlcjUyMTM2OTA=","avatar_url":"https://avatars2.githubusercontent.com/u/5213690?v=4","gravatar_id":"","url":"https://api.github.com/users/bartjkdp","html_url":"https://github.com/bartjkdp","followers_url":"https://api.github.com/users/bartjkdp/followers","following_url":"https://api.github.com/users/bartjkdp/following{/other_user}","gists_url":"https://api.github.com/users/bartjkdp/gists{/gist_id}","starred_url":"https://api.github.com/users/bartjkdp/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bartjkdp/subscriptions","organizations_url":"https://api.github.com/users/bartjkdp/orgs","repos_url":"https://api.github.com/users/bartjkdp/repos","events_url":"https://api.github.com/users/bartjkdp/events{/privacy}","received_events_url":"https://api.github.com/users/bartjkdp/received_events","type":"User","site_admin":false},"body":"these as well?","created_at":"2018-08-02T10:29:31Z","updated_at":"2018-08-02T10:36:37Z","html_url":"https://github.com/Project-Meerkat/concierge/pull/58#discussion_r207177514","pull_request_url":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/58","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/comments/207177514"},"html":{"href":"https://github.com/Project-Meerkat/concierge/pull/58#discussion_r207177514"},"pull_request":{"href":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/58"}}},"pull_request":{"url":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/58","id":203525136,"node_id":"MDExOlB1bGxSZXF1ZXN0MjAzNTI1MTM2","html_url":"https://github.com/Project-Meerkat/concierge/pull/58","diff_url":"https://github.com/Project-Meerkat/concierge/pull/58.diff","patch_url":"https://github.com/Project-Meerkat/concierge/pull/58.patch","issue_url":"https://api.github.com/repos/Project-Meerkat/concierge/issues/58","number":58,"state":"open","locked":false,"title":"Event logging","user":{"login":"AadSchippers","id":30410011,"node_id":"MDQ6VXNlcjMwNDEwMDEx","avatar_url":"https://avatars0.githubusercontent.com/u/30410011?v=4","gravatar_id":"","url":"https://api.github.com/users/AadSchippers","html_url":"https://github.com/AadSchippers","followers_url":"https://api.github.com/users/AadSchippers/followers","following_url":"https://api.github.com/users/AadSchippers/following{/other_user}","gists_url":"https://api.github.com/users/AadSchippers/gists{/gist_id}","starred_url":"https://api.github.com/users/AadSchippers/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/AadSchippers/subscriptions","organizations_url":"https://api.github.com/users/AadSchippers/orgs","repos_url":"https://api.github.com/users/AadSchippers/repos","events_url":"https://api.github.com/users/AadSchippers/events{/privacy}","received_events_url":"https://api.github.com/users/AadSchippers/received_events","type":"User","site_admin":false},"body":"This feature adds event logging for the following events:\r\n\r\n    ACCOUNT_DELETED = 'ACDEL'\r\n    EMAIL_CHANGE_PENDING = 'ECPEN'\r\n    EMAIL_CHANGE_CONFIRMED = 'ECCON'\r\n    INVALID_LOGIN_BACKUP_TOKEN = 'ILBTK'\r\n    INVALID_LOGIN_TOKEN = 'ILTK '\r\n    INVALID_LOGIN_USERID_PASSWORD = 'ILUP '\r\n    PASSWORD_CHANGED = 'PWCH '\r\n    PASSWORD_RESET = 'PWRES'\r\n    PASSWORD_REQUESTED = 'PWRQ '\r\n    PASSWORD_SET = 'PWSET'\r\n    REGISTRATION_CONFIRMED = 'REGCF'\r\n    USER_LOGGED_IN = 'ULIN '\r\n    USER_LOGGED_OUT = 'ULOUT'\r\n    USER_REGISTERED = 'ULREG'\r\n    TFA_ENABLED = '2FAON'\r\n    TFA_DISABLED = '2FAOF'\r\n\r\nDjang Admin is used to browse the EventLog, the EventLog can however not be altered. Text filters are available to select specific userids, email and IP addresses. Events can be selected using a standard filter with fixed choices. ","created_at":"2018-07-24T13:23:12Z","updated_at":"2018-08-02T10:36:37Z","closed_at":null,"merged_at":null,"merge_commit_sha":"cf76ccec7a1701ee3a31bf6655d91937ec0fbfc5","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/58/commits","review_comments_url":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/58/comments","review_comment_url":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Project-Meerkat/concierge/issues/58/comments","statuses_url":"https://api.github.com/repos/Project-Meerkat/concierge/statuses/abdc943813e188b9cc99a5f5cc54b47655e8b9ae","head":{"label":"Project-Meerkat:events","ref":"events","sha":"abdc943813e188b9cc99a5f5cc54b47655e8b9ae","user":{"login":"Project-Meerkat","id":33261393,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMzMjYxMzkz","avatar_url":"https://avatars1.githubusercontent.com/u/33261393?v=4","gravatar_id":"","url":"https://api.github.com/users/Project-Meerkat","html_url":"https://github.com/Project-Meerkat","followers_url":"https://api.github.com/users/Project-Meerkat/followers","following_url":"https://api.github.com/users/Project-Meerkat/following{/other_user}","gists_url":"https://api.github.com/users/Project-Meerkat/gists{/gist_id}","starred_url":"https://api.github.com/users/Project-Meerkat/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Project-Meerkat/subscriptions","organizations_url":"https://api.github.com/users/Project-Meerkat/orgs","repos_url":"https://api.github.com/users/Project-Meerkat/repos","events_url":"https://api.github.com/users/Project-Meerkat/events{/privacy}","received_events_url":"https://api.github.com/users/Project-Meerkat/received_events","type":"Organization","site_admin":false},"repo":{"id":86056009,"node_id":"MDEwOlJlcG9zaXRvcnk4NjA1NjAwOQ==","name":"concierge","full_name":"Project-Meerkat/concierge","owner":{"login":"Project-Meerkat","id":33261393,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMzMjYxMzkz","avatar_url":"https://avatars1.githubusercontent.com/u/33261393?v=4","gravatar_id":"","url":"https://api.github.com/users/Project-Meerkat","html_url":"https://github.com/Project-Meerkat","followers_url":"https://api.github.com/users/Project-Meerkat/followers","following_url":"https://api.github.com/users/Project-Meerkat/following{/other_user}","gists_url":"https://api.github.com/users/Project-Meerkat/gists{/gist_id}","starred_url":"https://api.github.com/users/Project-Meerkat/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Project-Meerkat/subscriptions","organizations_url":"https://api.github.com/users/Project-Meerkat/orgs","repos_url":"https://api.github.com/users/Project-Meerkat/repos","events_url":"https://api.github.com/users/Project-Meerkat/events{/privacy}","received_events_url":"https://api.github.com/users/Project-Meerkat/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Project-Meerkat/concierge","description":"OAuth2 and OpenID microservice used for handling user registration, login and SAML2 SSO","fork":false,"url":"https://api.github.com/repos/Project-Meerkat/concierge","forks_url":"https://api.github.com/repos/Project-Meerkat/concierge/forks","keys_url":"https://api.github.com/repos/Project-Meerkat/concierge/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Project-Meerkat/concierge/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Project-Meerkat/concierge/teams","hooks_url":"https://api.github.com/repos/Project-Meerkat/concierge/hooks","issue_events_url":"https://api.github.com/repos/Project-Meerkat/concierge/issues/events{/number}","events_url":"https://api.github.com/repos/Project-Meerkat/concierge/events","assignees_url":"https://api.github.com/repos/Project-Meerkat/concierge/assignees{/user}","branches_url":"https://api.github.com/repos/Project-Meerkat/concierge/branches{/branch}","tags_url":"https://api.github.com/repos/Project-Meerkat/concierge/tags","blobs_url":"https://api.github.com/repos/Project-Meerkat/concierge/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Project-Meerkat/concierge/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Project-Meerkat/concierge/git/refs{/sha}","trees_url":"https://api.github.com/repos/Project-Meerkat/concierge/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Project-Meerkat/concierge/statuses/{sha}","languages_url":"https://api.github.com/repos/Project-Meerkat/concierge/languages","stargazers_url":"https://api.github.com/repos/Project-Meerkat/concierge/stargazers","contributors_url":"https://api.github.com/repos/Project-Meerkat/concierge/contributors","subscribers_url":"https://api.github.com/repos/Project-Meerkat/concierge/subscribers","subscription_url":"https://api.github.com/repos/Project-Meerkat/concierge/subscription","commits_url":"https://api.github.com/repos/Project-Meerkat/concierge/commits{/sha}","git_commits_url":"https://api.github.com/repos/Project-Meerkat/concierge/git/commits{/sha}","comments_url":"https://api.github.com/repos/Project-Meerkat/concierge/comments{/number}","issue_comment_url":"https://api.github.com/repos/Project-Meerkat/concierge/issues/comments{/number}","contents_url":"https://api.github.com/repos/Project-Meerkat/concierge/contents/{+path}","compare_url":"https://api.github.com/repos/Project-Meerkat/concierge/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Project-Meerkat/concierge/merges","archive_url":"https://api.github.com/repos/Project-Meerkat/concierge/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Project-Meerkat/concierge/downloads","issues_url":"https://api.github.com/repos/Project-Meerkat/concierge/issues{/number}","pulls_url":"https://api.github.com/repos/Project-Meerkat/concierge/pulls{/number}","milestones_url":"https://api.github.com/repos/Project-Meerkat/concierge/milestones{/number}","notifications_url":"https://api.github.com/repos/Project-Meerkat/concierge/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Project-Meerkat/concierge/labels{/name}","releases_url":"https://api.github.com/repos/Project-Meerkat/concierge/releases{/id}","deployments_url":"https://api.github.com/repos/Project-Meerkat/concierge/deployments","created_at":"2017-03-24T10:25:44Z","updated_at":"2018-08-02T09:43:21Z","pushed_at":"2018-08-02T09:43:20Z","git_url":"git://github.com/Project-Meerkat/concierge.git","ssh_url":"git@github.com:Project-Meerkat/concierge.git","clone_url":"https://github.com/Project-Meerkat/concierge.git","svn_url":"https://github.com/Project-Meerkat/concierge","homepage":"","size":25712,"stargazers_count":4,"watchers_count":4,"language":"CSS","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":5,"mirror_url":null,"archived":false,"open_issues_count":8,"license":{"key":"eupl-1.1","name":"European Union Public License 1.1","spdx_id":"EUPL-1.1","url":"https://api.github.com/licenses/eupl-1.1","node_id":"MDc6TGljZW5zZTI0"},"forks":5,"open_issues":8,"watchers":4,"default_branch":"master"}},"base":{"label":"Project-Meerkat:master","ref":"master","sha":"79f540201cf541728bf6c47070f30fd57bb849d8","user":{"login":"Project-Meerkat","id":33261393,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMzMjYxMzkz","avatar_url":"https://avatars1.githubusercontent.com/u/33261393?v=4","gravatar_id":"","url":"https://api.github.com/users/Project-Meerkat","html_url":"https://github.com/Project-Meerkat","followers_url":"https://api.github.com/users/Project-Meerkat/followers","following_url":"https://api.github.com/users/Project-Meerkat/following{/other_user}","gists_url":"https://api.github.com/users/Project-Meerkat/gists{/gist_id}","starred_url":"https://api.github.com/users/Project-Meerkat/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Project-Meerkat/subscriptions","organizations_url":"https://api.github.com/users/Project-Meerkat/orgs","repos_url":"https://api.github.com/users/Project-Meerkat/repos","events_url":"https://api.github.com/users/Project-Meerkat/events{/privacy}","received_events_url":"https://api.github.com/users/Project-Meerkat/received_events","type":"Organization","site_admin":false},"repo":{"id":86056009,"node_id":"MDEwOlJlcG9zaXRvcnk4NjA1NjAwOQ==","name":"concierge","full_name":"Project-Meerkat/concierge","owner":{"login":"Project-Meerkat","id":33261393,"node_id":"MDEyOk9yZ2FuaXphdGlvbjMzMjYxMzkz","avatar_url":"https://avatars1.githubusercontent.com/u/33261393?v=4","gravatar_id":"","url":"https://api.github.com/users/Project-Meerkat","html_url":"https://github.com/Project-Meerkat","followers_url":"https://api.github.com/users/Project-Meerkat/followers","following_url":"https://api.github.com/users/Project-Meerkat/following{/other_user}","gists_url":"https://api.github.com/users/Project-Meerkat/gists{/gist_id}","starred_url":"https://api.github.com/users/Project-Meerkat/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Project-Meerkat/subscriptions","organizations_url":"https://api.github.com/users/Project-Meerkat/orgs","repos_url":"https://api.github.com/users/Project-Meerkat/repos","events_url":"https://api.github.com/users/Project-Meerkat/events{/privacy}","received_events_url":"https://api.github.com/users/Project-Meerkat/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Project-Meerkat/concierge","description":"OAuth2 and OpenID microservice used for handling user registration, login and SAML2 SSO","fork":false,"url":"https://api.github.com/repos/Project-Meerkat/concierge","forks_url":"https://api.github.com/repos/Project-Meerkat/concierge/forks","keys_url":"https://api.github.com/repos/Project-Meerkat/concierge/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Project-Meerkat/concierge/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Project-Meerkat/concierge/teams","hooks_url":"https://api.github.com/repos/Project-Meerkat/concierge/hooks","issue_events_url":"https://api.github.com/repos/Project-Meerkat/concierge/issues/events{/number}","events_url":"https://api.github.com/repos/Project-Meerkat/concierge/events","assignees_url":"https://api.github.com/repos/Project-Meerkat/concierge/assignees{/user}","branches_url":"https://api.github.com/repos/Project-Meerkat/concierge/branches{/branch}","tags_url":"https://api.github.com/repos/Project-Meerkat/concierge/tags","blobs_url":"https://api.github.com/repos/Project-Meerkat/concierge/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Project-Meerkat/concierge/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Project-Meerkat/concierge/git/refs{/sha}","trees_url":"https://api.github.com/repos/Project-Meerkat/concierge/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Project-Meerkat/concierge/statuses/{sha}","languages_url":"https://api.github.com/repos/Project-Meerkat/concierge/languages","stargazers_url":"https://api.github.com/repos/Project-Meerkat/concierge/stargazers","contributors_url":"https://api.github.com/repos/Project-Meerkat/concierge/contributors","subscribers_url":"https://api.github.com/repos/Project-Meerkat/concierge/subscribers","subscription_url":"https://api.github.com/repos/Project-Meerkat/concierge/subscription","commits_url":"https://api.github.com/repos/Project-Meerkat/concierge/commits{/sha}","git_commits_url":"https://api.github.com/repos/Project-Meerkat/concierge/git/commits{/sha}","comments_url":"https://api.github.com/repos/Project-Meerkat/concierge/comments{/number}","issue_comment_url":"https://api.github.com/repos/Project-Meerkat/concierge/issues/comments{/number}","contents_url":"https://api.github.com/repos/Project-Meerkat/concierge/contents/{+path}","compare_url":"https://api.github.com/repos/Project-Meerkat/concierge/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Project-Meerkat/concierge/merges","archive_url":"https://api.github.com/repos/Project-Meerkat/concierge/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Project-Meerkat/concierge/downloads","issues_url":"https://api.github.com/repos/Project-Meerkat/concierge/issues{/number}","pulls_url":"https://api.github.com/repos/Project-Meerkat/concierge/pulls{/number}","milestones_url":"https://api.github.com/repos/Project-Meerkat/concierge/milestones{/number}","notifications_url":"https://api.github.com/repos/Project-Meerkat/concierge/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Project-Meerkat/concierge/labels{/name}","releases_url":"https://api.github.com/repos/Project-Meerkat/concierge/releases{/id}","deployments_url":"https://api.github.com/repos/Project-Meerkat/concierge/deployments","created_at":"2017-03-24T10:25:44Z","updated_at":"2018-08-02T09:43:21Z","pushed_at":"2018-08-02T09:43:20Z","git_url":"git://github.com/Project-Meerkat/concierge.git","ssh_url":"git@github.com:Project-Meerkat/concierge.git","clone_url":"https://github.com/Project-Meerkat/concierge.git","svn_url":"https://github.com/Project-Meerkat/concierge","homepage":"","size":25712,"stargazers_count":4,"watchers_count":4,"language":"CSS","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":5,"mirror_url":null,"archived":false,"open_issues_count":8,"license":{"key":"eupl-1.1","name":"European Union Public License 1.1","spdx_id":"EUPL-1.1","url":"https://api.github.com/licenses/eupl-1.1","node_id":"MDc6TGljZW5zZTI0"},"forks":5,"open_issues":8,"watchers":4,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/58"},"html":{"href":"https://github.com/Project-Meerkat/concierge/pull/58"},"issue":{"href":"https://api.github.com/repos/Project-Meerkat/concierge/issues/58"},"comments":{"href":"https://api.github.com/repos/Project-Meerkat/concierge/issues/58/comments"},"review_comments":{"href":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/58/comments"},"review_comment":{"href":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Project-Meerkat/concierge/pulls/58/commits"},"statuses":{"href":"https://api.github.com/repos/Project-Meerkat/concierge/statuses/abdc943813e188b9cc99a5f5cc54b47655e8b9ae"}},"author_association":"COLLABORATOR"}}
{"actor":{"display_login":"bartjkdp"}}