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

2152 Commits

Author SHA1 Message Date
aamir-khan
917ca595cc ECOM-1289: added the re-verification service to implement the re-verification xblock 2015-04-07 18:09:53 +05:00
Nimisha Asthagiri
58afd8a7c7 Merge pull request #7541 from edx/mobile/import_fix_course_id 
MA-410 Update video_module import to use target course_id.
 2015-04-02 19:56:04 -04:00
Adam
9ad4b71688 Merge pull request #7572 from edx/release 
Release
 2015-04-02 17:24:50 -04:00
Awais Jibran
037a189828 Merge pull request #7555 from awaisdar001/aj/tnl382-fix-lms-progress-page-invalid-url 
Fixed invalid URL in progress page.
 2015-04-02 22:14:18 +05:00
Nimisha Asthagiri
7e1104c421 MA-410 Update video_module import to use target course_id. 2015-04-02 11:38:01 -04:00
Waheed Ahmed
62a515f038 Fixed static pages removed on import for split course. 
PLAT-484
 2015-04-02 20:14:46 +05:00
Waheed Ahmed
d9b685d5df Fixed beta tester functionality for ora problems. 
TNL-1736
 2015-04-02 16:51:58 +05:00
Awais Jibran
13e2ecee18 Code refector: Using replaced 'to_deprecated_string' with 'unicode' 2015-04-02 15:30:24 +05:00
MAC
973e3d0306 Fixed invalid URL in progress page. 
TNL-382
 2015-04-01 20:33:35 +05:00
Jesse Zoldak
4f8357799d Merge pull request #7539 from edx/jeskew/vertical_ee_test_fix 
Remove mocked has_dynamic_children method.
 2015-04-01 07:35:51 -04:00
Greg Price
c860f790c2 Merge pull request #7508 from edx/gprice/export-import-val 
Include VAL data in video module export/import
 2015-03-31 20:28:31 -04:00
Greg Price
cfcb304885 Include VAL data in video module export/import 
This is required so that an a video module exported by one Open edX
deployment and imported by another will work correctly if it contains an
edx_video_id but does not populate other URL fields.

JIRA: MA-110
 2015-03-31 19:35:06 -04:00
John Eskew
39c0939d7f Remove mocked has_dynamic_children method - un-needed after vertical 
block conversion.
 2015-03-31 17:58:01 -04:00
Matt Drayer
cbf336e8e0 Merge pull request #7293 from edx/ziafazal/access-gating-for-entrance-exam 
Entrance exam gating
 2015-03-31 13:38:00 -04:00
Zia Fazal
cc04bb990e Add new gating logic to restrict users from accessing courseware when an entrance exam is required 
- added entrance exam check on course info
- staff can by pass gating and added tests
- refined gating logic
- changes after rebasing with Asad's branch
- check ENTRANCE_EXAMS feature is enabled
- updated test to reflect new logic
- catering anonymous user in entrance exam permission
- fixed broken tests
- change after feedback on 16/3
- fix for a broken test
- created new entrance_exams module
- fixed quality error and improved test coverage
- put get_required_content back in milestones helper
- Refactored entrance exams logic
- Refactored tabs logic
- Fixed broken unit test
- changes after feedback from dan-f on 3/27
- removed unnecessary user.is_anonymous check
- Addressed PR feedback
- Addressed commit-specific feedback
- Rework guard clauses
- Add coverage for course info case
 2015-03-31 12:12:04 -04:00
Calen Pennington
8f133f6696 Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical 
Convert Vertical XModule to pure Vertical XBlock.
 2015-03-31 11:10:22 -04:00
Matt Drayer
d9611dcd9f Merge pull request #7382 from edx/mattdrayer/SOL-461 
mattdrayer/SOL-461: Student dashboard clean-up
 2015-03-31 10:53:45 -04:00
Calen Pennington
a0bae0c794 Convert VerticalModule/VerticalDescriptor to a pure XBlock: VerticalBlock 2015-03-31 09:43:52 -04:00
Calen Pennington
8341f1b7c8 Move type-checking of position earlier in courseware.views.index 2015-03-31 09:43:52 -04:00
Marco Morales
bd5b0b31a0 Matt - javascript and test changes, Marco - styling feedback from initial reviews 2015-03-31 08:47:17 -04:00
Calen Pennington
b50876fc32 Make XBlockToXModuleShim use json-init-args to record the XModule constructor to shim to 2015-03-30 16:37:53 -04:00
Calen Pennington
1f17538d42 Clean up tests in preparation for switching Vertical from an XModule to an XBlock 2015-03-30 16:37:53 -04:00
John Eskew
34adb256a6 Add datadog counters everywhere a "VS[compat]" comment exists. 
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
 2015-03-26 16:18:15 -04:00
