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

40518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Muzaffar yousaf
a477a9dc83 Merge pull request #14726 from edx/video-speed-ospr-1673 
Fix video speed issues (Firefox and Safari)
 2017-03-21 14:01:25 +05:00
Nishant Karandikar
a480a502c1 Remove unnecessary param in function declaration & calls 
There was previously a bug in the Youtube API that caused videos
to not play at a set speed in Safari. The bug has apparently since
been fixed, so we no longer need code for that browser
special case.
 2017-03-21 11:44:53 +05:00
Nishant Karandikar
97ec1cec30 Remove unnecessary javascript 
Previously, the Youtube API had a bug where a speed change from
another speed back to 1.0 would not register properly in Firefox.
The API has since been fixed, so there is no need for a workaround
 2017-03-21 11:44:53 +05:00
Nimisha Asthagiri
89518d798b Merge pull request #14719 from edx/neem/block-structure-waffle-in-task 
Have generate_course_blocks pass with_storage to celery tasks
 2017-03-20 17:26:05 -04:00
Nimisha Asthagiri
e83182c743 Have generate_course_blocks pass with_storage option to celery tasks 2017-03-20 16:22:44 -04:00
Jesse Zoldak
bb31724f12 Merge pull request #14733 from edx/zoldak/TNL-6748 
Skip failing JS test TNL-6748
 2017-03-20 16:05:50 -04:00
Matthew Piatetsky
ec1c88e58a Merge pull request #14728 from edx/ECOM-7389 
ECOM-7389 Toggle new program progress page with waffle switch
 2017-03-20 15:49:19 -04:00
Jesse Zoldak
9967b0f137 Skip failing JS test TNL-6748 2017-03-20 15:21:27 -04:00
Nimisha Asthagiri
3d769c782a Merge pull request #14723 from edx/neem/block-structure-storage-i4x-keys 
Update BlockStructureModel to support Old Mongo courses
 2017-03-20 15:01:58 -04:00
Cliff Dyer
e34b40f0d3 Merge pull request #14715 from edx/neem/show-rescore 
Ensure ScorableXBlocks have rescore button.
 2017-03-20 14:53:16 -04:00
Matthew Piatetsky
d31a8a4dbc Toggle new program progress page with waffle switch 
ECOM-7389
 2017-03-20 13:23:42 -04:00
Nimisha Asthagiri
599982f35d Update BlockStructureModel to support Old Mongo courses 2017-03-20 13:09:04 -04:00
Albert (AJ) St. Aubin
8ec9012eac Merge pull request #14673 from edx/aj/missed_headers_styles 
Updates to correct a header styling issue
 2017-03-20 10:55:15 -04:00
Nimisha Asthagiri
44a8e1b874 Merge pull request #14717 from edx/neem/block-structure-right-bucket 
Storage-backed Block Structures: Use correct bucket
 2017-03-20 10:33:01 -04:00
Albert St. Aubin
91fce2a92b Updates to correct a header styling issue and to make the starting header level selectable 2017-03-20 08:37:33 -04:00
Nimisha Asthagiri
2b0ff8e3a3 Storage-backed Block Structures: Use correct bucket 
TNL-6645
 2017-03-20 00:05:06 -04:00
Nimisha Asthagiri
a2daa8d0fd Move generate_course_blocks to block_structure 2017-03-20 00:04:16 -04:00
Matthew Piatetsky
bf08c6ed7c Merge pull request #14698 from edx/ECOM-6601 
ECOM-6601 Update display of progress on programs dashboard
 2017-03-19 19:04:50 -04:00
Jillian Vogel
9330cca5ac Merge pull request #14671 from open-craft/jill/enterprise-public-enrollment-api-url 
Adds ENTERPRISE_PUBLIC_ENROLLMENT_API_URL to settings
 2017-03-18 18:23:47 +10:30
Jillian Vogel
be088dd924 Adds settings.ENTERPRISE_PUBLIC_ENROLLMENT_API_URL 
which is used for external, client-side requests by the Enterprise app to the
Enrollments API.

This allows ENTERPRISE_ENROLLMENT_API_URL to use localhost:8000, to be used for
internal, server-side requests.

Bumps edx-enterprise version to 0.27.4 to use this change.
 2017-03-18 12:43:53 +10:30
Nimisha Asthagiri
6a954c1e4e Merge pull request #14690 from edx/neem/fix-entrance-exam-grades 
Fix grading for Entrance Exams
 2017-03-17 19:04:35 -04:00
Matthew Piatetsky
f9f5119277 Update display of progress on programs dashboard 
ECOM-6601
 2017-03-17 19:02:15 -04:00
Nimisha Asthagiri
54d938cab5 Fix grading for Entrance Exams 
TNL-6227
 2017-03-17 17:32:36 -04:00
