{"push_id":855893219,"size":12,"distinct_size":0,"ref":"refs/heads/ora-staff-grading","head":"5c10c3e5bb84353f8caece64164cc3606084a14c","before":"f53a54d79b56769c73324a0a4b2dbda45958b0f7","commits":[{"sha":"cda560ca7e09a3906766ed0a71dd30122f204808","author":{"email":"04b66ffb2360c42ea91fdf2fb99d31cafab10efd@edx.org","name":"Andy Armstrong"},"message":"Implement new toolbar for staff area\n\nTNL-3466","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/cda560ca7e09a3906766ed0a71dd30122f204808"},{"sha":"454d16e0a4cec8e5c6b04636c23a918ee1873763","author":{"email":"04b66ffb2360c42ea91fdf2fb99d31cafab10efd@edx.org","name":"Andy Armstrong"},"message":"Rename files without losing history","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/454d16e0a4cec8e5c6b04636c23a918ee1873763"},{"sha":"ea2cfaae6ba2d1663f1fd95675972b0f38ff8aef","author":{"email":"04b66ffb2360c42ea91fdf2fb99d31cafab10efd@edx.org","name":"Andy Armstrong"},"message":"Merge pull request #747 from edx/andya/add-staff-tools\n\nImplement ORA staff toolbar","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/ea2cfaae6ba2d1663f1fd95675972b0f38ff8aef"},{"sha":"1a1128be91f16d23c07754388dfeb7981aa1e9f8","author":{"email":"ca15f1482ab8b1de497cfc5157957c6aacf08124@arbisoft.com","name":"muzaffaryousaf"},"message":"Adding File Upload fixture to ORA2 course.","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/1a1128be91f16d23c07754388dfeb7981aa1e9f8"},{"sha":"1f80d7a33a15a3ebe988f427fb2d62318682346e","author":{"email":"ca15f1482ab8b1de497cfc5157957c6aacf08124@arbisoft.com","name":"Muzaffar yousaf"},"message":"Merge pull request #748 from edx/muzaffar/update-course-fixture\n\nAdding File Upload fixture to ORA2 course.","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/1f80d7a33a15a3ebe988f427fb2d62318682346e"},{"sha":"6421c49da5f918f3595eb2370e43a9d76a6e2193","author":{"email":"04b66ffb2360c42ea91fdf2fb99d31cafab10efd@edx.org","name":"Andy Armstrong"},"message":"Fix acceptance tests, and minor doc tweaks","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/6421c49da5f918f3595eb2370e43a9d76a6e2193"},{"sha":"c425531e1e8565c47c5964f234d55905055eee1a","author":{"email":"04b66ffb2360c42ea91fdf2fb99d31cafab10efd@edx.org","name":"Andy Armstrong"},"message":"Merge pull request #750 from edx/andya/small-fixes\n\nFix acceptance tests, and minor doc tweaks","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/c425531e1e8565c47c5964f234d55905055eee1a"},{"sha":"37c1176a8df806cf9cba0390052ba2b570472c91","author":{"email":"4ca6363339c22b37a0375ccb992d4bcf2cf3fc07@ubc.ca","name":"Pan Luo"},"message":"Add support for file upload\n\n- Allow image, pdf-image, or custom file types\n- Global black list extensions to prevent unsafe file types\n- Custom file upload is white listed only\n\n# Conflicts:\n#\tAUTHORS\n#\topenassessment/templates/openassessmentblock/edit/oa_edit.html\n#\topenassessment/xblock/static/js/openassessment-lms.min.js\n#\topenassessment/xblock/static/js/openassessment-studio.min.js\n#\topenassessment/xblock/static/js/spec/lms/oa_response.js\n#\topenassessment/xblock/static/js/src/lms/oa_base.js\n#\topenassessment/xblock/static/js/src/lms/oa_response.js\n#\topenassessment/xblock/static/js/src/oa_server.js\n#\topenassessment/xblock/static/js/src/studio/oa_edit.js\n#\topenassessment/xblock/static/js/src/studio/oa_edit_settings.js\n#\ttest/acceptance/tests.py","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/37c1176a8df806cf9cba0390052ba2b570472c91"},{"sha":"2bd3d4017491c30e4fdd077829db69b2b8e33d9c","author":{"email":"ca15f1482ab8b1de497cfc5157957c6aacf08124@arbisoft.com","name":"Muzaffar yousaf"},"message":"Merge pull request #749 from edx/muzaffar/os-file-upload\n\nAdd support for file upload","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/2bd3d4017491c30e4fdd077829db69b2b8e33d9c"},{"sha":"c2a60ee4cb253e4ac2749d6fd7cdf71ecdba443a","author":{"email":"379784e41c3d7dca2df845d9a244769a066882f6@edx.org","name":"cahrens"},"message":"Update icons to font awesome.\n\nAlso remove overly-gratuitous usage of caret-right.\nTNL-3741","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/c2a60ee4cb253e4ac2749d6fd7cdf71ecdba443a"},{"sha":"dd2c044475eecda0de2c3599ec5e4b76dfff5771","author":{"email":"9e8009bcd0bbf55a9e1c75352deab462b84f707a@edx.org","name":"Brian Talbot"},"message":"CSS cleanup related to font awesome upgrade.\n\nAddressing step-based layout issues\nMake collapse/expand toggles always\nCorrecting border color on feedback section heading","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/dd2c044475eecda0de2c3599ec5e4b76dfff5771"},{"sha":"5c10c3e5bb84353f8caece64164cc3606084a14c","author":{"email":"379784e41c3d7dca2df845d9a244769a066882f6@edx.org","name":"Christina Roberts"},"message":"Merge pull request #751 from edx/christina/fa-icons\n\nORA, now with icons!","distinct":false,"url":"https://api.github.com/repos/edx/edx-ora2/commits/5c10c3e5bb84353f8caece64164cc3606084a14c"}]}