Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,675 Commits 1 Branch 0 Tags
c8a7b259ff87eecaec461efe98220568af02fb15
Commit Graph

19675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 2013-11-27 11:55:44 -05:00
Julia Hansbrough
3e3a57f5cd Merge pull request #1774 from edx/flowerhack/refund-requested-date 
Added refund datetime info to Orders, OrderItems
 2013-11-27 07:35:23 -08:00
Julia Hansbrough
30cd57f539 New migrations file 2013-11-27 15:16:25 +00:00
Julia Hansbrough
280e3c3856 Merge conflicts 2013-11-27 14:43:16 +00:00
vagrant
006b8f8298 Removed old migration 2013-11-27 14:38:59 +00:00
Jay Zoldak
bb3917fa1d Merge pull request #1299 from edx/zoldak/remove-pearson-code 
Remove code related to Pearson Testing Centers
 2013-11-27 04:35:30 -08:00
Ned Batchelder
6dac4b79d3 Merge pull request #1791 from cpennington/rebased-lti-graded 
BLD-384: Add grading to LTI module
 2013-11-26 14:07:55 -08:00
Jay Zoldak
6614d7e9bb Add migration to remove pearson tables 2013-11-26 17:04:19 -05:00
Jay Zoldak
a56b9457a0 Rebase to re-prepare PR 2013-11-26 17:04:19 -05:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
Calen Pennington
11bbf4c182 Add grading functionality to LTI xmodule 
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]
 2013-11-26 16:30:55 -05:00
Calen Pennington
52ab2b1313 Make FieldDataCache use the user from scope_ids, rather than its pre-configured user 
Co-author: Ned Batchelder <ned@edx.org>
 2013-11-26 16:29:35 -05:00
Calen Pennington
1205173d6f Add a per-course anonymous student id 
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
 2013-11-26 16:29:35 -05:00
Calen Pennington
9b6edea406 Rename the LTIModuleDescriptor to LTIDescriptor to follow convention 2013-11-26 16:29:34 -05:00
Calen Pennington
6d613f9d4e Enable un-authenticated handler urls 
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>
 2013-11-26 16:29:34 -05:00
Jason Bau
f94565d699 Merge pull request #1685 from edx/jbau/shopping-cart/report 
CSV Reporting of Shopping Cart Purchases, with tests
 2013-11-26 11:45:59 -08:00
Will Daly
3ed96f75a1 Merge pull request #1788 from edx/will/disable-caption-test-2 
Disabled another video test that failed in master
 2013-11-26 11:09:28 -08:00
Will Daly
761699bf74 Disabled another video test that failed in master 2013-11-26 14:01:58 -05:00
Brian Talbot
812c8210da Merge pull request #1778 from edx/talbs/studio-fix-italics 
Studio: FIX - Italicize in xmodule/block previews
 2013-11-26 09:59:56 -08:00
Brian Talbot
bff94de284 Studio: adding basic italicize text styling into xmodule/block preview UI 
STUD-963
 2013-11-26 12:21:55 -05:00
Brian Talbot
5a5c8c0eb5 Merge pull request #1779 from edx/talbs/fix-studio-notificationsie 
Studio: FIX - correcting hiding state of notification UI for < IE9
 2013-11-26 09:09:17 -08:00
Will Daly
88ccf85d42 Merge pull request #1786 from edx/will/disable-caption-test 
Disabled video caption tests that failed in master
 2013-11-26 09:08:51 -08:00
Will Daly
d00e5a4503 Disabled video caption tests that failed in master 2013-11-26 12:07:04 -05:00
Andy Armstrong
957175e3da Merge pull request #1773 from edx/andy/unitidentifier 
Changed unit identifier to be readonly, not disabled
 2013-11-26 08:23:27 -08:00
Don Mitchell
38fba2481c Merge pull request #1754 from edx/dhm/restful_settings 
Restful api for course advanced settings
 2013-11-26 07:39:39 -08:00
David Baumgold
389df17320 Merge pull request #1748 from puntxo/patch-1 
Update course_navigation.html #os
 2013-11-26 07:28:04 -08:00
