Commits · 389df17320b8fd801ccfe607cadd2f4bfec17447 · edx / edx-platform

26 Nov, 2013 3 commits
- Merge pull request #1748 from puntxo/patch-1 · 389df173
```
Update course_navigation.html #os
```
  David Baumgold committed Nov 26, 2013
  389df173 Browse Files
- Merge pull request #1781 from zubair-arbi/zub/bugfix/std979-displaynameclashes · 18f342c0
```
Fix unique vertical url + add test
```
  zubair-arbi committed Nov 26, 2013
  18f342c0 Browse Files
- Fix unique vertical url + add test · 829cd7d8
```
STUD-979
```
  Zubair Afzal committed Nov 26, 2013
  829cd7d8 Browse Files
25 Nov, 2013 25 commits
- Merge pull request #1760 from edx/talbs/lms-upsell-ui · 2b5b4f4c
```
LMS: Add Collapse/Expand Icon to Dashboard Upsell UI
```
  Brian Talbot committed Nov 25, 2013
  2b5b4f4c Browse Files
- Merge pull request #1317 from edx/ned/upgrade-coverage · 6733d04a
```
Upgrade coverage to 3.7
```
  Ned Batchelder committed Nov 25, 2013
  6733d04a Browse Files
- Merge pull request #1771 from edx/flowerhack/fix/lms-1526 · 63bc8c96
```
Update mode appropriately when user enrolls
```
  Julia Hansbrough committed Nov 25, 2013
  63bc8c96 Browse Files
- LMS: adds in collapse/expand UI for dashboard view upsell · d2a2aaa7
  Brian Talbot committed Nov 25, 2013
  
  d2a2aaa7 Browse Files
- Upgrade coverage to 3.7 · 1795e157
  Ned Batchelder committed Nov 25, 2013
  
  1795e157 Browse Files
- Merge pull request #1583 from edx/ned/fix/lms-1337 · c023797b
```
Make remaining dialogs in wiki accessible.
```
  Ned Batchelder committed Nov 25, 2013
  c023797b Browse Files
- Update mode appropriately when user enrolls · e4ebb586
```
The "mode" was remaining unchanged when a student unenrolled & re-enrolled in a course--i.e., someone who was verified when first registering would still be verified when unenrolling and re-registering in audit mode.  This commit fixes this problem.

LMS-1526
```
  Julia Hansbrough committed Nov 25, 2013
  e4ebb586 Browse Files
- Make remaining dialogs in wiki accessible. · cccd61eb
```
All the dialogs in the wiki are now accessible to screen readers.

Also, the "Switch to selected version" button did the odd thing of
reloading the page with the new version selected, but inside a dialog.
That is now fixed.

The merge dialog has a warning that looks kind of funky still, but you
can read it, unlike the previous code.

LMS-1337
```
  Ned Batchelder committed Nov 25, 2013
  cccd61eb Browse Files
- Merge pull request #1769 from edx/frances/fix/studio-edit-headerimage-bug · f3aa720c
```
Broken image in Studio component help sidebar
```
  frances botsford committed Nov 25, 2013
  f3aa720c Browse Files
- Merge pull request #1768 from edx/ned/merge-master-to-rc-2013-11-21 · df0e1c49
```
Merge rc/2013-11-21 to master
```
  Ned Batchelder committed Nov 25, 2013
  df0e1c49 Browse Files
- fixed the path to the header example image in the Studio html editor help sidebar · d3906f84
```
STUD-981
```
  Frances Botsford committed Nov 25, 2013
  d3906f84 Browse Files
- Fix CHANGELOG conflicts again. · 368c5758
  Ned Batchelder committed Nov 25, 2013
  
  368c5758 Browse Files
- Merged master to rc/2013-11-21 · 9a106a32
  Ned Batchelder committed Nov 25, 2013
  
  9a106a32 Browse Files
- Merge pull request #1767 from edx/will/revert-1711 · ceb15209
```
Revert PR 1711; disabling JS tests again
```
  Will Daly committed Nov 25, 2013
  ceb15209 Browse Files
- Revert PR 1711; disabling JS tests again · bf94083d
  Will Daly committed Nov 25, 2013
  
  bf94083d Browse Files
- Merge pull request #1766 from edx/flowerhack/fix/order-and-orderitem-refunds · 31ee6f09
```
Refunding CertificateItem now marks parent Order refunded as well
```
  Julia Hansbrough committed Nov 25, 2013
  31ee6f09 Browse Files