Will Daly
e66409be45 Merge pull request #7444 from edx/will/self-gen-certs-docstring-cleanup 
Docstring/messaging cleanup in self-generated certs view.
 2015-03-23 12:13:53 -04:00
Will Daly
30058b913c Merge pull request #7425 from edx/clrux/ux-1784-generate-certificates 
Styling for automatic cert generation on Progress page
 2015-03-23 11:23:43 -04:00
Chris Rodriguez
f8da29b9cf Styling for automatic cert generation on Progress page 2015-03-23 10:44:33 -04:00
Will Daly
659535365d Update error messaging for progress page self-gen certs 
Clean up docstrings for gen cert POST.
 2015-03-23 09:10:39 -04:00
Will Daly
704e8836f0 Course info page no longer creates enrollments. 
The course info page was getting-or-creating
a course enrollment with is_active=0.  This commit
changes the operation to a "get" so that extra
enrollment records are not created.
 2015-03-20 15:22:20 -04:00
Adam
d012428c34 Merge pull request #7426 from edx/adam/merge-release-to-master 
Adam/merge release to master
 2015-03-20 10:42:22 -04:00
Ahsan Ulhaq
60cb7cf33a Merge pull request #7325 from edx/ahsan/tnl-1693-standarize-button-on-assessment-types 
Standrize buttons in assessment problems
 2015-03-20 18:50:27 +05:00
Syed Hassan Raza
d17a0c6ad2 handle invalid-key exception for split courses 2015-03-20 16:18:27 +05:00
Adam Palay
b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master 
Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py
 2015-03-19 16:30:46 -04:00
Martyn James
7c942dddb5 Merge pull request #7219 from edx/mjames/SOL-289 
Addresses problem with 'up' and 'down' errors within SOL-289
 2015-03-19 09:51:36 -04:00
alawibaba
9b79797b28 Created performance logging endpoint, changed CDN experiment to point to it. 2015-03-19 07:53:01 -04:00
Ned Batchelder
a64d926845 Merge pull request #7399 from edx/ned/plat-462 
Make sure slashes in JSON content don't end script tags. PLAT-462
 2015-03-18 22:47:50 -04:00
Ned Batchelder
6928035cd1 Make sure slashes in JSON content don't end script tags. PLAT-462 
The string "</script>" in JSON data would end the script element we're
embedding the data in.  To make sure the data doesn't disrupt the
script, we escape the slash as \/ .
 2015-03-18 21:55:36 -04:00
Ned Batchelder
6ac1b82bb2 Merge pull request #7356 from edx/ned/fix-or-remove-teardown 
Fix or remove tearDown methods that don't use super.
 2015-03-18 17:36:17 -04:00
Ned Batchelder
425b766965 Remove TEST_DATA_MOCK_MODULESTORE 2015-03-17 17:21:52 -04:00
Will Daly
2bc82367ce Add missing import of override_settings to fix a broken test in courseware 2015-03-17 16:43:29 -04:00
Calen Pennington
8e4ee78fff Merge pull request #7262 from edx/cale/xblock-filtered-children-tests 
Clear children cache when binding an XBlock to a user.
 2015-03-17 16:04:54 -04:00
Will Daly
9b49059e1f Merge pull request #7383 from edx/will/ecom-1134 
Update social media links in EdX footer.
 2015-03-17 15:34:36 -04:00
Ned Batchelder
81d17c516e Fix or remove tearDown methods that don't use super. 
Update edx-lint to the version that checks if tearDown uses super.

Convert a number of tearDown methods into addCleanup.

Remove some unneeded tearDown methods: no need to call patch.stopall if
none of them were started with patch.start.
 2015-03-17 15:14:52 -04:00
Martyn James
a495bb5f9e Addresses problem with 'up' and 'down' errors within SOL-289 2015-03-17 15:12:38 -04:00
Calen Pennington
9e7404cd4a Add test of courseware.views.index rendering with saved student state 2015-03-17 13:15:19 -04:00
Calen Pennington
fd746b6f13 Clean up import order in test_module_render 2015-03-17 13:15:18 -04:00
Calen Pennington
17a6cfee70 Update query counts to new reality 2015-03-17 13:15:18 -04:00
Calen Pennington
26df09e404 Add test of iterating over a course tree multiple times in the same request 2015-03-17 13:15:18 -04:00
Calen Pennington
11dcf12f14 Make XModule use the same get_children that XModuleDescriptor and XBlock do, and make it returned the same CombinedSystem 2015-03-17 13:15:18 -04:00
Calen Pennington
40ae5d2e1c Merge pull request #7365 from cpennington/lms-field-data-query-counts 
Reduce queries from FieldDataCache
 2015-03-17 11:55:46 -04:00
Calen Pennington
88b9187476 Decrease the number of inserts and updates needed by DjangoKeyValueStore 2015-03-17 10:57:13 -04:00