Commits · 54974a51ca9bc7bb3482c84705e4184435abb4f4 · edx / edx-platform · GitLab

06 Jun, 2014 1 commit
- Annotation Tools: Added CommonAnnotatorMixin · 54974a51
  lduarte1991 committed Jun 06, 2014
  
  54974a51 Browse Files
05 Jun, 2014 9 commits
- Annotator Tools: OpaqueKeys update for Notes · 9c0d14ea
  lduarte1991 committed Jun 05, 2014
  
  9c0d14ea Browse Files
- Annotation Tools: PR Fixes · 68acf66f
```
- Fixed camel case for variable name
- Fixed indentation in imageannotation.html
- Changed all mentions of Instructor Username to Email
- Turned annotation_mode into phrase
- Fixed indentation in imageannotation.html
- Added comments in imageannotation.html

- Changing annotation_mode in OSDA
```
  lduarte1991 committed Jun 05, 2014
  68acf66f Browse Files
- Image Annotation Tool: Annotation Mode for AB Testing · b22643ad
```
Annotation Tools PR Fixes

- forgot to overwrite the previous line
```
  lduarte1991 committed Jun 05, 2014
  b22643ad Browse Files
- Image Annotation Tool: Added Instructor Filter · 50e8ae9a
  lduarte1991 committed Jun 05, 2014
  
  50e8ae9a Browse Files
- Video Annotation Tool: Added Instructor Filter · 1dcf2dc1
  lduarte1991 committed Jun 05, 2014
  
  1dcf2dc1 Browse Files
- Text Annotation Tool: Added Instructor Filter and Clear Search · 8429897c
  lduarte1991 committed Jun 05, 2014
  
  8429897c Browse Files
- Merge pull request #3981 from edx/alex/fix_matlab_check · 2eae8b83
```
Improve escaping in code response.
```
  Alexander Kryklia committed Jun 05, 2014
  2eae8b83 Browse Files
- Merge pull request #3950 from edx/anton/transcript-editor-disable-validation · 4eab9cdb
```
Allow the video player to work with links with redirection.
```
  Anton Stupak committed Jun 05, 2014
  4eab9cdb Browse Files
- BLD-1049: Allow the video player to work with redirected links. · 7b2d67f2
  polesye committed Jun 05, 2014
  
  7b2d67f2 Browse Files
04 Jun, 2014 10 commits
- Merge pull request #3707 from edx/db/release-script-no-duplicate-jira · 7228d41a
```
Don't show duplicate JIRA tickets in the release PR table
```
  David Baumgold committed Jun 04, 2014
  7228d41a Browse Files
- Merge pull request #3979 from edx/benmcmorran/delete-page-confirmation · 5dd7ffe7
```
Fixes delete page confirmation text.
```
  benmcmorran committed Jun 04, 2014
  5dd7ffe7 Browse Files
- Merge pull request #3977 from edx/zub/bugfix/std1691-IEeditannouncement · f19ad92d
```
prevent caching of GET requests for xblock student view
```
  zubair-arbi committed Jun 04, 2014
  f19ad92d Browse Files
- Merge pull request #3980 from edx/benmcmorran/remove-conrads-name · 6a893752
```
Removes Conrad's name from the course schedule settings (STUD-1511).
```
  benmcmorran committed Jun 04, 2014
  6a893752 Browse Files
- Don't show duplicate JIRA tickets in the release PR table · 4c4c2a17
  David Baumgold committed Jun 04, 2014
  
  4c4c2a17 Browse Files
- Fixes delete page confirmation text. · b5573603
  Ben McMorran committed Jun 04, 2014
  
  b5573603 Browse Files
- Merge pull request #3976 from edx/zoldak/skip-video-finish-time-test · e4d0b4d8
```
Skip intermittently failing video test
```
  Jay Zoldak committed Jun 04, 2014
  e4d0b4d8 Browse Files
- prevent caching of GET requests for xblock student view · dbd9e56c
```
STUD-1691
```
  zubair-arbi committed Jun 04, 2014
  dbd9e56c Browse Files
