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

40696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Eskew
a45e5cd679 Merge pull request #14821 from edx/jeskew/update_django_1_8 
Upgrade Django from 1.8.17 to 1.8.18
 2017-04-04 11:43:23 -04:00
Carol Tong
b7c4507055 Merge pull request #14812 from edx/carol/HelpLinkFixes 
Fix broken LMS Help Links
 2017-04-04 11:30:55 -04:00
sanfordstudent
aa31af778b Merge pull request #14809 from edx/sstudent/TNL-6696 
use current()
 2017-04-04 10:56:50 -04:00
Afzal Wali Naushahi
a7ba52d88f Merge pull request #14797 from edx/afzaledx/WL-1016 
WL-1016 | Added org argument for bulk_change_enrollment management command.
 2017-04-04 19:03:03 +05:00
John Eskew
410133d8e8 Upgrade Django from 1.8.17 to 1.8.18 2017-04-04 09:58:15 -04:00
Carol Tong
8ee34ab3ba Fix broken LMS Help Links 2017-04-04 09:22:03 -04:00
Afzal Wali
0c3e6b6e5e WL-1016 | Added org argument for bulk_change_enrollment management command. 2017-04-04 16:25:07 +05:00
AsadAzam
f32e7988e2 Merge pull request #14801 from edx/asadazam/tnl-6637-updated-log 
Asadazam/tnl 6637 updated log
 2017-04-04 14:29:38 +05:00
Asad Azam
a4e50f1add updated eligible_for_certificate log 2017-04-04 12:54:32 +05:00
Renzo Lucioni
72dd85cebf Modify program progress meter for use on detail pages 
The meter now supports use with a single program, and can return serialized courses instead of counts when measuring progress.

ECOM-6602
 2017-04-03 22:19:04 -04:00
Sanford Student
e94513d079 use current() 2017-04-03 11:22:26 -04:00
Matt Drayer
4baf18fe04 Merge pull request #14783 from edx/mattdrayer/ENT-293 
ENT-293: Add SAML metadata refresh control flag
 2017-04-03 10:32:48 -04:00
Muhammad Ammar
073826cac7 Merge pull request #14738 from edx/ammar/fix-flaky-video-js-test 
fix flaky video js test
 2017-04-03 11:33:10 +05:00
Matt Drayer
b64503848c Add SAML metadata refresh control flag 
mattdrayer: Change model fieldname, revise code, fix bad tests.
 2017-04-02 16:47:20 -04:00
Andy Armstrong
4ef009cf4f Merge pull request #14805 from edx/andya/fix-help-link-tests 
Update doc URLs for online help Bok Choy tests
 2017-04-01 22:24:43 -04:00
Andy Armstrong
ebe2ca2ce9 Update URL for Studio getting started guide 2017-04-01 18:48:20 -04:00
Andy Armstrong
adb17172dc Update doc URLs for online help link tests 2017-04-01 18:48:19 -04:00
Andy Armstrong
3be8f92bdf Merge pull request #14790 from edx/andya/course-redirects 
Add data sharing consent redirect for more course tabs
 2017-04-01 08:34:11 -04:00
Andy Armstrong
0325425c8c Add data sharing consent redirect for more course tabs 
LEARNER-394
 2017-03-31 19:12:13 -04:00
Robert Raposa
c6f2db3573 Merge pull request #14774 from edx/rraposa/LEARNER-36 
LEARNER-36: Add new relic custom metrics to course home.
 2017-03-31 16:53:49 -04:00
Robert Raposa
ffe64add55 Add new relic custom metrics to course home. 
- Add new utilities to monitoring_utils djangoapp.
- Use new utilities for all new course tabs.
 2017-03-31 15:19:53 -04:00
Robert Raposa
77f111b2b1 Moves and rename common/djangoapps/newrelic_custom_metrics. 2017-03-31 15:19:53 -04:00
Robert Raposa
d95620775b Merge pull request #14792 from edx/robrap/LEARNER-346 
LEARNER-346: Refactor tests for new course outline.
 2017-03-31 12:50:56 -04:00
Christina Roberts
d445c2355f Merge pull request #14802 from edx/christina/mockpartitionscheme 
Remove dependency on test_partitions.
 2017-03-31 11:36:55 -04:00
Ari Rizzitano
8249f33c92 Merge pull request #14744 from edx/ari/video-transcript-focus 
video a11y improvements (TNL-6361, AC-587)
 2017-03-31 11:22:11 -04:00
