{"commits":[{"author":{"email":"c4fe2b1d90ef8f2548c8aeabfa633434316f0305@instructure.com","name":"Cody Cutrer"},"sha":"df55776d071e765bb64cd0b75cf2185dd4a8dbb7","message":"remove completely unused aborted workflow state\n\ntest plan: n/a\n\nChange-Id: I85628abbc211d07ee1fb4abba028eea4b71e93be\nReviewed-on: https://gerrit.instructure.com/7041\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: JT Olds <jt@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/df55776d071e765bb64cd0b75cf2185dd4a8dbb7"},{"author":{"email":"3cb4e1df5ec4da2c7c4af7c52cec8cf340a55a10@instructure.com","name":"Brian Palmer"},"sha":"c1bfe404fedbc10be24e4ce282fec6ba79e268c0","message":"prepend protection loop to json responses in app ajax calls\n\nWe are now prepending all json responses with \"while(1);\" to protect\nagainst browsers that allow stealing this information from a <script>\ntag on third-party sites, by overriding constructors or property\ngetters/setters.\n\nthis loop is not prepended to API requests, unless those requests are\nauthenticated via a session cookie (canvas itself makes API\nrequests using the user's session, but we don't want third-party apps to\nhave to remove the loop before parsing).\n\nfixes #6459\n\nChange-Id: Icf00056d4d7fba198a8957892af09cdd84d55bc4\ntestplan:\n  * Do anything in the application that results in a AJAX request\n    returning JSON -- for instance, load your list of conversations.\n  * Use a web inspector to verify that the canvas is returning the JSON\n    response with this prepended loop, but that the javascript code\n    handles that and still can parse the response.\n  * Make API calls to Canvas, verify that nothing is prepended to the\n    JSON responses.\nReviewed-on: https://gerrit.instructure.com/7144\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Jon Jensen <jon@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/c1bfe404fedbc10be24e4ce282fec6ba79e268c0"},{"author":{"email":"514dbb4d54d4f29e454990df7d075678f43f92aa@instructure.com","name":"Zach Pendleton"},"sha":"6d5ddda4c5f6d2428a829af1ad801984c3acbf00","message":"correctly update quiz status re: essay questions. fixes #5436\n\nWhen student submits a quiz with an essay question, it now\ndisplays as ungraded in Speedgrader until the grader reviews/\ngrades the essay question.\n\ntest plan:\n1. create a quiz with an essay question;\n2. complete the quiz;\n3. view the quiz assignment in speedgrader;\n4. verify that assignment is marked as \"not graded\"\n   in the student dropdown menu;\n5. grade the essay question;\n6. verify that the assignment is now marked as \"graded\"\n   in the student dropdown menu.\n\nChange-Id: I67ca56df2ec08380c75aa1ddf64fe8848e2b574d\nReviewed-on: https://gerrit.instructure.com/6619\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Jon Jensen <jon@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/6d5ddda4c5f6d2428a829af1ad801984c3acbf00"},{"author":{"email":"3cb4e1df5ec4da2c7c4af7c52cec8cf340a55a10@instructure.com","name":"Brian Palmer"},"sha":"3487da255b402f07266fe8639f80540b50f8623e","message":"s/JSON.parse/$.parseJSON in javascript\n\nNow that we're adding the prefix to our JSON responses, we need to be\nsure to go through our modified jquery json parser function.\n\ntestplan:\n  * make sure that conversations paging now works again\n  * check other actions that use pageless, like user page views\n\nthis fixes some existing selenium specs, like in conversations.\n\nrefs #6459\n\nChange-Id: I2652fc7a7acef099fe163a63e6b3933ddb2e9360\nReviewed-on: https://gerrit.instructure.com/7188\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Zach Wily <zach@instructure.com>\nReviewed-by: Jon Jensen <jon@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/3487da255b402f07266fe8639f80540b50f8623e"},{"author":{"email":"9de8c4480303b5335cd2a33eefe814615ba3612a@instructure.com","name":"Zach Wily"},"sha":"a74962833c6b165810ca7be768af644462f5bf34","message":"translate links on imported assessment questions\n\nPreviously, assessment questions created via imports did not get their links\ntranslated, since they are created with straight SQL. For now we will detect\nwhen a question possibly has a link inside, and if it does, load the AQ model\nand run translate_links on it.\n\nThis also includes a fix to translate_links to find them inside arrays too\n(like in the answers array).\n\ntestplan:\n * import a QTI package with images in the questions and answer feedback\n * verify that the new questions in your question banks have links pointing to\n   /assessment_questions/ and not /courses/ for the images\n * the existing translate_links specs cover the translate_links refactor\n\nChange-Id: Idf36e65ef6a9887369feb1b2cdcbb2db1f2f70f3\nReviewed-on: https://gerrit.instructure.com/7136\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Bracken Mosbacker <bracken@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/a74962833c6b165810ca7be768af644462f5bf34"},{"author":{"email":"ea3cd978650417470535f3a4725b6b5042a6ab59@instructure.com","name":"Ryan Shaw"},"sha":"1b1c015dd424d6637e981d46e269fe015d2f8797","message":"fix $.detect to have right argument order\n\nChange-Id: I0c53059d4032d7c4f2a53b697d4a2dcc1bf70773\nReviewed-on: https://gerrit.instructure.com/7151\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Ryan Florence <ryanf@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/1b1c015dd424d6637e981d46e269fe015d2f8797"},{"author":{"email":"0857133ffcd232122dc51ad55bf5fcc9d60af5d3@instructure.com","name":"JT Olds"},"sha":"28c7973b018c5d84e2a6b1da646dff43d851ecee","message":"simplifying and correcting the stats library\n\ntestplan:\n  * make a quiz and have a few students take it. check the\n    quiz stats and make sure the average, max, min, and standard\n    deviation are right.\n  * make a quiz with no submissions and make sure the statistics\n    aren't rendered where it makes no sense\n\nChange-Id: I4dae0beaa85f606e22ba6d7e43787fe0922372e3\nReviewed-on: https://gerrit.instructure.com/7101\nReviewed-by: John Harrison <john@instructure.com>\nTested-by: JT Olds <jt@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/28c7973b018c5d84e2a6b1da646dff43d851ecee"},{"author":{"email":"ea3cd978650417470535f3a4725b6b5042a6ab59@instructure.com","name":"Ryan Shaw"},"sha":"d3e8c8c6c280656b7f7b092d040057bacde03464","message":"get rid of compiled js files where cs was deleted\n\nChange-Id: Iab9253f1c5c93a0d4fdfc1bc6160220aaef9b0ec\nReviewed-on: https://gerrit.instructure.com/7184\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Ryan Florence <ryanf@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/d3e8c8c6c280656b7f7b092d040057bacde03464"},{"author":{"email":"ea3cd978650417470535f3a4725b6b5042a6ab59@instructure.com","name":"Ryan Shaw"},"sha":"73cc5b1ade8808c91d261da4ca83cee1c0a694d5","message":"gitignore javascript spec helpers\n\nthey should be written in coffeescript\n\nChange-Id: I82a9a86b9f31ac0155caeac4a8ac8bb7b17c7059\nReviewed-on: https://gerrit.instructure.com/7185\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Ryan Florence <ryanf@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/73cc5b1ade8808c91d261da4ca83cee1c0a694d5"},{"author":{"email":"0a3ba1af216659500dd8f41e29f3979f42452870@instructure.com","name":"Bryan Madsen"},"sha":"a7bb281dcdd7de7a402ac3d4624a16f5a11ed08e","message":"retry starting and stopping remote selenium clients\n\nThese are needed for selenium tests executed on ec2, because errors\nfrequently occur from these locations\n\nChange-Id: I1b61f3c4eb7513e4d298dfde770363a46ce799f0\nReviewed-on: https://gerrit.instructure.com/7097\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Zach Wily <zach@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/a7bb281dcdd7de7a402ac3d4624a16f5a11ed08e"},{"author":{"email":"f862f167b85d41b225785c70d70808bc7337c1fe@instructure.com","name":"Jacob Fugal"},"sha":"78807849f7e65e7f9dc0aa917348f37056c5566d","message":"don't try and remove old batches without a term\n\ntest-plan:\n - import a course, a section, and an enrollment as a sis batch\n - import another sis batch that doesn't include the previous imported\n   entities without specifying a term\n - none of the original course, section, and enrollment should be\n   deleted\n\nChange-Id: Ia03d4abf8c86d2ebd14987357ad073033ab28700\nReviewed-on: https://gerrit.instructure.com/7168\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: JT Olds <jt@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/78807849f7e65e7f9dc0aa917348f37056c5566d"},{"author":{"email":"ea3cd978650417470535f3a4725b6b5042a6ab59@instructure.com","name":"Ryan Shaw"},"sha":"ae6b766f6dfc6e65169ed199baac9a6097084c9c","message":"Revert taking feedback partial out of layout\n\nit got taken out in the \"reflect i18n language\nin lang attribute commit\" it should go with the\nhelp dialog overhaul commit.\n\nChange-Id: Ie06901a884e0c63c5c48652feb3e13bcbe8dcde1\nReviewed-on: https://gerrit.instructure.com/7189\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Brian Palmer <brianp@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/ae6b766f6dfc6e65169ed199baac9a6097084c9c"},{"author":{"email":"3cb4e1df5ec4da2c7c4af7c52cec8cf340a55a10@instructure.com","name":"Brian Palmer"},"sha":"e4033a9e446a65a3d7b8275dfe8fa57c244e0bd4","message":"force rendering json as text in file-related actions\n\nrefs #6459\n\nthese actions were previously rendering json as text, before our recent\nchange to prefix the \"while(1);\" protection to json responses. in that\ncommit, they got changed to rendering the json as application/json,\nwhich causes some browsers (IE, FF, maybe others) to try to download the\nresponse. this adds an explicit as_text parameter to render to force\nrendering as text, even if content-type isn't multipart, and adds\nas_text to all the actions that used to render json as text.\n\ntestplan: in firefox, uploading to s3, try submitting homework and\nuploading a content migration package (such as .imscc). the uploads\nshould succeed, and you shouldn't see any browser download prompt.\n\nthis fixes existing selenium specs for file_uploads_spec and others.\n\nChange-Id: Iacf9093d233c8253a5dd5b30ecb9fcd860c5fcbf\nReviewed-on: https://gerrit.instructure.com/7190\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Brian Palmer <brianp@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/e4033a9e446a65a3d7b8275dfe8fa57c244e0bd4"},{"author":{"email":"760e7dab2836853c63805033e514668301fa9c47@instructure.com","name":"Brian Whitmer"},"sha":"e347c927e21de4e25df2d4f8999948c890a5462b","message":"allow relative urls for everything except blti and oembed\n\nChange-Id: Ie06d6e2bfbdf20cd58d20a9a5b9b36e297e0261f\nReviewed-on: https://gerrit.instructure.com/7179\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Brian Palmer <brianp@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/e347c927e21de4e25df2d4f8999948c890a5462b"},{"author":{"email":"9de8c4480303b5335cd2a33eefe814615ba3612a@instructure.com","name":"Zach Wily"},"sha":"ba73b76bfc163e05d159a3ea84a27a07c3d1d396","message":"fix some pageless calls (switching to $.parseJSON)\n\nThese were missed when we changed all the JSON.parse calls to $.parseJSON to\nsupport the new security measures around JSON data sniffing.\n\nRefs #6459\n\nTest Plan: Check that the pageless contents loading still works for\nannouncements, inbox items, page views on a user profile, discussion topics,\nand wiki pages.\n\nChange-Id: I3e0b4dafb99aed692a16ac336dd7001735ab0ee8\nReviewed-on: https://gerrit.instructure.com/7192\nReviewed-by: Jacob Fugal <jacob@instructure.com>\nTested-by: Hudson <hudson@instructure.com>\nReviewed-by: Brian Palmer <brianp@instructure.com>","url":"https://api.github.com/repos/instructure/canvas-lms/commits/ba73b76bfc163e05d159a3ea84a27a07c3d1d396"}],"ref":"refs/heads/master","head":"ba73b76bfc163e05d159a3ea84a27a07c3d1d396","size":15,"push_id":51891802}