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

29453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
ab63243d01 Decorate flaky test SOL-618 2015-04-02 14:26:46 -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
Awais Qureshi
4db1753e57 Merge pull request #7530 from edx/aamir-khan/ECOM-912-in-course-reverification 
Aamir khan/ecom 912 in course reverification
 2015-04-02 19:05:08 +05:00
Waheed Ahmed
1e7dd06461 Merge pull request #7422 from edx/waheed/tnl1736-fix-beta-tester-functionality-for-ora 
Fixed beta tester functionality for ora problems.
 2015-04-02 17:52:58 +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
Ahsan Ulhaq
badbc3e3b7 Merge pull request #7499 from edx/ahsan/tnl-1784-every-keystroke-triggers-aria-live-region-announcements 
DOM updates on every keystroke are triggering aria-live region announcements
 2015-04-02 15:07:10 +05:00
Awais
1d8b0e3e89 ECOM-1205-adding models and tests 2015-04-02 14:55:41 +05:00
Greg Price
0e6ed88664 Merge pull request #7557 from edx/gprice/video-upload-imported 
Add "Imported" state to Studio video upload page
 2015-04-01 17:15:26 -04:00
Clinton Blackburn
2b5a854fd9 Merge pull request #7527 from edx/clintonb/edx-oauth2-provider-upgrade 
Updated edx-oauth2-provider to 0.5.1
 2015-04-01 15:35:30 -04:00
Carol Tong
80844e1bc3 Merge pull request #7531 from edx/carol/doc/TestsSidebarHelp 
DOC: Enhance Content Group and Experiment Group Config Sidebar Help
 2015-04-01 14:48:19 -04:00
Sarina Canelake
543adcfbc1 Merge pull request #7559 from mcgachey/mcgachey-authors 
Adding phil_mcgachey@harvard.edu to the AUTHORS list
 2015-04-01 14:28:23 -04:00
Will Daly
bedba6a600 Merge pull request #7529 from edx/will/cors-iframe-proxy 
Add proxy to allow IE9 to make xdomain requests
 2015-04-01 14:18:42 -04:00
Carol Tong
437d3229db Enhancements to Content Group and Experiment Group Config Sidebar Help 2015-04-01 13:53:14 -04:00
Christine Lytwynec
e69e94029d Merge pull request #7556 from edx/clytwynec/skip_acid_block_tests 
skip acid block tests [TE-812]
 2015-04-01 13:25:56 -04:00
Phil McGachey
44796c5878 Adding phil_mcgachey@harvard.edu to the AUTHORS list 2015-04-01 13:13:31 -04:00
Greg Price
eafd12d8de Add "Imported" state to Studio video upload page 
Imported VAL videos get the value "imported" for their status. We
considered not including imported videos on the upload page but have
instead decided to include them, so it is necessary to have a display
string for the imported status value.
 2015-04-01 12:25:07 -04:00
Christine Lytwynec
0370e90611 skip acid block tests 2015-04-01 12:23:31 -04:00
Clinton Blackburn
9bf2712512 Updated edx-oauth2-provider to 0.5.1 2015-04-01 12:22:01 -04:00
MAC
973e3d0306 Fixed invalid URL in progress page. 
TNL-382
 2015-04-01 20:33:35 +05:00
zubair-arbi
1f9ead5d46 Merge pull request #7547 from edx/zub/bugfix/ecom-1273-enrollment-api-catch-NoneType-courses 
log and ignore invlaid/deleted courses in Enrollment API
 2015-04-01 19:23:40 +05:00
Will Daly
fcc5b1e347 Add proxy to allow IE9 to make xdomain requests 
Adds an /xdomain_proxy.html endpoint that serves
the proxy file from the xdomain library.  This
allows IE9 users to iframe in the proxy page
to simulate a cross-domain request with cookies.
 2015-04-01 09:16:42 -04:00
zubair-arbi
ec2f4dc2fe Merge pull request #7523 from edx/zub/bugfix/ecom-579-change-education-level-option-label 
change education level option label to read "Associate" degree
 2015-04-01 17:17:58 +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
zubair-arbi
a9b13f0e72 log and ignore invlaid/deleted courses in Enrollment API 
ECOM-1273
 2015-04-01 16:26:24 +05: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
Calen Pennington
e394c18188 Merge pull request #7476 from cpennington/bulk-assert-all-assertions 
Make BulkAssertionTest.bulk_assertions work with any assert* method
 2015-03-31 15:19:44 -04:00
Sarina Canelake
c1f3f558f2 Merge pull request #7524 from louyihua/underscore_extraction 
Fix string extraction error in underscore files
 2015-03-31 14:30:44 -04:00
Jesse Zoldak
8bfc948b37 Merge pull request #7533 from cpennington/add-mixins-to-mixed-modulestore-tests 
Pass standard list of xblock mixins to MixedModulestore in tests
 2015-03-31 14:29:35 -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
Calen Pennington
462cdfd9b4 Pass standard list of xblock mixins to MixedModulestore in tests 2015-03-31 13:31:30 -04:00
louyihua
46342a3f48 Fix string extraction error in underscore files 
The written style ```interpolate(gettext('some text'), {...}, ...)``` will will cause the string inside gettext() not be extracted.
So a separate line is needed for ```gettext``` when gettext function is directly called inside a call to the interpolate function.
 2015-04-01 01:23:36 +08:00
Sarina Canelake
4a4478fd8b Merge pull request #7526 from delftswa2014/readmes 
added READMEs for top level directories
 2015-03-31 13:16:29 -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
Sarina Canelake
11f75e04fc Merge pull request #7512 from johnespinosa/patch-1 
Fixed i18n Problem with xBlock Menu
 2015-03-31 12:04:52 -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
Calen Pennington
3d7bd9aa7b Make BulkAssertionTest.bulk_assertions work with any assert* method 2015-03-31 10:57:15 -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
Mayank Jain
cf7777a474 added READMEs for top level directories 2015-03-31 16:47:37 +02:00
David Ormsbee
2fea7b4ce5 Merge pull request #7510 from edx/ormsbee/remove_timer_expiration_duration 
Remove timer_expiration_duration (leftover from Pearson proctored exams)
 2015-03-31 10:45:03 -04:00
Sarina Canelake
092c86e097 Merge pull request #7520 from louyihua/fix-studio-name 
Fix two missing replacements of {studio_name}
 2015-03-31 10:40:58 -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
Calen Pennington
85fce7e3b7 Move more common operations (which work in both XBlocks and XModules) into XModuleMixin 2015-03-31 09:43:51 -04:00
Calen Pennington
391db6a848 Linting cleanups 2015-03-31 09:43:51 -04:00
Calen Pennington
da2964421e Extract a pure-XBlock version of XmlDescriptor 2015-03-31 09:43:51 -04:00
Calen Pennington
62a90db1a7 Extract a pure-XBlock version of StudioEditingModule 2015-03-31 09:43:51 -04:00
Calen Pennington
ee401f15f4 Make mongo/draft.py pass the active descriptor system through item loading 2015-03-31 09:43:51 -04:00