Commits · cc0bf853a3eb2d132502f491896ac70695e14bca · edx / edx-ora2

12 Nov, 2015 4 commits
- Merge pull request #763 from edx/clytwynec/add-custom-a11y-rules · cc0bf853
```
add custom a11y rules in accessibility tests
```
  Christine Lytwynec committed Nov 12, 2015
  cc0bf853 Browse Files
- add custom a11y rules to bok choy tests · c69c00af
  Christine Lytwynec committed Nov 12, 2015
  
  c69c00af Browse Files
- Merge pull request #769 from edx/christina/fix-doc · 48bcea06
```
Fix message wording about how student can resubmit problem.
```
  Christina Roberts committed Nov 12, 2015
  48bcea06 Browse Files
- Fix message wording. · 05332225
```
TNL-3773
```
  cahrens committed Nov 12, 2015
  05332225 Browse Files
11 Nov, 2015 2 commits
- Merge pull request #767 from edx/muzaffar/fix-acceptance-test · cfea6656
```
Fixing file upload acceptance test.
```
  Muzaffar yousaf committed Nov 11, 2015
  cfea6656 Browse Files
- Fixing file upload acceptance test. · 24937c7f
  muzaffaryousaf committed Nov 11, 2015
  
  24937c7f Browse Files
09 Nov, 2015 2 commits
- Merge pull request #765 from edx/clytwynec/fix-acceptance-tests · 1faa89db
```
fixing acceptance tests
```
  Christine Lytwynec committed Nov 09, 2015
  1faa89db Browse Files
- fixing acceptance tests · c5d30fb8
  Christine Lytwynec committed Nov 09, 2015
  
  c5d30fb8 Browse Files
05 Nov, 2015 3 commits
- Merge pull request #751 from edx/christina/fa-icons · 5c10c3e5
```
ORA, now with icons!
```
  Christina Roberts committed Nov 05, 2015
  5c10c3e5 Browse Files
- CSS cleanup related to font awesome upgrade. · dd2c0444
```
Addressing step-based layout issues
Make collapse/expand toggles always
Correcting border color on feedback section heading
```
  Brian Talbot committed Nov 05, 2015
  dd2c0444 Browse Files
- Update icons to font awesome. · c2a60ee4
```
Also remove overly-gratuitous usage of caret-right.
TNL-3741
```
  cahrens committed Nov 05, 2015
  c2a60ee4 Browse Files
04 Nov, 2015 2 commits

Merge pull request #749 from edx/muzaffar/os-file-upload · 2bd3d401
```
Add support for file upload
```
Muzaffar yousaf committed Nov 04, 2015
2bd3d401 Browse Files

- Allow image, pdf-image, or custom file types
- Global black list extensions to prevent unsafe file types
- Custom file upload is white listed only

# Conflicts:
#	AUTHORS
#	openassessment/templates/openassessmentblock/edit/oa_edit.html
#	openassessment/xblock/static/js/openassessment-lms.min.js
#	openassessment/xblock/static/js/openassessment-studio.min.js
#	openassessment/xblock/static/js/spec/lms/oa_response.js
#	openassessment/xblock/static/js/src/lms/oa_base.js
#	openassessment/xblock/static/js/src/lms/oa_response.js
#	openassessment/xblock/static/js/src/oa_server.js
#	openassessment/xblock/static/js/src/studio/oa_edit.js
#	openassessment/xblock/static/js/src/studio/oa_edit_settings.js
#	test/acceptance/tests.py

committed Nov 04, 2015

37c1176a Browse Files

03 Nov, 2015 4 commits
- Merge pull request #750 from edx/andya/small-fixes · c425531e
```
Fix acceptance tests, and minor doc tweaks
```
  Andy Armstrong committed Nov 03, 2015
  c425531e Browse Files
- Fix acceptance tests, and minor doc tweaks · 6421c49d
  Andy Armstrong committed Nov 03, 2015
  
  6421c49d Browse Files
- Merge pull request #748 from edx/muzaffar/update-course-fixture · 1f80d7a3
```
Adding File Upload fixture to ORA2 course.
```
  Muzaffar yousaf committed Nov 03, 2015
  1f80d7a3 Browse Files
- Adding File Upload fixture to ORA2 course. · 1a1128be
  muzaffaryousaf committed Nov 03, 2015
  
  1a1128be Browse Files
