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

10619 Commits

Author SHA1 Message Date
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
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
Awais
1d8b0e3e89 ECOM-1205-adding models and tests 2015-04-02 14:55:41 +05: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
MAC
973e3d0306 Fixed invalid URL in progress page. 
TNL-382
 2015-04-01 20:33:35 +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
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
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
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
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
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
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
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
frances botsford
10d58d3644 Merge pull request #7507 from edx/frances/base-gray-a11y 
Make LMS base gray AA compliant
 2015-03-30 17:20: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
Christine Lytwynec
41d7d52bc6 Merge pull request #7515 from edx/clytwynec/lms-onload-beacon 
Fix code comment showing in rendered page
 2015-03-30 10:03:22 -04:00
Christine Lytwynec
b33edbc060 Fix code comment showing in rendered page 2015-03-30 09:05:28 -04:00
David Ormsbee
91b5521d3a Remove timer_expiration_duration (leftover from Pearson proctored exams). 2015-03-27 20:54:36 -04:00
chrisndodge
f441671ca0 Merge pull request #7428 from stvstnfrd/env/course/display 
Override COURSE_*_VISIBILITY_PERMISSION from ENV_TOKENS
 2015-03-27 16:41:42 -04:00
Christine Lytwynec
4d6c47c456 Merge pull request #7503 from edx/clytwynec/lms-onload-beacon 
onload performance beacon for LMS pages
 2015-03-27 16:28:30 -04:00
Frances Botsford
72e9b82480 make base gray AA compliant 2015-03-27 16:20:04 -04:00
Christine Lytwynec
06b3110ea0 onload performance beacon for LMS pages 2015-03-27 11:08:25 -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
Christopher Lee
4423510807 Merge pull request #7480 from edx/clee/MA-169_MA-77 
Clee/ma 169 ma 77
 2015-03-26 13:31:49 -04:00
Matt Drayer
58618d8cee Updated dashboard HTML, dropdown menu interactions, and tests 2015-03-26 12:50:26 -04:00
christopher lee
e8dfac091b MA-77 Auto VAL clone course 
MA-77 Automatically adds the course id to the videos in VAL
when a course is rerun.
 2015-03-26 12:36:43 -04:00
Sarina Canelake
d66bb883ac Fix footer stylings for RTL 2015-03-26 10:15:51 -04:00
Brian Talbot
67168869f5 Adjust styling for Open edX footer details 2015-03-26 10:15:51 -04:00
David Baumgold
89252ec12d Put Open edX logo in LMS edx.org footer 2015-03-26 10:14:37 -04:00
David Baumgold
609b114443 Merge pull request #7475 from edx/adjust-indentation 
Fix whitespace
 2015-03-25 15:58:01 -04:00
christopher lee
3b150da1d7 MA-169 return requested val encoded video profiles 
MA-169 Mobile api now calls for mobile_low (default), mobile_high,
 and youtube profiles instead of only mobile_low.
 2015-03-25 15:40:58 -04:00
Matt Drayer
8107f803f5 Merge branch 'release' 2015-03-25 13:38:43 -04:00
David Baumgold
6840ced41f Fix whitespace 
Don't mix tabs and spaces!
 2015-03-25 13:24:58 -04:00
Marco Morales
dfcb3f2b6e Dashboard styling cleanup/changes, including: 
- reversing the positions of the sidebar and course listing
- html for new social icons (not currently wired up)
- new actions dropdown for unenrollment and email settings
- partial reorganization of dashboard.scss styles
- text fix for unenrollment
- added missing endif, p/hgroup closures
- reverted la.course-item
- removed extra operator
- fixed broken bok choy test
 2015-03-25 10:51:45 -04:00
Will Daly
735b400998 Login/Registration page can skip track selection. 
Add querystring param "course_mode" to the login/registration
page so the user can skip track selection.

This supports upcoming changes to the course details page
that allow the user to choose the track when clicking
"enroll", which will replace the functionality of the track
selection page.
 2015-03-25 09:15:31 -04:00
Mark Sadecki
e1251bfecd Merge pull request #7416 from edx/cptvitamin/UX-1838-dashboard-heading-structure-n-context 
adds additional context for SR users and corrects heading order
 2015-03-24 13:51:33 -04:00
Chris
990f6a0b76 Merge pull request #7462 from edx/clrux/logistration-text-alignment-fix 
Centering the third-party social media buttons
 2015-03-24 10:55:46 -04:00
Chris Rodriguez
0bdb43a45f Centering social media buttons 2015-03-24 10:08:21 -04:00