Robert Raposa
6362d2259c Refactor tests for new course outline. 2017-03-31 10:47:35 -04:00
cahrens
ec5194365a Remove dependency on test_partitions. 2017-03-31 10:40:51 -04:00
Asad Iqbal
a8f5d4cb63 Merge pull request #14794 from edx/asadiqbal08/ENT-298-New 
ENT-298: Make changes in edx themes templates for enterprise messaging
 2017-03-31 19:14:17 +05:00
Ari Rizzitano
3cb0fd4156 adjust focus order and fix duplicate ids in video player (TNL-6361, AC-587) 
move focus to slider on caption select (TNL-6361)

toggle video playback on spacebar press

sr text for spacebar explanation

focus on slider container instead of handle

linter issues

cleanup

quality

more quality

ugh wrong var name

hack to get around linter

more quality

pls work this time

fix transcript height test

hopefully last one

fix some ie/ff issues

fix dupe ids in video sr instructions. [AC-587]

fix test
 2017-03-31 10:01:44 -04:00
muhammad-ammar
2628c22401 fix flaky video js test 
TNL-6748
 2017-03-31 18:57:29 +05:00
Adam
d4902f88db Merge pull request #14799 from edx/adam/fix-orphan-ora-instr-dashboards 
fix issue where orphaned openassessment blocks cause 500 errors on th…
 2017-03-31 09:55:40 -04:00
asadiqbal
4198d1f8d6 Make changes in edx themes templates for enterprise messaging 2017-03-31 17:56:28 +05:00
Asad Iqbal
a5df7a4bf6 Merge pull request #14787 from edx/asadiqbal08/ENT-287 
asadiqbal08/ENT-287 -- Enterprise messaging only for catalog courses on track selection page
 2017-03-31 17:53:12 +05:00
asadiqbal
ed33d3b09f ENT-287 Track Selection: Enterprise messaging only for catalog courses 2017-03-31 16:54:16 +05:00
Muhammad Ammar
67e45ec728 Merge pull request #14776 from edx/ammar/update-move-a11y-test-docs 
add comment for move a11y test
 2017-03-31 15:58:55 +05:00
Ahsan Ulhaq
dffce65be4 Merge pull request #14739 from edx/ahsan/ECOM-7532-Add-eligible-for-financial-aid-bit-LMS-Sync-course-discovery 
Add eligible for financial aid and sync with course discovery
 2017-03-31 15:39:19 +05:00
Ahsan Ulhaq
9e9c99ac0a Add eligible for financial aid and sync with course discovery 
ECOM-7532
 2017-03-31 14:35:56 +05:00
Brian Jacobel
82dea974d0 Merge pull request #14791 from edx/bjacobel/course-outline-events 
Add events to course outline, and add JS tests for that
 2017-03-30 16:22:00 -04:00
Brian Jacobel
ee344980f8 Add events to course outline, and add JS tests 2017-03-30 15:32:17 -04:00
Matt Drayer
d9ff4ed8ec Merge pull request #14769 from edx/mattdrayer/ENT-292 
ENT-292: Enroll learners in audit mode on direct view of track selection page
 2017-03-30 15:26:32 -04:00
Adam Palay
ac3373ca77 fix issue where orphaned openassessment blocks cause 500 errors on the instructor dashboard (TNL-6797) 2017-03-30 14:51:46 -04:00
Matt Drayer
e2610a31fb Enroll learner in Audit track on postback 2017-03-30 14:29:31 -04:00
Eric Fischer
594dcaf4a1 Merge pull request #14780 from edx/efischer/ora_grades 
Clear Student State: ORA/Robust Grades fixes
 2017-03-30 14:27:45 -04:00
Albert (AJ) St. Aubin
79a9984bd9 Merge pull request #14772 from edx/TNL-6603_verified_track_counts 
Added filter to the cohort user count data to show the counts of only
 2017-03-30 13:48:42 -04:00
Christina Roberts
7c774ae822 Merge pull request #14731 from edx/christina/enrollment_track_partition_review 
EnrollmentTrackUserPartition to be used for differentiated content
 2017-03-30 13:25:33 -04:00
cahrens
e5035746bf Introduce EnrollmentTrackUserPartition. 
TNL-6674
 2017-03-30 12:24:48 -04:00
Albert St. Aubin
21ef60b4c4 Added filter to the cohort user count data to show the counts of only 
active users
 2017-03-30 12:02:34 -04:00
Eric Fischer
10faaa557d edx-ora2/submissions upgrades 2017-03-30 11:08:29 -04:00
Eric Fischer
4a90a5df84 Resolve circular dependency issue 2017-03-30 11:08:29 -04:00
Eric Fischer
b484092397 Clear Student State ORA/Robust Grades cleanup 2017-03-30 11:08:29 -04:00