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

28483 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waheed Ahmed
268280dfb5 Merge pull request #6908 from edx/waheed/tnl1352-fix-login-if-user-none-with-advanced-security-on 
Fixed ajax login when advanced security check is on for NoneType user.
 2015-02-09 22:28:54 +05:00
Adam
2057f7db38 Merge pull request #6929 from edx/release 
Release
 2015-02-09 11:14:41 -05:00
Waheed Ahmed
cb88c1dd66 Fixed ajax login when advanced security check is on for NoneType user. 
TNL-1352
 2015-02-09 21:14:06 +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
d88b0c488e store.has_course fails on old mongo with unicode chars. 
xml_importer now calls store.has_course even if create_course_if_not_present is False.
 2015-02-09 10:00:33 -05:00
cahrens
78a8fd807a If existing course is found on import, make sure dest_course_id is correct. 
TNL-1362
 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
a89304b991 Cleanup to make tests agnostic to the modulestore being used. 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
f5d3d6050d Test of draft content depends on old mongo. 2015-02-09 10:00:12 -05:00
Adam
e2f67b5cfb Merge pull request #6892 from edx/hotfix/2015-02-04 
Don't instantiate bogus modulestores just to get template rendering in o...
 2015-02-09 09:47:10 -05:00
Awais Qureshi
a17a5374b2 Merge pull request #6915 from edx/aamir-khan/ECOM-996-country-access-settings 
Aamir khan/ecom 996 country access settings
 2015-02-09 19:33:52 +05:00
cahrens
840b42a9f1 Specify old mongo modulestore. 
Testing migration from old mongo to split.
 2015-02-09 09:26:06 -05:00
cahrens
b5e798062b Specify old mongo modulestore. 
Tests verify operation counts for old mongo. Should be extended to split in the future.
 2015-02-09 09:26:06 -05:00
cahrens
818a950815 Change to work with split modulestore. 
Cannot create an xblock in a course that doesn't exist.
 2015-02-09 09:26:05 -05:00
cahrens
e9f2f626ca Change to work with split modulestore. 
make_asset_key does not start with "/" for split locators.
 2015-02-09 09:26:05 -05:00
cahrens
7a3a48b15b Update to work with split_modulestore. 
"run" should not be passed in kwargs to create.
 2015-02-09 09:26:05 -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
6272817c07 Tests fail with split modulestore. 
Have not been able to work out why.
 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
29e235213c Update for default store being split. 
Note that now 2 courses can be imported where the only difference between them is run.
 2015-02-09 09:26:04 -05:00
cahrens
e66e2eda20 Use old mongo store to create courses. 
export_courses_to_output_path uses old mongo locator to create directory structure.
 2015-02-09 09:26:04 -05:00
cahrens
4e6c532717 Force usage of the old mongo modulestore. 
The way that assets are accessed (the usage of _id) seems specific to old mongo and fails with split.
 2015-02-09 09:26:04 -05:00
cahrens
9e6249ddd6 Enable split for new courses. 2015-02-09 09:26:04 -05:00
Calen Pennington
61f86369ad Merge pull request #6843 from cpennington/test-for-plat-417 
Add tests of PLAT-417
 2015-02-09 09:15:12 -05:00
Will Daly
92c2fdbca1 Add new models to embargo to support country access 
Add Django admin UI for configuring country access

Migrate existing embargo rules into the new tables.

ECOM-996: updated the middleware to use new models and access rules

ECOM-996: added the flag to support old and new formats

ECOM-996: added the api layer for country access settings

ECOM-996: added the api layer for country access settings

ECOM-996 implementing the white and blacklist checks.

ECOM-996 minor re-factoring in api.

ECOM-996 minor re-factoring in api.

ECOM-1025 refactoring the code according to PR feedback.

ECOM-1025 refactoring the code according to PR feedback.

ECOM-1025 deleting cache in model save and delete methods

ECOM-1025 adding basic api test cases file.

ECOM-1025 refactoring the code according to PR feedback.

ECOM-1025 refactoring the code according to PR feedback.

ECOM-1025 refactoring the code according to PR feedback. adding the test cases.

ECOM-1025 removing extra line

ECOM-1025 removing un-used function.

ECOM-1025 removing un-used function.

ECOM-1025 re-factor the code.

ECOM-1025 re-name the test file to test_middleware_access_rules.py. we already had old test_middleware.py

ECOM-1025 adding test cases for newly added models.

ECOM-1025 adding test cases and resolve conflicts.

ECOM-1025 fixing the quality and pep-8 issues.

ECOM-1025 re-factoring the code according to the PR feedback.

ECOM-1025 re-name the variable name.

ECOM-1025 removing the _check_ip_lists and its test cases. also added few missing scenarios test cases.

ECOM-1025 removing un-used line.
 2015-02-09 18:28:10 +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
e43f1a8bcb Merge pull request #6923 from edx/will/clean-up-verification-exception 
Remove submission of verification attempt in shopping cart
 2015-02-07 16:41:38 -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
Waheed Ahmed
55edd327ac Merge pull request #6910 from edx/waheed/tnl1336-fix-close-button-for-help-feedback-menu 
Fixed close button for help feedback menu.
 2015-02-07 02:39:35 +05:00
David Baumgold
6fa6d62ada Merge pull request #6919 from edx/delete-brewfile 
Remove Brewfile
 2015-02-06 16:13:31 -05:00
Jesse Zoldak
3f1604ac28 Merge pull request #6736 from edx/zoldak/content-library 
Fix flaky content library test
 2015-02-06 15:54:54 -05:00
David Baumgold
cdd29358dd Remove Brewfile 
Homebrew no longer supports it, anyway
 2015-02-06 15:53:32 -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
John Eskew
46f64305f7 Merge pull request #6767 from edx/jeskew/split_course_export_slowdown_take_II 
Fix performance problem with Split course import/export.
 2015-02-06 15:18:26 -05:00
Jesse Zoldak
07e0eee2bd Fix flaky content library test 2015-02-06 14:59:31 -05:00
zubair-arbi
b01f7adce1 Merge pull request #6907 from edx/zub/bugfix/tnl-1335-html5-contextual-menu 
fix contextual menu (make it clickable) for HTML5 videos
 2015-02-06 21:38:09 +05:00
John Eskew
9388ba5968 Change new BlockData object from a dict to an object with specific 
attributes that are serialized/de-serialized to/from MongoDB.

Change access of attributes from dict keys.

Add EditInfo object to encapsulate editing info for block data.
 2015-02-06 11:28:54 -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
Calen Pennington
79fe947a92 Add test of PLAT-417 2015-02-06 09:59:49 -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
zubair-arbi
a750476c73 fix contextual menu (make it clickable) for HTML5 videos 
TNL-1335
 2015-02-06 16:18:09 +05:00
ahsan-ul-haq
c814323644 Merge pull request #6810 from edx/ahsan/tnl-1074-adaptive-hint-inaccessible 
Problem with Adaptive Hint is inaccessible
 2015-02-06 15:15:11 +05:00