Uzair Rasheed
a8277a6a64 Merge pull request #14658 from edx/uzairr/TNL-6639 
TNL-6639 Add timeout in request to xqueue
 2017-03-18 02:00:38 +05:00
Nimisha Asthagiri
a77c345a58 Merge pull request #14689 from edx/neem/fix-milestone-grades 
Fix grading for Gated Subsections
 2017-03-17 16:10:12 -04:00
J. Cliff Dyer
9ee79a5729 Ensure ScorableXBlocks have rescore button. 2017-03-17 12:40:19 -04:00
AsadAzam
6a85cd1a7c Merge pull request #14712 from edx/TNL-6637-whitelist-logs 
Added logs for adding/removing students from whitelist
 2017-03-17 21:11:29 +05:00
Michael Youngstrom
228eb5103b Merge pull request #14661 from edx/michaelyoungstrom/django_setting_change 
Disable Django API browser
 2017-03-17 10:58:18 -04:00
Jesse Shapiro
09751421ef Merge pull request #14709 from open-craft/haikuginger/update-enterprise-0.27.3 
[ENT-215/ENT-217] Update edx-enterprise to 0.27.3
 2017-03-17 10:52:14 -04:00
Michael Youngstrom
195e7f27d3 Disable Django API browser and bump pa11ycrawler 
Force run on PR for testing

Remove pa11ycrawler from base.txt for testing

Update pa11ycrawler dependency

Revert code needed for testing on Jenkins

Enable testing for Jenkins

Update accessibility-tests.sh

Update accessibility-tests.sh

Point to newest pa11ycrawler release

Remove force run on PR

Reset accessibility-tests.sh
 2017-03-17 13:51:13 +00:00
Asad Azam
9ae3a3210b Added logs for adding/removing students from whitelist 2017-03-17 17:48:19 +05:00
uzairr
d117222f7c Add timeout in request to xqueue 2017-03-17 10:23:20 +00:00
M. Rehan
3c040b93c2 Merge pull request #14704 from edx/mrehan/strip-edx-video-id 
TNL-5769 – strip video id on saving the video
 2017-03-17 12:56:41 +05:00
Muhammad Ammar
7766e15a65 Merge pull request #14684 from edx/ammar/backend-changes-to-support-hls 
backend changes to support hls
 2017-03-17 12:46:26 +05:00
M. Rehan
dd6b203cf0 Merge pull request #14664 from edx/mrehan/prioritize-youtube-subs-over-html5-on-save 
TNL-6539 – Prioritize youtube subs over html5 ones
 2017-03-17 12:23:06 +05:00
Nimisha Asthagiri
790208495a Merge pull request #14706 from edx/neem/async-grade-enabled 
Compute grades asynchronously although PersistentGrades is disabled
 2017-03-16 21:53:10 -04:00
Jesse Shapiro
a06f915230 Update edx-enterprise to 0.27.3 2017-03-16 18:37:54 -04:00
Nimisha Asthagiri
634ac8a825 Still compute grades asynchronously when PersistentGrades is enabled 2017-03-16 18:26:17 -04:00
Ned Batchelder
11788282b7 Merge pull request #14702 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-03-16 15:00:12 -04:00
Ned Batchelder
73850f4627 Update translations (autogenerated message) 2017-03-16 14:07:42 -04:00
Ned Batchelder
75cb211cbe Update translations (autogenerated message) 2017-03-16 14:07:41 -04:00
sanfordstudent
2604cd24bb Merge pull request #14675 from edx/sstudent/TNL-6644 
change rescore-if-higher to update if scores are equal
 2017-03-16 11:59:39 -04:00
Qubad786
4a2589c7c3 strip video id on saving the video 2017-03-16 19:48:46 +05:00
muhammad-ammar
5ec5e97a0c backend changes to support hls 
TNL-6541
 2017-03-16 19:30:49 +05:00
Sanford Student
9a44777335 changes is score higher to use gtoe 
for TNL-6644
 2017-03-16 10:25:37 -04:00
Jeremy Bowman
165f348a36 Merge pull request #14696 from edx/jmbowman/PLAT-1198 
PLAT-1198 Fix flaky navigation buttons test
 2017-03-16 10:09:08 -04:00
Attiya Ishaque
474ad1a01b Merge pull request #14693 from edx/ai/TNL-6188-escaping 
TNL-6188 Escaping in course outline section & subsection.
 2017-03-16 18:58:22 +05:00
Qubad786
0ff62e766e prioritize youtube transcripts over html5 ones 2017-03-16 14:38:51 +05:00
attiyaishaque
abcbb09414 TNL-6188 Escaping in course outline section & subsection. 2017-03-16 11:13:28 +05:00
Nimisha Asthagiri
cfb032a50c Fix grading for Gated Subsections 
TNL-5955
 2017-03-15 17:16:20 -04:00