{"action":"created","issue":{"url":"https://api.github.com/repos/aisapatino/sjfnw/issues/733","labels_url":"https://api.github.com/repos/aisapatino/sjfnw/issues/733/labels{/name}","comments_url":"https://api.github.com/repos/aisapatino/sjfnw/issues/733/comments","events_url":"https://api.github.com/repos/aisapatino/sjfnw/issues/733/events","html_url":"https://github.com/aisapatino/sjfnw/pull/733","id":61128885,"number":733,"title":"Complete step - combined","user":{"login":"aisapatino","id":1279315,"avatar_url":"https://avatars.githubusercontent.com/u/1279315?v=3","gravatar_id":"","url":"https://api.github.com/users/aisapatino","html_url":"https://github.com/aisapatino","followers_url":"https://api.github.com/users/aisapatino/followers","following_url":"https://api.github.com/users/aisapatino/following{/other_user}","gists_url":"https://api.github.com/users/aisapatino/gists{/gist_id}","starred_url":"https://api.github.com/users/aisapatino/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aisapatino/subscriptions","organizations_url":"https://api.github.com/users/aisapatino/orgs","repos_url":"https://api.github.com/users/aisapatino/repos","events_url":"https://api.github.com/users/aisapatino/events{/privacy}","received_events_url":"https://api.github.com/users/aisapatino/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":2,"created_at":"2015-03-13T16:40:22Z","updated_at":"2015-03-13T20:51:32Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/aisapatino/sjfnw/pulls/733","html_url":"https://github.com/aisapatino/sjfnw/pull/733","diff_url":"https://github.com/aisapatino/sjfnw/pull/733.diff","patch_url":"https://github.com/aisapatino/sjfnw/pull/733.patch"},"body":"@tarhata I took your changes and put them on top of the html revisions I did in #732. I was going to have us do this together, but it's mostly tedious and since they want the new match fields by Wednesday, I thought I'd get this out of the way so we can focus on that when we meet.\r\n\r\nMerged your branch into mine, resolved conflicts, took out things that aren't needed/used.\r\n\r\nAll of `complete_step.html` was one big conflict, so I put your changes in by hand. See the last commit a0d3f2b9e6bd9568a4e95c17cc5aa264c0ae7a7c. I think it's pretty close to what you had. Here's a screenshot - let me know if I missed anything.\r\n\r\n![my fundraising - project central 1](https://cloud.githubusercontent.com/assets/1279315/6642769/8fbc43e8-c964-11e4-9339-7fa8abeb2796.png)\r\n\r\n"},"comment":{"url":"https://api.github.com/repos/aisapatino/sjfnw/issues/comments/79379613","html_url":"https://github.com/aisapatino/sjfnw/pull/733#issuecomment-79379613","issue_url":"https://api.github.com/repos/aisapatino/sjfnw/issues/733","id":79379613,"user":{"login":"tarhata","id":8212941,"avatar_url":"https://avatars.githubusercontent.com/u/8212941?v=3","gravatar_id":"","url":"https://api.github.com/users/tarhata","html_url":"https://github.com/tarhata","followers_url":"https://api.github.com/users/tarhata/followers","following_url":"https://api.github.com/users/tarhata/following{/other_user}","gists_url":"https://api.github.com/users/tarhata/gists{/gist_id}","starred_url":"https://api.github.com/users/tarhata/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tarhata/subscriptions","organizations_url":"https://api.github.com/users/tarhata/orgs","repos_url":"https://api.github.com/users/tarhata/repos","events_url":"https://api.github.com/users/tarhata/events{/privacy}","received_events_url":"https://api.github.com/users/tarhata/received_events","type":"User","site_admin":false},"created_at":"2015-03-13T20:51:31Z","updated_at":"2015-03-13T20:51:31Z","body":"Thanks! I was wondering if there was a magically way to merge my layout changes and your form changes, but I guess it all had to be done manually. It all looks the same to me.\r\n\r\nI'm going to take a stab at programming the gift matching checkbox and text entry field by using the latest master and altering my table locally to test it out. Hopefully it'll be fruitful by our meeting on Sunday..."}}