- Merge pull request #1728 from edx/christina/components · 304ccc91
```
Convert component.py to use RESTful URLs.
```
  Christina Roberts committed Nov 25, 2013
  304ccc91 Browse Files
- Refunding CertificateItem now marks parent Order refunded as well · fe5e2b35
  Julia Hansbrough committed Nov 25, 2013
  
  fe5e2b35 Browse Files
- Updates from code review. Includes backing out the · b5d72a38
```
"as_published" changes I previously put in, as now we
are not adding @draft to locations converted from locators.
```
  cahrens committed Nov 25, 2013
  b5d72a38 Browse Files
- Convert edit_subsection, edit_unit, and publishing to RESTful URLs. · 50128cfb
```
STUD-844
```
  cahrens committed Nov 25, 2013
  50128cfb Browse Files
- Merge pull request #1711 from edx/valera/enable_all_video_jasmine_tests · 037cec6c
```
Enable all video Jasmine tests
```
  Valera Rozuvan committed Nov 25, 2013
  037cec6c Browse Files
- Turned back on several Video Jasmine tests. · ace8df39
```
BLD-463
```
  Valera Rozuvan committed Nov 25, 2013
  ace8df39 Browse Files
- Merge pull request #1752 from edx/gprice/inline-discussion-error-recovery · 3f0f7fa3
```
Add error recovery to inline discussion loading
```
  Greg Price committed Nov 25, 2013
  3f0f7fa3 Browse Files
- Merge pull request #1604 from edx/jarv/verified-certs · 7a56e00d
```
Jarv/verified certs
```
  Diana Huang committed Nov 25, 2013
  7a56e00d Browse Files
- Merge pull request #1756 from edx/will/devstack-view-live · 93823db3
```
Added LMS_BASE to devstack settings to enable View Live in Studio
```
  Will Daly committed Nov 25, 2013
  93823db3 Browse Files
24 Nov, 2013 2 commits
- Merge pull request #1759 from edx/talbs/update-gitignore · b996cae1
```
Adding Codekit IDE assets/config to .gitignore
```
  Brian Talbot committed Nov 23, 2013
  b996cae1 Browse Files
- adding additional IDE files to global .gitignore · 6941d1d7
  Brian Talbot committed Nov 23, 2013
  
  6941d1d7 Browse Files
23 Nov, 2013 3 commits
- Merge pull request #1755 from edx/jbau/fix/marketing-test · e9ebdb04
```
fixes a branding test which was passing for a trivial (wrong) reason
```
  Jason Bau committed Nov 23, 2013
  e9ebdb04 Browse Files
- Added LMS_BASE to devstack settings to enable View Live in Studio · 17e54a8a
  Will Daly committed Nov 23, 2013
  
  17e54a8a Browse Files
- fixes a branding test which was passing for a trivial (wrong) reason · e7b386c4
  Jason Bau committed Nov 22, 2013
  
  e7b386c4 Browse Files
22 Nov, 2013 7 commits
- Merge pull request #1746 from cpennington/fix-lms-1532 · 32941969
```
Fix LMS-1532 (partially instantiated XModules after an exception)
```
  Calen Pennington committed Nov 22, 2013
  32941969 Browse Files
- Merge pull request #1743 from cpennington/fix-beta-tester-roles · e968c0c0
```
Fix for [LMS-1528], plus Changelog entry for the related feature
```
  Calen Pennington committed Nov 22, 2013
  e968c0c0 Browse Files
- fix OrgInstructorRole definition and add tests · 24aa0dec
  Adam Palay committed Nov 22, 2013
  
  24aa0dec Browse Files
- Fix [LMS-1528] (500 error when checking for beta access) · c0f570ce
  Calen Pennington committed Nov 22, 2013
  
  c0f570ce Browse Files
- Add failing test for [LMS-1528] · 820e7711
```
Also cleans up test_view_authentication to use user factories for
various user classes
```
  Calen Pennington committed Nov 22, 2013
  820e7711 Browse Files
- Add release notes for 061a46be, concerning… · 0c2c6811
```
Add release notes for 061a46be, concerning change to beta-tester groups
```
  Calen Pennington committed Nov 22, 2013
  0c2c6811 Browse Files
- Merge pull request #1706 from edx/anton/code-response-improvements · 90bbb7b1
```
Code response improvements.
```
  polesye committed Nov 22, 2013
  90bbb7b1 Browse Files