02 Nov, 2015 3 commits
- Merge pull request #747 from edx/andya/add-staff-tools · ea2cfaae
```
Implement ORA staff toolbar
```
  Andy Armstrong committed Nov 02, 2015
  ea2cfaae Browse Files
- Rename files without losing history · 454d16e0
  Andy Armstrong committed Nov 01, 2015
  
  454d16e0 Browse Files
- Implement new toolbar for staff area · cda560ca
```
TNL-3466
```
  Andy Armstrong committed Nov 01, 2015
  cda560ca Browse Files
30 Oct, 2015 1 commit
- Add ora-staff-grading to branches to build · f53a54d7
  Andy Armstrong committed Oct 30, 2015
  
  f53a54d7 Browse Files
29 Oct, 2015 2 commits
- Merge pull request #746 from edx/efischer/update_docs · 2f4a8093
```
Updating outdated documentation
```
  Eric Fischer committed Oct 29, 2015
  2f4a8093 Browse Files
- Updating outdated documentation · 49889917
  Eric Fischer committed Oct 29, 2015
  
  49889917 Browse Files
28 Oct, 2015 4 commits
- Merge pull request #743 from edx/andya/acceptance-test-commands · 158a3044
```
Add make commands for acceptance and a11y testing
```
  Andy Armstrong committed Oct 28, 2015
  158a3044 Browse Files
- Add make commands for running acceptance tests · 7e2a9b39
  Andy Armstrong committed Oct 28, 2015
  
  7e2a9b39 Browse Files
- Merge pull request #744 from edx/clytwynec/update-bokchoy-version · 3d7c7c31
```
Update bok-choy to v0.4.7
```
  Christine Lytwynec committed Oct 28, 2015
  3d7c7c31 Browse Files
- Update bok-choy to v0.4.7 · d9bfe0b9
  Christine Lytwynec committed Oct 28, 2015
  
  d9bfe0b9 Browse Files
27 Oct, 2015 8 commits
- Correct the steps for running accessibility tests · 64e34c4b
  Andy Armstrong committed Oct 27, 2015
  
  64e34c4b Browse Files
- Merge pull request #742 from edx/diana/change-student-to-learner · d4021fb4
```
Minor documentation and user-string fixes.
```
  Diana Huang committed Oct 27, 2015
  d4021fb4 Browse Files
- Minor documentation and user-string fixes. · 1d411e09
  Diana Huang committed Oct 27, 2015
  
  1d411e09 Browse Files
- Merge pull request #739 from edx/diana/change-student-to-learner · 774f8eae
```
Replace "student" with "learner".
```
  Diana Huang committed Oct 27, 2015
  774f8eae Browse Files
- Fix errors in user-facing strings. · 306b001e
  Diana Huang committed Oct 27, 2015
  
  306b001e Browse Files
- Merge pull request #740 from edx/andya/karma-debugging · 54a2cc4b
```
Add ability to run individual Jasmine tests
```
  Andy Armstrong committed Oct 27, 2015
  54a2cc4b Browse Files
- Add ability to run individual Jasmine tests · 5e24752c
```
Note: this change also upgrades Jasmine to the latest version.
```
  Andy Armstrong committed Oct 27, 2015
  5e24752c Browse Files
- Merge pull request #741 from edx/andya/add-jshint · 808b3feb
```
Run JSHint as part of the build
```
  Andy Armstrong committed Oct 27, 2015
  808b3feb Browse Files
26 Oct, 2015 3 commits
- Run JSHint as part of the build · d2322a7d
```
I relaxed some of the restrictions that were too
onerous to fix, but then fixed all the other issues
that were reported.
```
  Andy Armstrong committed Oct 26, 2015
  d2322a7d Browse Files
- Remove ora2 documentation. · 231c199a
```
This documentation now lives primarily in
another repo.
```
  Diana Huang committed Oct 26, 2015
  231c199a Browse Files
- Merge pull request #738 from edx/mushtaq/fix-ora2-ajax-contenttype · 4b3f6d66
```
Add 'fix ajax contenttype' updated changes to minified js files
```
  Mushtaq Ali committed Oct 26, 2015
  4b3f6d66 Browse Files
23 Oct, 2015 1 commit
- Replace "student" with "learner". · 177731a6
  Diana Huang committed Oct 23, 2015
  
  177731a6 Browse Files
22 Oct, 2015 1 commit
- Merge pull request #735 from edx/andya/improve-jasmine-reporting · 0cd40194
```
Use improved Jasmine results plugin
```
  Andy Armstrong committed Oct 22, 2015
  0cd40194 Browse Files