Commits · 49e0c642e2c19755961633adf8e61249ed1d4c4c · edx / edx-platform · GitLab

07 Aug, 2014 24 commits
- Fix test that broke on rebase · 49e0c642
  Andy Armstrong committed Aug 07, 2014
  
  49e0c642 Browse Files
- Discard changes rewrite. · 0f6de7f9
```
STUD-1860
```
  cahrens committed Aug 07, 2014
  0f6de7f9 Browse Files
- Removes unnecessary PUT after DELETE · f8f0ef1f
  Ben McMorran committed Aug 07, 2014
  
  f8f0ef1f Browse Files
- Displays the date, time, and username of the most recent save and publish · 572b4fc0
```
Conflicts:
	cms/djangoapps/contentstore/views/item.py
```
  Ben McMorran committed Aug 07, 2014
  572b4fc0 Browse Files
- Updates based on merge with master. · 7cb5c4d7
  cahrens committed Aug 07, 2014
  
  7cb5c4d7 Browse Files
- Adds warning when editing a container visible to students · d40ef5e0
```
styling for editing a live unit
```
  Ben McMorran committed Aug 07, 2014
  d40ef5e0 Browse Files
- Fix whitespace problems in xblock string field editor. · 24e58373
```
Whitespace is now trimmed from input. If after trimming input is empty
(pure whitespace or the empty string), the field is not updated.
```
  Daniel Friedman committed Aug 07, 2014
  24e58373 Browse Files
- New publishing controls on unit page (continued) · d6475f45
```
STUD-1707
```
  cahrens committed Aug 07, 2014
  d6475f45 Browse Files
- cleanup of unit, container, and xblock sass; added modules and layout sass;… · bbcc0030
```
cleanup of unit, container, and xblock sass; added modules and layout sass; publishing states and actions on new unit
```
  Frances Botsford committed Aug 07, 2014
  bbcc0030 Browse Files
- New Publishing controls on Unit page. · d65e887d
```
STUD-1707
```
  Andy Armstrong committed Aug 07, 2014
  d65e887d Browse Files
- Replace unit page with the container page. · b1eccdf2
```
STUD-1754
```
  Andy Armstrong committed Aug 07, 2014
  b1eccdf2 Browse Files
- Merge pull request #4639 from edx/clintonb/link-to-analytics-dashboard · 3796f8c6
```
Added link from instructor dashboard to analytics dashboard
```
  Clinton Blackburn committed Aug 07, 2014
  3796f8c6 Browse Files
- Added link from instructor dashboard to analytics dashboard · 1a4e0677
  Clinton Blackburn committed Aug 07, 2014
  
  1a4e0677 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 2 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