Commits · c9e51b9956f80b6a23af501e01d2df1603d7c92c · edx / edx-platform · GitLab

07 Aug, 2014 12 commits
- Annotation Tools: Adding Loading Bar to Annotations Table · c9e51b99
```
- added label below loading gif

 - fixed spacing issues

  - change the error messages in annotator code
```
  lduarte1991 committed Aug 07, 2014
  c9e51b99 Browse Files
- Merge pull request #4461 from mlkwaqas/waqas/for108-discussion-blackout-period-inconsistent-ui · b19e534c
```
Fix inconsistent ui issues on discussion during blackout period
```
  Waqas Khalid committed Aug 07, 2014
  b19e534c Browse Files
- Fix inconsistent ui issues on discussion during blackout period · 3d5dde81
```
FOR-108
```
  Waqas Khalid committed Aug 07, 2014
  3d5dde81 Browse Files
- Merge pull request #4602 from edx/db/expand-on-click-or-enter · 74f5adae
```
make expanding explanation accessible
```
  David Baumgold committed Aug 07, 2014
  74f5adae Browse Files
- Merge pull request #4654 from edx/db/kill-check-for-code · e99a14eb
```
Replace `check_for_get_code` with `assert_request_status_code`
```
  David Baumgold committed Aug 07, 2014
  e99a14eb Browse Files
- Merge pull request #4678 from edx/usman/lms11189-user-api-middleware-exception-2 · 7e3e8d04
```
Catch InvalidKeyError in UserTagsEventContextMiddleware and static_tab view.
```
  Usman Khalid committed Aug 07, 2014
  7e3e8d04 Browse Files
- Catch InvalidKeyError in static_tab view. · 9599c31a
```
LMS-11189
```
  Usman Khalid committed Aug 07, 2014
  9599c31a Browse Files
- Catch InvalidKeyError in UserTagsEventContextMiddleware. · 46b1c850
```
LMS-11189
```
  Usman Khalid committed Aug 07, 2014
  46b1c850 Browse Files
- Merge pull request #4731 from edx/ammar/fix-property-call · adaf2eb5
```
Fix property call issue
```
  muhammad-ammar committed Aug 07, 2014
  adaf2eb5 Browse Files
- Fix property call issue · 9bdf16d8
  Muhammad Ammar committed Aug 07, 2014
  
  9bdf16d8 Browse Files
- Merge pull request #4261 from edx/ammar/video-tests-refactoring · 45c2abbb
```
Refactor Bok-Choy LMS Video Tests
```
  muhammad-ammar committed Aug 07, 2014
  45c2abbb Browse Files
- Merge pull request #4715 from edx/ammar/decrease-video-player-init-timeout · f0e737a7
```
Decrease Video Player Init Wait Timeout
```
  muhammad-ammar committed Aug 07, 2014
  f0e737a7 Browse Files
06 Aug, 2014 14 commits
- Merge pull request #4636 from edx/mvo/update_bok_choy_db_caches · 7b3bacaa
```
update bok choy db caches
```
  Minh-Tue Vo committed Aug 06, 2014
  7b3bacaa Browse Files
- Merge branch 'mvo/update_bok_choy_db_caches' of… · 54e90c94
```
Merge branch 'mvo/update_bok_choy_db_caches' of https://github.com/edx/edx-platform into mvo/update_bok_choy_db_caches
```
  Minh Tue Vo committed Aug 06, 2014
  54e90c94 Browse Files
- update bok choy db caches · 7f674a01
  Minh Tue Vo committed Aug 06, 2014
  
  7f674a01 Browse Files
- Merge pull request #4504 from lduarte1991/lduarte-harvardx-pr11 · ea8fa20b
```
Annotation Tools: Added Grouping Plug-In
```
  Sarina Canelake committed Aug 06, 2014
  ea8fa20b Browse Files
- Annotation Tools: Added Grouping Plug-In · 0ca9bfa7
```
- adding comments

 - spacing issues and indentation
```
  lduarte1991 committed Aug 06, 2014
  0ca9bfa7 Browse Files
- Merge pull request #4687 from lduarte1991/lduarte-harvardx-pr16 · 540d67a6
```
TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool
```
  Christina Roberts committed Aug 06, 2014
  540d67a6 Browse Files
- Merge pull request #4634 from edx/clytwynec/removing_remaining_rake_references · 22582f49
```
removing rake and  outdated references to it
```
  clytwynec committed Aug 06, 2014
  22582f49 Browse Files
