Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

17975 Commits

Author SHA1 Message Date
Jae Bradley
7fb4ca5ce1 Merge pull request #17284 from edx/jaebradley/LEARNER-3945 
LEARNER-3945: Add try/catch in Learner Analytics View
 2018-01-23 15:48:06 -05:00
jaebradley
a2cc48d37d fix mobile responsive modal 
fix errors
 2018-01-23 15:38:37 -05:00
bmedx
46cb89e55d Fixes to CMS failures in Django 1.11 tests 2018-01-23 14:11:06 -05:00
AlasdairSwan
77d254dcad LEARNER-3935 Style updates 2018-01-23 11:28:06 -05:00
jaebradley
5ab2533b1e add try/catch for analytics api calls 
add comment

update jsx comment

simplify try block and update comment

fix comment
 2018-01-23 11:10:04 -05:00
AlasdairSwan
1b11f055a4 Merge pull request #17283 from edx/alasdair/LEARNER-3935-learner-analytics-dashboard-tweaks 
LEARNER-3935 Last minute updates
 2018-01-23 10:30:20 -05:00
AlasdairSwan
8be1079186 Last minute updates 2018-01-23 09:14:33 -05:00
Michael Frey
47272087cf Merge pull request #17247 from caesar2164/problem-loading-spinner 
Add FA loading spinner to each problem
 2018-01-23 08:24:58 -05:00
Eric Fischer
097e000a24 Merge pull request #16191 from proversity-org/proversity/course-visibility-in-catalog 
add DEFAULT_COURSE_VISIBILITY_IN_CATALOG flag
 2018-01-23 08:10:25 -05:00
rabia23
96df2eb35e EDUCATOR-2147 update message info for Community TA's in Membership Dashboard 2018-01-23 10:04:22 +00:00
Harry Rein
e3e363a342 Merge pull request #17274 from edx/HarryRein/a11y-issues-verification-sock 
LEARNER-3055: Clean up a11y issues on the verification sock
 2018-01-22 16:18:36 -05:00
Christopher Lee
3959509696 Merge pull request #17242 from edx/clee/optimizely 
Disable optimizely for xblocks for the mobile app
 2018-01-22 15:36:20 -05:00
Harry Rein
9dab9d2c20 a11y issues on upgrade footer. 
LEARNER-3055
 2018-01-22 13:14:47 -05:00
Harry Rein
d5e6ddc4f0 Fixing alignment of View Course button on course dashboard. 2018-01-22 12:07:47 -05:00
christopher lee
8a00b76f01 Disable optimizely for xblocks for the mobile app 2018-01-22 12:05:57 -05:00
Sofiya Semenova
b3294bdea1 Merge pull request #17240 from edx/sofiya/ed-2140 
Video completion recording does not happen at the end of the video
 2018-01-22 11:38:00 -05:00
Ahsan Ulhaq
3b0f16649d Increase rate-limit rate 
LEARNER-3858
 2018-01-22 12:57:58 +05:00
Jose Antonio Gonzalez
cd2a31aacc set default course visibility in catalog 2018-01-22 08:35:57 +02:00
Nimisha Asthagiri
dd136b457b Merge pull request #17197 from edx/arch/cert-import-signals-cleanup 
Certificates: clean up imports and signals
 2018-01-20 09:32:59 -05:00
Ned Batchelder
c71530558e Merge pull request #17245 from caesar2164/separate-file-index-overlay 
Move default overlay content to themable file
 2018-01-19 16:55:55 -05:00
Ned Batchelder
64a72397bc Merge pull request #17246 from caesar2164/separate-file-index-promo-video 
Move default Promo Video html to themable file
 2018-01-19 16:55:37 -05:00
Giulio Gratta
2ceda12346 Move default Promo Video html to themable file 2018-01-19 12:51:15 -08:00
Giulio Gratta
234c20b202 Move default overlay content to themable file 2018-01-19 12:48:08 -08:00
Nimisha Asthagiri
dd20106c8b Quiet quality 2018-01-19 15:12:29 -05:00
Nimisha Asthagiri
2e9efe6472 Fix Certificates import and signals code 2018-01-19 15:12:28 -05:00
rabia23
1436e5662c update edx-proctoring version 2018-01-19 19:51:20 +00:00
Sofiya Semenova
380273bcaa Video completion marked at end of video 2018-01-19 14:39:49 -05:00
Giulio Gratta
c3ff17a8f1 Add FA loading spinner to each problem 
- This is so that if a site loads slowly users know which/how many problems they need to wait for.
- Spinner gets replaced automatically by problem content when it loads.
 2018-01-19 11:28:10 -08:00