Don Mitchell
7f91ce40ae Restful api for course advanced settings 
STUD-948
 2013-11-26 10:17:52 -05:00
zubair-arbi
18f342c076 Merge pull request #1781 from zubair-arbi/zub/bugfix/std979-displaynameclashes 
Fix unique vertical url + add test
 2013-11-26 06:26:57 -08:00
Zubair Afzal
829cd7d861 Fix unique vertical url + add test 
STUD-979
 2013-11-26 14:30:17 +05:00
Brian Talbot
bbfa7742cc Studio: correcting hiding state of notification UI for < IE9 
STUD-815
 2013-11-25 20:57:35 -05:00
Brian Talbot
2b5b4f4cc6 Merge pull request #1760 from edx/talbs/lms-upsell-ui 
LMS: Add Collapse/Expand Icon to Dashboard Upsell UI
 2013-11-25 15:49:27 -08:00
Ned Batchelder
6733d04a95 Merge pull request #1317 from edx/ned/upgrade-coverage 
Upgrade coverage to 3.7
 2013-11-25 14:23:52 -08:00
Julia Hansbrough
63bc8c9645 Merge pull request #1771 from edx/flowerhack/fix/lms-1526 
Update mode appropriately when user enrolls
 2013-11-25 14:07:20 -08:00
Julia Hansbrough
b822df4ee2 Added refund datetime info to Orders, OrderItems 
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.
 2013-11-25 21:57:46 +00:00
Andy Armstrong
f002ce4908 Changed unit identifier to be readonly, not disabled 
STUD-863
 2013-11-25 16:53:38 -05:00
Brian Talbot
d2a2aaa716 LMS: adds in collapse/expand UI for dashboard view upsell 2013-11-25 16:40:32 -05:00
Ned Batchelder
1795e157be Upgrade coverage to 3.7 2013-11-25 16:38:16 -05:00
Ned Batchelder
c023797bd0 Merge pull request #1583 from edx/ned/fix/lms-1337 
Make remaining dialogs in wiki accessible.
 2013-11-25 13:33:18 -08:00
Julia Hansbrough
e4ebb586e8 Update mode appropriately when user enrolls 
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
 2013-11-25 21:20:15 +00:00
Ned Batchelder
cccd61ebf3 Make remaining dialogs in wiki accessible. 
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
 2013-11-25 16:05:05 -05:00
frances botsford
f3aa720c16 Merge pull request #1769 from edx/frances/fix/studio-edit-headerimage-bug 
Broken image in Studio component help sidebar
 2013-11-25 12:39:58 -08:00
Ned Batchelder
df0e1c49fa Merge pull request #1768 from edx/ned/merge-master-to-rc-2013-11-21 
Merge rc/2013-11-21 to master
 2013-11-25 12:16:30 -08:00
Frances Botsford
d3906f8480 fixed the path to the header example image in the Studio html editor help sidebar 
STUD-981
 2013-11-25 15:11:56 -05:00
Ned Batchelder
368c5758a5 Fix CHANGELOG conflicts again. 2013-11-25 15:01:26 -05:00
Ned Batchelder
9a106a32d5 Merged master to rc/2013-11-21 2013-11-25 14:56:09 -05:00
Will Daly
ceb15209e1 Merge pull request #1767 from edx/will/revert-1711 
Revert PR 1711; disabling JS tests again
 2013-11-25 11:53:23 -08:00
Will Daly
bf94083d2c Revert PR 1711; disabling JS tests again 2013-11-25 14:50:40 -05:00
Julia Hansbrough
31ee6f0983 Merge pull request #1766 from edx/flowerhack/fix/order-and-orderitem-refunds 
Refunding CertificateItem now marks parent Order refunded as well
 2013-11-25 11:45:12 -08:00
Christina Roberts
304ccc918d Merge pull request #1728 from edx/christina/components 
Convert component.py to use RESTful URLs.
 2013-11-25 11:17:07 -08:00
Julia Hansbrough
fe5e2b3527 Refunding CertificateItem now marks parent Order refunded as well 2013-11-25 18:55:58 +00:00