- Toggle aria-expanded attribute · 9b99213b
  David Baumgold committed Aug 06, 2014
  
  9b99213b Browse Files
- make expanding explanation accessible · 3f29fe4f
```
LMS-11161
```
  David Baumgold committed Aug 06, 2014
  3f29fe4f Browse Files
- Decrease Video Player Init Wait Timeout · c23b0bc9
  Muhammad Ammar committed Aug 06, 2014
  
  c23b0bc9 Browse Files
- Refactor LMS Video Tests · c237364e
  Muhammad Ammar committed Aug 06, 2014
  
  c237364e Browse Files
- Merge pull request #4717 from edx/alex/fix_test · 2bdc4bf0
```
Request IFRAME API every time with https scheme.
```
  Alexander Kryklia committed Aug 06, 2014
  2bdc4bf0 Browse Files
- Request IFRAME API every time with https scheme. · c9ef2f3e
  Alexander Kryklia committed Aug 06, 2014
  
  c9ef2f3e Browse Files
- Merge pull request #4250 from edx/zub/story/listallexportfaildcourses · 9caff200
```
update export_all_courses management command to count and list all faile...
```
  zubair-arbi committed Aug 06, 2014
  9caff200 Browse Files
05 Aug, 2014 14 commits
- Merge pull request #4698 from mitocw/cg/fix_student_migration_35 · 753c67a7
```
Correct UnboundLocalError exception in student_migration_35
```
  Don Mitchell committed Aug 05, 2014
  753c67a7 Browse Files
- Merge pull request #4613 from edx/jmclaus/easy-access-group-configurations-page · 9f313fcb
```
BLD 1020: Easy access to Group Configurations page from Content Experiment component.
```
  jmclaus committed Aug 05, 2014
  9f313fcb Browse Files
- TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool · fe009f59
```
- fixed missing media and link buttons on image

 - fixed a CSS issue with the sharing button
```
  lduarte1991 committed Aug 05, 2014
  fe009f59 Browse Files
- Merge pull request #4673 from edx/jarv/rsyslog-handler · 043d495a
```
Jarv/rsyslog handler
```
  John Jarvis committed Aug 05, 2014
  043d495a Browse Files
- BLD 1020: Easy access to Group Configurations page from Content Experiment component. · 459c241e
  jmclaus committed Aug 05, 2014
  
  459c241e Browse Files
- Replace `check_for_get_code` with `assert_request_status_code` · 5457775c
```
More flexible, uses the word "assert", method instead of function
```
  David Baumgold committed Aug 05, 2014
  5457775c Browse Files
- Merge pull request #4518 from lduarte1991/lduarte-harvardx-pr13 · 1673448d
```
Text Annotation Tool: Safari Colored Highlights Bug Fix
```
  Sarina Canelake committed Aug 05, 2014
  1673448d Browse Files
- Merge pull request #4675 from lduarte1991/lduarte-harvardx-pr14 · 1184cc06
```
Annotations Tools: Fixing major Firefox/Tinymce bug in annotations
```
  Sarina Canelake committed Aug 05, 2014
  1184cc06 Browse Files
- Merge pull request #4590 from edx/cdodge/fix-reg-codes · 246a4317
```
eCommerce enhancements (pt. 2)
```
  chrisndodge committed Aug 05, 2014
  246a4317 Browse Files
- Text Annotation Tool: Safari Colored Highlights Bug Fix · a1684d2e
```
 - fixed spacing
```
  lduarte1991 committed Aug 05, 2014
  a1684d2e Browse Files
- Correct UnboundLocalError exception in student_migration_35 · 7bb78033
  Carson Gee committed Aug 05, 2014
  
  7bb78033 Browse Files
- Merge pull request #4693 from edx/anton/fix-video-tests · 9a2c96ca
```
Fix failing video tests due to wrong IFRAME_API_RESPONSE 
```
  Alexander Kryklia committed Aug 05, 2014
  9a2c96ca Browse Files
- Update youtube api. · 4f391f66
  polesye committed Aug 05, 2014
  
  4f391f66 Browse Files
- Merge pull request #4655 from edx/diana/allow-only-verified · 1e1b321b
```
Allow verified to be offered without audit
```
  Diana Huang committed Aug 05, 2014
  1e1b321b Browse Files