Rabia Iftikhar
dfdf1a4ad3 Merge pull request #17068 from edx/ri/EDUCATOR-2016-suspicious-proctored-exams 
EDUCATOR-2016 In proctored exams, learner will not receive certificate when marked suspicious
 2018-01-19 22:54:19 +05:00
Jeremy Bowman
67f4907ef2 Merge pull request #17243 from edx/jmbowman/PLAT-1889 
PLAT-1889 Fix URL config and reversal issues
 2018-01-19 12:50:16 -05:00
Bill Filler
733c275db0 Merge pull request #17083 from edx/bfiller/gated-content-combined 
Conditionally display gated content in outline and courseware
 2018-01-19 12:41:11 -05:00
rabia23
222794ee59 EDUCATOR-2016 In proctored exams, learner will not receive certificate when marked suspicious 2018-01-19 16:50:16 +00:00
Jeremy Bowman
ca84751bbd PLAT-1889 Fix URL config and reversal issues 2018-01-19 11:02:06 -05:00
Awais Jibran
1114e4334a Merge pull request #17224 from edx/aj/staff-override-score-fix 
Fix staff override score
 2018-01-19 15:00:39 +05:00
Awais Jibran
0016d6284d Fix staff override score 
If a learner has not accessed/attempted the score override functionality
didn't work. This PR is intended to fix this behaviour and the
override should work regardless of learner has accessed or attempted
a problem or not.
 2018-01-19 00:15:34 +05:00
Nimisha Asthagiri
a5c5325a27 Merge pull request #17196 from edx/arch/plugin-signals-support 
Django App Plugins: support for Signal Receivers
 2018-01-18 13:23:18 -05:00
Bill Filler
4fe5f3457d Conditionally display gated content in courseware 
Display gated sections in course outline, navigation and in the course
when user has met prerequiste condition.

WL-1273, WL-1317
 2018-01-18 12:34:19 -05:00
AlasdairSwan
b46ce3a414 Merge pull request #17214 from edx/alasdair/LEARNER-3429-learner-analytics-dashboard-styles 
LEARNER-3429 Learner Analytics Dashboard Style updates
 2018-01-18 12:01:24 -05:00
AlasdairSwan
9e92ba9845 LEARNER-3429 Learner Analytics Dashboard Style updates 2018-01-18 09:37:53 -05:00
Noraiz Anwar
9de58fa100 Merge pull request #17165 from edx/noraiz/EDUCATOR-1994 
auto certs for professional and no-id-professional enrollment modes
 2018-01-18 12:52:05 +05:00
Uzair Rasheed
74c8497b9b Merge pull request #17199 from edx/LEARNER-3812/dashboard-url 
Append dashboard url with slash to improve user experience
 2018-01-18 12:34:17 +05:00
noraiz-anwar
698a041ee8 auto certs for non-verfied enrollment modes 2018-01-18 11:43:16 +05:00
Matthew Piatetsky
92c6945fe2 Merge pull request #17226 from edx/debug_bundles_dashboard 
add additional info to dom for debugging purposes
 2018-01-17 17:59:52 -05:00
Matthew Piatetsky
76a4ddef57 add additional info to dom for debugging purposes 2018-01-17 16:03:59 -05:00
Jae Bradley
5a13f4c7e1 Merge pull request #17191 from edx/learner-3600-upsell-modal 
LEARNER-3584 - Implement Upsell Modal for Learner Analytics Test
 2018-01-17 14:45:41 -05:00
Ayub khan
6dbf3d46b9 Merge pull request #17218 from edx/17-jan-update-translations 
update translations
 2018-01-18 00:30:52 +05:00
Nimisha Asthagiri
be79010abe Merge pull request #16638 from proversity-org/proversity/edx-pr-display-correct-course-info-on-intructor-dashboard 
Show correct course info on instructor dashboard
 2018-01-17 13:11:08 -05:00
Jeremy Bowman
8ca9fdeee3 Fix naive datetime warnings in CCX view tests 2018-01-17 11:43:24 -05:00
jaebradley
3218f64326 implement upsell modal 
update css

updated css

make modal experimental

add waffle flag
 2018-01-17 11:26:57 -05:00
ayub-khan
5033dbcd91 update translations 2018-01-17 19:26:02 +05:00