- Merge pull request #3940 from edx/zub/bugfix/std1679-sectionnameeditable · 74c482d6
```
make only section name in headers editable
```
  zubair-arbi committed Jun 04, 2014
  74c482d6 Browse Files
- make only section name in headers editable · 56e0b863
```
STUD-1679
```
  zubair-arbi committed Jun 04, 2014
  56e0b863 Browse Files
03 Jun, 2014 20 commits
- Merge pull request #3974 from edx/zoldak/fix-translation-tags · c08831b4
```
Fix some translation tags
```
  Jay Zoldak committed Jun 03, 2014
  c08831b4 Browse Files
- Skip intermittently failing video test · 32ed4e99
  Jay Zoldak committed Jun 03, 2014
  
  32ed4e99 Browse Files
- Merge pull request #3970 from edx/ahodges/documentation/DOC502 · 8ab61567
```
Ahodges/documentation/doc502
```
  Alison Hodges committed Jun 03, 2014
  8ab61567 Browse Files
- new section for June · feaff4bf
  Alison Hodges committed Jun 03, 2014
  
  feaff4bf Browse Files
- Removes Conrad's name from the course schedule settings (STUD-1511). · d592b7ee
  Ben McMorran committed Jun 03, 2014
  
  d592b7ee Browse Files
- Fix some translation tags · ac17e809
  Jay Zoldak committed Jun 03, 2014
  
  ac17e809 Browse Files
- Merge pull request #3941 from edx/gprice/handle-invalid-json · 6ab6b72c
```
Improve handling of bad JSON from comments service
```
  Greg Price committed Jun 03, 2014
  6ab6b72c Browse Files
- Merge pull request #3942 from edx/adam/protocol · a415b507
```
load js without specifying protocol
```
  Adam committed Jun 03, 2014
  a415b507 Browse Files
- Merge pull request #3939 from edx/will/ora2-ai-grading-settings · b700dc0c
```
ORA2 AI Grading Settings
```
  Will Daly committed Jun 03, 2014
  b700dc0c Browse Files
- Improve handling of bad JSON from comments service · dc234285
```
Instead of allowing the JSONDecodeError to escape, raise an error
indicating the request id and containing the first 100 characters
of the response to aid investigation.
```
  Greg Price committed Jun 03, 2014
  dc234285 Browse Files
- Change log · 31843fd3
  Alison Hodges committed Jun 03, 2014
  
  31843fd3 Browse Files
- Merge pull request #3935 from edx/pmitros/adding-audio-done-xblocks · 2f3e7672
```
Added prototype DoneXBlock and AudioXBlock
```
  Piotr Mitros committed Jun 03, 2014
  2f3e7672 Browse Files
- Merge pull request #3964 from edx/benpatterson/auto-docs-builds · 2795f85c
```
Allow consumption of environment variables in docs Makefiles
```
  Ben Patterson committed Jun 03, 2014
  2795f85c Browse Files
- Added image, completed draft · 488bbff8
  Alison Hodges committed Jun 03, 2014
  
  488bbff8 Browse Files
- Improve escaping in code response. · 97e8f943
  Alexander Kryklia committed Jun 03, 2014
  
  97e8f943 Browse Files
- Add AI algorithm configuration to LMS settings · 5f7520e1
```
Added ORA2_FILE_PREFIX setting
```
  Will Daly committed Jun 03, 2014
  5f7520e1 Browse Files
- Code review changes from Ned+Cale · 5bf5766d
  Piotr Mitros committed Jun 03, 2014
  
  5bf5766d Browse Files
- Move LS requirements to edx private. · a1abd16a
```
Author/owner of change is Ned. Committer/typer is Piotr.
```
  Ned Batchelder committed Jun 03, 2014
  a1abd16a Browse Files
- Added completion and audio XBlocks · 16078ba8
  Piotr Mitros committed Jun 03, 2014
  
  16078ba8 Browse Files
- Merge pull request #3963 from edx/zoldak/skip-video-seek-test · 0103700a
```
Skip intermittently failing bok-choy video seek test
```
  Jay Zoldak committed Jun 03, 2014
  0103700a Browse Files