Commits · d75b580f8f85b909f03ba1378ccf0a52bf5c4507 · edx / edx-platform

29 Nov, 2013 1 commit
- Enabled back turned off Video acceptance tests. · d75b580f
```
Updated comments.

BLD-537
```
  Valera Rozuvan committed Nov 29, 2013
  d75b580f Browse Files
27 Nov, 2013 7 commits
- Merge pull request #1802 from edx/ned/merge-master-to-rc-2013-11-21-again · 39b29dcb
```
Merged master to rc/2013-11-21, so we can merge it back to master.
```
  Ned Batchelder committed Nov 27, 2013
  39b29dcb Browse Files
- Resolve conflicts merging master to rc/2013-11-21 · c8a7b259
  Ned Batchelder committed Nov 27, 2013
  
  c8a7b259 Browse Files
- Merge pull request #1774 from edx/flowerhack/refund-requested-date · 3e3a57f5
```
Added refund datetime info to Orders, OrderItems
```
  Julia Hansbrough committed Nov 27, 2013
  3e3a57f5 Browse Files
- New migrations file · 30cd57f5
  Julia Hansbrough committed Nov 27, 2013
  
  30cd57f5 Browse Files
- Merge conflicts · 280e3c38
  Julia Hansbrough committed Nov 27, 2013
  
  280e3c38 Browse Files
- Removed old migration · 006b8f82
  vagrant committed Nov 27, 2013
  
  006b8f82 Browse Files
- Merge pull request #1299 from edx/zoldak/remove-pearson-code · bb3917fa
```
Remove code related to Pearson Testing Centers
```
  Jay Zoldak committed Nov 27, 2013
  bb3917fa Browse Files
26 Nov, 2013 24 commits
- Merge pull request #1791 from cpennington/rebased-lti-graded · 6dac4b79
```
BLD-384: Add grading to LTI module
```
  Ned Batchelder committed Nov 26, 2013
  6dac4b79 Browse Files
- Add migration to remove pearson tables · 6614d7e9
  Jay Zoldak committed Nov 26, 2013
  
  6614d7e9 Browse Files
- Rebase to re-prepare PR · a56b9457
  Jay Zoldak committed Nov 26, 2013
  
  a56b9457 Browse Files
- Remove code related to Pearson Testing Centers · 341875bb
  Jay Zoldak committed Nov 26, 2013
  
  341875bb Browse Files
- Add grading functionality to LTI xmodule · 11bbf4c1
```
Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
[BLD-384]
```
  Calen Pennington committed Nov 26, 2013
  11bbf4c1 Browse Files
- Make FieldDataCache use the user from scope_ids, rather than its pre-configured user · 52ab2b13
```
Co-author: Ned Batchelder <ned@edx.org>
```
  Calen Pennington committed Nov 26, 2013
  52ab2b13 Browse Files
- Add a per-course anonymous student id · 1205173d
```
This does not yet replace the existing per-student anonymous id, but
is intended to do so in the future.

Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
```
  Calen Pennington committed Nov 26, 2013
  1205173d Browse Files
- Rename the LTIModuleDescriptor to LTIDescriptor to follow convention · 9b6edea4
  Calen Pennington committed Nov 26, 2013
  
  9b6edea4 Browse Files
- Enable un-authenticated handler urls · 6d613f9d
```
Updates to depend on the latest version of XBlock, which includes
support for service-to-service (thirdparty) handler urls, which aren't
authenticated with a user (unlike handler requests coming from the
xblock client-side javascript).

Co-author: Ned Batchelder <ned@edx.org>
```
  Calen Pennington committed Nov 26, 2013
  6d613f9d Browse Files
- Merge pull request #1685 from edx/jbau/shopping-cart/report · f94565d6
```
CSV Reporting of Shopping Cart Purchases, with tests
```
  Jason Bau committed Nov 26, 2013
  f94565d6 Browse Files
- Merge pull request #1788 from edx/will/disable-caption-test-2 · 3ed96f75
```
Disabled another video test that failed in master
```
  Will Daly committed Nov 26, 2013
  3ed96f75 Browse Files
- Disabled another video test that failed in master · 761699bf
  Will Daly committed Nov 26, 2013
  
  761699bf Browse Files
- Merge pull request #1778 from edx/talbs/studio-fix-italics · 812c8210
```
Studio: FIX - Italicize in xmodule/block previews
```
  Brian Talbot committed Nov 26, 2013
  812c8210 Browse Files
- Studio: adding basic italicize text styling into xmodule/block preview UI · bff94de2
```
STUD-963
```
  Brian Talbot committed Nov 26, 2013
  bff94de2 Browse Files
- Merge pull request #1779 from edx/talbs/fix-studio-notificationsie · 5a5c8c0e
```
Studio: FIX - correcting hiding state of notification UI for < IE9
```
  Brian Talbot committed Nov 26, 2013
  5a5c8c0e Browse Files
- Merge pull request #1786 from edx/will/disable-caption-test · 88ccf85d
```
Disabled video caption tests that failed in master
```
  Will Daly committed Nov 26, 2013
  88ccf85d Browse Files
- Disabled video caption tests that failed in master · d00e5a45
  Will Daly committed Nov 26, 2013
  
  d00e5a45 Browse Files
- Merge pull request #1773 from edx/andy/unitidentifier · 957175e3
```
Changed unit identifier to be readonly, not disabled
```
  Andy Armstrong committed Nov 26, 2013
  957175e3 Browse Files
- Merge pull request #1754 from edx/dhm/restful_settings · 38fba248
```
Restful api for course advanced settings
```
  Don Mitchell committed Nov 26, 2013
  38fba248 Browse Files
- Merge pull request #1748 from puntxo/patch-1 · 389df173
```
Update course_navigation.html #os
```
  David Baumgold committed Nov 26, 2013
  389df173 Browse Files
- Restful api for course advanced settings · 7f91ce40
```
STUD-948
```
  Don Mitchell committed Nov 26, 2013
  7f91ce40 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
- Studio: correcting hiding state of notification UI for < IE9 · bbfa7742
```
STUD-815
```
  Brian Talbot committed Nov 25, 2013
  bbfa7742 Browse Files
25 Nov, 2013 8 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
- Added refund datetime info to Orders, OrderItems · b822df4e
```
Finance would like to have info about the date any given refund is requested.

This commit adds a refund_requested_time field to OrderItem and a refund_time to Order.

When a user *requests* a refund, the refund_requested_time field on OrderItem is updated; when a user actually *receives* their refund, the refund_time on Order is updated.

Note that only the refund_requested_teim field is actually used right now; later on, when we're able to actually automate the process of actually giving users refunds, we will start usings Order's refund_time field.
```
  Julia Hansbrough committed Nov 25, 2013
  b822df4e Browse Files
- Changed unit identifier to be readonly, not disabled · f002ce49
```
STUD-863
```
  Andy Armstrong committed Nov 25, 2013
  f002ce49 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