Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28,531 Commits 1 Branch 0 Tags
3b319b3d3f52b4ae69c652c4a9b0edc1963fccef
Commit Graph

10203 Commits

Author SHA1 Message Date
Awais Qureshi
f3c3202341 Merge pull request #6931 from edx/awais786/ECOM-1028-add-profile-linkedin 
ECOM-1028 adding linked-in button , config model and migration for linke...
 2015-02-11 20:45:30 +05:00
Waqas Khalid
4f326a8ca3 Merge pull request #6832 from edx/waqas/tnl1149-discussion-mathjax-solution 
Discussion forum should be independent of mathjax
 2015-02-11 20:27:45 +05:00
Awais
57ef60de0a ECOM-1028 adding linked-in button , config model and migration for linked url. 
ECOM-1028 update the migration and move the code into class method.
 2015-02-11 19:09:30 +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
Syed Hassan Raza
2f7bee4254 add logging for send_email_task 2015-02-10 21:18:12 +05:00
Martyn James
c668be3133 Merge pull request #6855 from edx/dsego/SOL-260 
Courseware search: Change name of results page from "Searching [course n...
 2015-02-10 11:02:27 -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
Waqas Khalid
11159ba71e Discussion forum doesn't work when mathjax is down 
When mathjax is down discussion forum doesn't work
as we were using markdown.js with processor as
mathjax. Unavailability of mathjax raise error in
js which stops discussion to render. So I made
markdown independent of mathjax. Markdown now will
use mathjax when it is available otherwise ignore it.

TNL-1149
 2015-02-10 13:12:41 +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
5b0d150fe9 Update to work with split_modulestore. 
Cannot hold on to xblock references.
 2015-02-09 09:26:05 -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
cahrens
9e6249ddd6 Enable split for new courses. 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
Waheed Ahmed
1e824a2d46 Fixed close button for help feedback menu. 
TNL-1336
 2015-02-07 01:38:09 +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
b83ed09f22 Merge pull request #6870 from edx/ammar/tnl-1244 
Change column name in grade report
 2015-02-06 21:21:32 +05:00
Martyn James
e760d2d2d2 Update styles 2015-02-06 11:11:37 -05:00
Anton Stupak
81d51f9671 Merge pull request #6897 from edx/anton/edxnotes-fix-deps 
TNL-1353: Fix annotator dependency.
 2015-02-06 13:31:40 +02:00
muhammad-ammar
b93dcea315 Change column name in grade report 
TNL-1244
 2015-02-06 09:16:32 +05:00
Martyn James
63e9bd55ba Added confirmation that 'Search Results' appears 2015-02-05 13:24:03 -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
c88aad557a TNL-1353: Fix annotator dependency. 2015-02-05 15:51:30 +02: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
Sarina Canelake
562842d235 Merge pull request #6895 from edx/sarina/privacy-date 
Update privacy policy date to the most recent
 2015-02-04 15:11:54 -05:00