Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,621 Commits 1 Branch 0 Tags
ac445d6eff0fac0be6c3aaee3265efafc8ee66ca
Commit Graph

4731 Commits

Author SHA1 Message Date
Alan Boudreault
ac445d6eff Add ENABLE_DISCUSSION_EMAIL_DIGEST feature, to enable discussion emails digest by default for all users 2015-02-19 14:34:10 +08:00
David Baumgold
e5c650d394 Merge pull request #7006 from stvstnfrd/dead 
Remove dead code paths
 2015-02-17 16:44:17 -05:00
Clinton Blackburn
2854bb9524 Added Course Structure API 2015-02-17 13:23:34 -05:00
Giulio Gratta
6a037d05f7 BUGFIX: shopping_cart_enabled + cosmetic price 
- pass through registration price for use in template
- change conditional for add-to-cart to use registration price
- change conditional for sidebar price field to also include registration price
- remove expected failure in test
- add test for shopping_cart + course without mode
 2015-02-17 07:50:59 -08:00
stv
91eb723946 Remove obsolete management command 
While this may have served a purpose at one point, it's now been broken
for more than 2 years [1]; a critical code path makes a call to a
function which is no longer imported.

[1] commit 84cb0ce99b
    Date:   Fri Dec 21 13:15:37 2012 -0500
 2015-02-16 22:50:11 -08:00
stv
971713d0c2 Remove unreferenced mustache_helpers code 
I can't seem to find any references to this code outside of the library
and the tests themselves.
 2015-02-16 22:50:11 -08:00
Will Daly
7da15ea1d2 Merge pull request #6957 from edx/will/country-access-part-3 
Finish Country Access (Part 3 of 3): Block enrollment from third party auth
 2015-02-12 22:25:07 -05:00
Will Daly
5e732ea25c Country Access: Block enrollment from third party auth 
Users who are blocked from enrolling in a course
due to an embargo are redirected to the blocked
message page after authentication completes.
 2015-02-11 13:18:15 -05:00
Will Daly
70ec4c5f66 Merge pull request #6948 from edx/will/country-access-part-2 
Finish Country Access (Part 2 of 3)
 2015-02-11 13:15:38 -05:00
Will Daly
5173525389 Avoid logging errors when the image path is not provided for invoice PDFs 2015-02-11 11:01:51 -05:00
Nimisha Asthagiri
9e7b916fd6 Merge pull request #6797 from edx/mobile/perf_improvements 
Mobile performance improvements
 2015-02-10 16:21:37 -05:00
Adam
296167e531 Merge pull request #6950 from edx/release 
Release
 2015-02-10 16:06:24 -05:00
Clinton Blackburn
a27e747993 Merge pull request #6490 from edx/clintonb/oauth2-course-finder-improvements 
Updated _get_courses_with_access_type
 2015-02-10 15:27:17 -05:00
Daniel Friedman
45b7c2056c Merge pull request #6904 from edx/dan-f/fix-grades-download-in-cohorted-courseware 
Fix grades download in courses with cohorted content
 2015-02-10 14:57:04 -05:00
Nimisha Asthagiri
e9e59e85fc Optimize video_module's __init__ method. 
The overall behavior of the __init__ method has remained the same.
What's changed is how it determines whether a field is explicitly set.

Instead of using the slower performing editable_metadata_fields, it
calls _field_data.has directly to check for explicitly set fields.
 2015-02-10 14:02:50 -05:00
Nimisha Asthagiri
a6130507c1 Mobile Video Summary API: add filter for get_children 2015-02-10 14:02:50 -05:00
Nimisha Asthagiri
4b9434a326 Mobile UserCourseStatus API: performance improvement with depth=2. 2015-02-10 14:02:50 -05:00
Nimisha Asthagiri
1840fe7f06 Mobile API: use bulk_operation context manager. 2015-02-10 14:02:49 -05:00
Will Daly
e609f982d7 Country Access: block enrollment 
Block users from enrolling in a course if the user
is blocked by country access rules.

1) Enrollment via the login/registration page.
2) Enrollment from the marketing iframe (via student.views.change_enrollment)
3) Enrollment using 100% redeem codes.
4) Enrollment via upgrade.

This does NOT cover enrollment through third party authentication,
which is sufficiently complex to deserve its own commit.
 2015-02-10 13:07:51 -05:00
Syed Hassan Raza
2f7bee4254 add logging for send_email_task 2015-02-10 21:18:12 +05:00
Calen Pennington
89d4749057 get the raw DescriptorSystem, not the CombinedSystem when instantiating xmodules (TNL-1226) 
get the raw DescriptorSystem, not the CombinedSystem when instantiating xmodules (TNL-1226)

quality fixes

remove trailing comma
 2015-02-10 09:47:44 -05:00
