{"push_id":1363322377,"size":16,"distinct_size":16,"ref":"refs/heads/mass_commercials","head":"2914dfaae5bc2a94c1be0ccfc7ac31aa9e3e9f1f","before":"b5c46302ee7653340cdefe8dae08de837e055159","commits":[{"sha":"70e0f42bbb6c396afa4d13b41dc3a29ba3451084","author":{"name":"Rob Smith","email":"3843ca6ea075b39fc2509c2aa2449ff56cb96ba5@gmail.com"},"message":"Support JSONP callbacks for the API/v1 endpoints\n\nSeaGL currently uses OSEM as a backend, but still has a static website\nserving as our public interface. The API endpoints have a great amount\nof data, but without the jsonp callback paramater, embedding the data\nis a bit difficult. This change just adds the jsonp callback param\nto all the API endpoints. This should be a NOOP for anyone using direct\njson calls, but will allow cross domain requests that require jsonp.","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/70e0f42bbb6c396afa4d13b41dc3a29ba3451084"},{"sha":"de4563ddb1a2ef95e58de2eaae4b102ac8275de4","author":{"name":"Rob Smith","email":"3843ca6ea075b39fc2509c2aa2449ff56cb96ba5@gmail.com"},"message":"Remote forgery protection for json requests to the api/v1 endpoints\n\nDue to my testing, I incorrectly removed the forgery protection\nskip action from the controllers in the api. This fixes that and allows jsonp\ncalls to work correctly","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/de4563ddb1a2ef95e58de2eaae4b102ac8275de4"},{"sha":"3daf624d7529ef50ea22c1a4620bac9a82fd122a","author":{"name":"richiethomas","email":"e2a77fa181a6e978d25c58dc36415a3b755fbe29"},"message":"Fix admin conferences program events#show page, now only shows a red X when commercial is missing","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/3daf624d7529ef50ea22c1a4620bac9a82fd122a"},{"sha":"66244a92fdcd156531eb36f0472208f27cf1fbbf","author":{"name":"Stella Rouzi","email":"6fd7aa2377310a8b4a87c903c081f74e4dfcd894@gmail.com"},"message":"Merge pull request #1200 from richiethomas/commercial\n\nFix admin conferences program events#show page, now only shows a red X when commercial is missing","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/66244a92fdcd156531eb36f0472208f27cf1fbbf"},{"sha":"7f843a3a13d7058cf4c5d11754a0f23084d81515","author":{"name":"Ana","email":"26fcaf88b5ff828f8b9d5267cdf34ec5f8bc1031@gmail.com"},"message":"Remove unnecessary code from conference_controller\n\nRemove unnecessary code from conference_controller#update.","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/7f843a3a13d7058cf4c5d11754a0f23084d81515"},{"sha":"b02792464dd47dc618c26b396bc5d8895d10bdd1","author":{"name":"Stella Rouzi","email":"6fd7aa2377310a8b4a87c903c081f74e4dfcd894@gmail.com"},"message":"Merge pull request #1187 from Ana06/conference\n\nRemove unnecessary code from conference_controller","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/b02792464dd47dc618c26b396bc5d8895d10bdd1"},{"sha":"d1c0c7d97ae6fd0f510c31ec70459b255b166bca","author":{"name":"Rishabh Saxena","email":"bec46c586847378a46ed89ff5941e043d5252c2a@gmail.com"},"message":"registration#delete: retain ticket purchases","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/d1c0c7d97ae6fd0f510c31ec70459b255b166bca"},{"sha":"0b77fd4afe3551640c67574c0c7ebc2cc3a6d5f9","author":{"name":"Stella Rouzi","email":"6fd7aa2377310a8b4a87c903c081f74e4dfcd894@gmail.com"},"message":"Merge pull request #1164 from rishabhs95/ticket-deletion\n\nDon't delete user's purchased tickets after user unregisters","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/0b77fd4afe3551640c67574c0c7ebc2cc3a6d5f9"},{"sha":"cfdf4e331ad673da342383a9d9166bb8f7bcfb05","author":{"name":"desantonop","email":"41c082ce0163c812d68de972fb3079b22c86821e@gmail.com"},"message":"Makes admin/tickets#index datatable","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/cfdf4e331ad673da342383a9d9166bb8f7bcfb05"},{"sha":"0b6550d06078d33e664c58adfb45a76d4c49b8b4","author":{"name":"Stella Rouzi","email":"6fd7aa2377310a8b4a87c903c081f74e4dfcd894@gmail.com"},"message":"Merge pull request #1203 from desantonop/datatable\n\nMakes admin/tickets#index datatable","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/0b6550d06078d33e664c58adfb45a76d4c49b8b4"},{"sha":"daf1f805bd16fbf22fbe25f5224dd022b5e082cc","author":{"name":"richiethomas","email":"e2a77fa181a6e978d25c58dc36415a3b755fbe29"},"message":"Rename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController'","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/daf1f805bd16fbf22fbe25f5224dd022b5e082cc"},{"sha":"274fd25e30305217a311c79b9f0271d2bd761d70","author":{"name":"Stella Rouzi","email":"6fd7aa2377310a8b4a87c903c081f74e4dfcd894@gmail.com"},"message":"Merge pull request #1207 from richiethomas/pluralize\n\nRename 'ConferenceController' to 'ConferencesController', and 'ProposalController' to 'ProposalsController'","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/274fd25e30305217a311c79b9f0271d2bd761d70"},{"sha":"1ca6559400dcb339753f517d15a74caa116a99c2","author":{"name":"AEtherC0r3","email":"54f6ee956bda1aca234e480eeb1fb52e038a7a09@users.noreply.github.com"},"message":"Converts old ruby syntax to new in admin/emails#index","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/1ca6559400dcb339753f517d15a74caa116a99c2"},{"sha":"7cc2609662dd6e1c581c74a36c87edd57e6b82ab","author":{"name":"Stella Rouzi","email":"6fd7aa2377310a8b4a87c903c081f74e4dfcd894@gmail.com"},"message":"Merge pull request #1189 from kormoc/support_jsonp_in_api\n\nSupport JSONP callbacks for the API/v1 endpoints","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/7cc2609662dd6e1c581c74a36c87edd57e6b82ab"},{"sha":"5001e1c7d8954ee0b944f0daa4ca3ce0464e7c65","author":{"name":"Stella Rouzi","email":"6fd7aa2377310a8b4a87c903c081f74e4dfcd894@gmail.com"},"message":"Merge pull request #1214 from AEtherC0r3/master\n\nConverts old ruby syntax to new in admin/emails#index","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/5001e1c7d8954ee0b944f0daa4ca3ce0464e7c65"},{"sha":"2914dfaae5bc2a94c1be0ccfc7ac31aa9e3e9f1f","author":{"name":"Stella Rouzi","email":"6fd7aa2377310a8b4a87c903c081f74e4dfcd894@gmail.com"},"message":"Mass import of Commercials #1055","distinct":true,"url":"https://api.github.com/repos/differentreality/osem/commits/2914dfaae5bc2a94c1be0ccfc7ac31aa9e3e9f1f"}]}
{"actor":{"display_login":"differentreality"}}