Commits · c2a60ee4cb253e4ac2749d6fd7cdf71ecdba443a · edx / edx-ora2

05 Nov, 2015 1 commit
- 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 5 commits
- 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
- Add 'fix ajax contenttype' updated changes to minified js files · 1b884c4d
  Mushtaq Ali committed Oct 22, 2015
  
  1b884c4d Browse Files
- Merge pull request #729 from edx/mushtaq/fix-ora2-ajax-contenttype · f15072dc
```
Fix jQuery Ajax contentType issue.
```
  Mushtaq Ali committed Oct 22, 2015
  f15072dc Browse Files
- Fix jQuery Ajax contentType issue. When sending an ajax request, jquery default… · e0cf4291
```
Fix jQuery Ajax contentType issue. When sending an ajax request, jquery default contenttype is application/x-www-form-urlencoded; charset=UTF-8. So here sending ?? in the ajax request, it gets encoded in strange manner. So add content-Type to application/json; charset=UTF-8 when sending a json ajax request.
```
  Mushtaq Ali committed Oct 22, 2015
  e0cf4291 Browse Files
- Use improved Jasmine results plugin · 3987ab7c
  Andy Armstrong committed Oct 21, 2015
  
  3987ab7c Browse Files
21 Oct, 2015 3 commits
- Merge pull request #733 from edx/andya/fix-ora-dev-environment · c5c19786
```
Make improvements to ORA's development environment
```
  Andy Armstrong committed Oct 21, 2015
  c5c19786 Browse Files
- Clean up build scripts · 32fbb020
```
 - add a .jshintrc file
 - add a test-js target
 - make test scripts not use coverage by default
```
  Andy Armstrong committed Oct 21, 2015
  32fbb020 Browse Files
- Support loading unbundled JavaScript in debug mode · 94559a0f
  Andy Armstrong committed Oct 21, 2015
  
  94559a0f Browse Files
08 Oct, 2015 1 commit
- Merge pull request #728 from edx/mjevtic/TNL-3436 · f753b878
```
(TNL-3436) Removing unnecessary padding from textarea elements
```
  Christina Roberts committed Oct 08, 2015
  f753b878 Browse Files
06 Oct, 2015 1 commit
- (TNL-3436) Removing unnecessary padding from textarea elements · 021b5300
  Marko Jevtic committed Oct 06, 2015
  
  021b5300 Browse Files
30 Sep, 2015 1 commit
- Merge pull request #727 from edx/clytwynec/update-a11y-tests · b64c6802
```
update a11y tests to use axe-core ruleset
```
  Christine Lytwynec committed Sep 30, 2015
  b64c6802 Browse Files