Ben Patterson
630801c72c An upgrade to verified should emit a mode_changed event. 
This change will also move us to bok-choy instead of lettuce for
these scenarios, and re-enable them. See TE-736.

Includes some refactoring of repeated event-checking code as well.
 2015-02-10 09:39:22 -05:00
Daniel Friedman
edd833ebc4 Fix grades download in courses with cohorted content 
TNL-1351
 2015-02-10 09:33:27 -05:00
Will Daly
847f56d160 Merge pull request #6927 from edx/will/invoice-transaction-history 
Add InvoiceHistory model to record changes to invoices
 2015-02-09 13:16:49 -05:00
Adam
2057f7db38 Merge pull request #6929 from edx/release 
Release
 2015-02-09 11:14:41 -05:00
Will Daly
8fba97ead5 Add InvoiceHistory model to record changes to invoices, invoice items, and invoice transactions. 2015-02-09 11:02:10 -05:00
Christina Roberts
4a5679b1df Merge pull request #6762 from edx/christina/split-default 
Enable split for new courses.
 2015-02-09 10:58:40 -05:00
Will Daly
b22b0a35be Merge pull request #6924 from edx/will/ECOM-1045 
ECOM-1045: Add messaging for when students miss the verification deadline
 2015-02-09 10:02:19 -05:00
cahrens
d86c7bec3c Update for renamed test split modulestore. 2015-02-09 10:00:33 -05:00
cahrens
149c4e78c1 Update tests in reaction to ModuleStoreTestCase cleanup. 2015-02-09 10:00:32 -05:00
cahrens
c56c88be4a create_xmodule was renamed to create_xblock, and mixed modulestore has create_xblock method. 
Split modulestore throws duplicate errors if course locator is not unique.
 2015-02-09 10:00:32 -05:00
cahrens
7a64e6f69f Support running test with split modulestore as the default. 
With split, "name" returns "course" instead of the run name.
 2015-02-09 10:00:32 -05:00
cahrens
974eb8a28d Enforce old mongo for test cases doing locator comparisons. 2015-02-09 10:00:31 -05:00
cahrens
040f96223c Update for split modulestore as default. 2015-02-09 10:00:14 -05:00
cahrens
5fb30f333a Clean up test to work with split modulestore. 
Get updated xblocks from modulestore before checking properties.
 2015-02-09 09:26:04 -05:00
Will Daly
0da4b13f25 Add messaging for when students miss the verification deadline 
Show ordinary receipt unless the student is in the payment flow.
 2015-02-08 14:35:11 -05:00
Will Daly
b59aa85166 Remove submission of verification attempt in shopping cart, since it's no longer needed with the new payment/verification flow. 2015-02-07 10:34:45 -05:00
Clinton Blackburn
2945b923d3 Updated _get_courses_with_access_type 
- Return all courses for global staff without iteration
- Filter all courses on block type
 2015-02-06 20:19:42 -05:00
Will Daly
095b96b041 Fix unicode error when sending confirmation email in shopping cart 
Wrap send email operation in try/except to avoid rolling back the transaction once a user has paid.
 2015-02-06 15:20:59 -05:00
Calen Pennington
4851062987 Don't instantiate bogus modulestores just to get template rendering in old ORA 2015-02-06 15:20:59 -05:00
muhammad-ammar
b93dcea315 Change column name in grade report 
TNL-1244
 2015-02-06 09:16:32 +05:00
Jesse Zoldak
1920a60c97 Fix pep8 violation 2015-02-05 12:16:28 -05:00
Jesse Zoldak
7eb5f627d6 Use new modulestore override paradigm in the new testcase 2015-02-05 10:09:05 -05:00
polesye
d02d3b7926 TNL-1299: Update default video. 2015-02-05 10:55:36 +02:00
Will Daly
aba0fcd84d Merge pull request #6894 from edx/will/better-logging-for-cert-cmds 
Info-level logging for certificate management commands
 2015-02-04 21:47:01 -05:00
Will Daly
a8df217a32 Add info-level logging for the management commands used to generate certificates. 2015-02-04 19:41:27 -05:00
Calen Pennington
2bb1aafaaf Merge pull request #6752 from cpennington/modulestore-test-case-cleanup 
Clean up ModuleStoreTestCase
 2015-02-04 15:57:01 -05:00
Akiva Leffert
50730da1b6 Merge branch 'release' 2015-02-04 13:14:29 -05:00
Sarina Canelake
6cdaad58de Merge pull request #6730 from OmarIthawi/edraak/unicode-fixes-log-username 
(WIP) Unicode fixes for log messages with username and other unicode input
 2015-02-04 11:31:57 -05:00
Christina Roberts
f579482e7f Merge pull request #6883 from edx/christina/delete-unused-api 
Delete unused student_profile API.
 2015-02-04 11:29:24 -05:00