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

42459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
George Song
0c204e3520 Merge pull request #15641 from jspayd/toggle-timer-upstream 
Toggle timer visibility on timed exams
 2017-08-28 18:39:41 -04:00
Uzair Rasheed
0495d70b46 Merge pull request #15890 from edx/LEARNER-1466/WL-email 
Fix email will not sent to white-label users
 2017-08-29 01:01:43 +05:00
uzairr
1aea33cefc Fix email will not sent to white-label users 
White label partners reported that the users are receiving edX
welcome emails at the time of signup.To solve it, a check is added
that will assure, only edX users will receive the welcome email.

LEARNER-1466

changes requested

update

update

updated
 2017-08-28 14:55:24 +00:00
Douglas Hall
3a65cedf23 Merge pull request #15895 from edx/saleem-latif/ENT-605 
ENT-605: On edx.org instances, next URL for login page cannot contain 'edx.org'.
 2017-08-28 10:37:23 -04:00
Robert Raposa
04cb66edf4 Merge pull request #15903 from edx/robrap/reduce-thresholds 
Reduce xss lint thresholds.
 2017-08-28 10:30:11 -04:00
Ibrahim Ahmed
47311e1942 Merge pull request #15902 from edx/ibrahimahmed443/WL-1186-program-dashboard-layout 
fix layout issues in Program dashboard page
 2017-08-28 19:23:59 +05:00
Robert Raposa
8f184c257d Reduce xss lint thresholds. 2017-08-28 09:20:17 -04:00
Ibrahim
165954b12c fix layout issues in Program dashboard page 
WL-1186
 2017-08-28 17:39:45 +05:00
Ned Batchelder
fcb6e7cbba Merge pull request #15900 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-08-25 19:23:19 -04:00
Ned Batchelder
92c406e46a Update translations (autogenerated message) 2017-08-25 17:21:52 -04:00
Alex Dusenbery
9009a5b0d3 may_certify_for_course checks if course is self_paced. 2017-08-25 14:37:53 -04:00
Douglas Hall
010d251da7 Merge pull request #15893 from edx/douglashall/upgrade_enterprise_0_40_7 
Upgrade edx-enterprise to 0.40.7.
 2017-08-25 11:01:04 -04:00
Robert Raposa
c32d8a62d0 Merge pull request #15866 from edx/diana/update-events 
LEARNER-2025: Update event naming for course sock.
 2017-08-25 09:14:24 -04:00
Saleem Latif
f087672d4b On edx.org instances, next URL for login page cannot contain 'edx.org'. 2017-08-25 17:31:35 +05:00
Waheed Ahmed
100b5aa5dd Merge pull request #15863 from edx/waheed/LEARNER-2201-remove-deprecated-field 
Remove deprecated field 'sailthru_activation_template'.
 2017-08-25 12:28:23 +05:00
Diana Huang
086e15c9b6 Update event naming for course sock. 
Only show course sock to English readers.
 2017-08-24 16:36:28 -04:00
Matthew Piatetsky
dc576c6c2a Merge pull request #15888 from edx/LEARNER-1510 
Add back expression filter
 2017-08-24 16:32:38 -04:00
Albert (AJ) St. Aubin
eff07af1c1 Merge pull request #15891 from edx/aj/LEARNER-2352 
Corrected issue with missing Certificated on Program Dashboard View
 2017-08-24 13:42:35 -04:00
Douglas Hall
6904fafc4a Upgrade edx-enterprise to 0.40.7. 
https://github.com/edx/edx-enterprise/compare/0.40.6...0.40.7

ENT-612
 2017-08-24 12:46:47 -04:00
Feanil Patel
d6e75a8523 Merge pull request #15862 from open-craft/cliff/pb-migrate-keys 
Update problem-builder requirement to 2.6.5patch2 to migrate keys.
 2017-08-24 11:57:26 -04:00
Albert St. Aubin
eab62e786f Corrected issue with missing Certificated on Program Dashboard View 
LEARNER-2352
 2017-08-24 11:17:43 -04:00
Adam
5bc66274c3 Merge pull request #15849 from edx/fix-cg-dangling-pointer 
have coursegraph cache nodes on block_ids rather than locations (EDUC…
 2017-08-24 11:13:24 -04:00
Tyler Hallada
2298bd2553 Merge pull request #15791 from edx/EDUCATOR-926 
EDUCATOR-1127 Override grade to zero when exam attempt is rejected Final
 2017-08-24 10:50:56 -04:00
Sofiya Semenova
65ee2ebbaf Merge pull request #15833 from edx/ssemenova/ed-801 
EDUCATOR-801 Certificate issued date should be the certificate availability date for instructor-paced courses
 2017-08-24 10:22:29 -04:00
Michael Roytman
c27af617ea Merge pull request #15889 from edx/mroytman/EDU-1134 
remove try/catch block and associated test for EDUCATOR-1134 followin…
 2017-08-24 09:51:18 -04:00
Waheed Ahmed
54b50341bd Modified migrations sync test. 2017-08-24 11:58:17 +05:00
Waheed Ahmed
b069020710 Remove deprecated field 'sailthru_activation_template'. 
LEARNER-2201
 2017-08-24 11:58:16 +05:00
Sofiya Semenova
c7fc1929f2 ED-801 Certificate issued date should display the certificate availability date for instructor paced coursest 2017-08-23 17:07:43 -04:00
Alex Dusenbery
821253bf2b EDUCATOR-1232 | front end validation of certificate available date field. 2017-08-23 16:46:03 -04:00
Eric Fischer
e534169fe8 Merge pull request #15829 from edx/efischer/EDU-1142 
Fix Proctoring doc link
 2017-08-23 16:34:12 -04:00
Matthew Piatetsky
68772316ef Change make missing default threshold 2017-08-23 16:09:02 -04:00
Douglas Hall
d07813bc09 Merge pull request #15887 from open-craft/haikuginger/update-ent-0.40.6 
Update Enterprise to 0.40.6
 2017-08-23 16:07:50 -04:00
Michael Roytman
21113eb835 remove try/catch block and associated test for EDUCATOR-1134 following verification that no stage or production courses have issues related to dates 2017-08-23 16:00:51 -04:00
Calen Pennington
9d2d98e2c8 Merge pull request #15882 from edx/ret/improve-site-config-factory 
Make SiteConfigurationFactory more useable
 2017-08-23 15:28:24 -04:00
sanfordstudent
fdfd577a61 Merge pull request #15884 from edx/sstudent/hide_cert_available_self_paced 
cert available date hidden in self paced
 2017-08-23 15:28:15 -04:00
Eric Fischer
599de36066 Merge pull request #15881 from edx/efischer/EDU-1189 
EDUCATOR-1189
 2017-08-23 15:17:56 -04:00
Matthew Piatetsky
5f91b72780 Add back expression filter 2017-08-23 15:14:36 -04:00
Eric Fischer
37241b30a9 Better handling of proctoring help URL 2017-08-23 14:54:12 -04:00
Calen Pennington
3aa02f2913 Merge pull request #15880 from edx/ret/remove-extraneous-request-argument 
Remove extraneous request argument to experiments.utils.check_and_get…
 2017-08-23 14:53:26 -04:00
Jesse Shapiro
7178c15706 Update Enterprise to 0.40.6 2017-08-23 14:50:52 -04:00
Calen Pennington
c773e45bae Merge pull request #15879 from edx/ret/mako-template-comments 
Teach the mako template linter to understand django-format comments
 2017-08-23 14:34:32 -04:00
Calen Pennington
efcc154ab4 Make SiteConfigurationFactory more useable 2017-08-23 14:18:50 -04:00
Calen Pennington
6c9b38dcfd Merge pull request #15877 from edx/ret/course-mode-factory 
Use a consistent CourseModeFactory from the course_modes module, rath…
 2017-08-23 14:16:54 -04:00
Sanford Student
d0b2787f24 TNL-1230: cert available date hidden in self paced 2017-08-23 13:58:48 -04:00
Calen Pennington
8df57c7c22 Merge pull request #15876 from edx/ret/test-output-redirect 
Write test output to logs, rather than to stdout to avoid blowing up …
 2017-08-23 12:56:35 -04:00
Jesse Zoldak
83dee24410 Merge pull request #15885 from edx/zoldak/EDUCATOR-1233 
Remove flaky test PreRequisiteCourseTest.test_dashboard_message
 2017-08-23 12:53:19 -04:00
Calen Pennington
f6b061c7a5 Improve ability to discriminate between django and mako template 
Django-format comments are now used to detect a django template.
Note: Django templates are still not linted.
 2017-08-23 12:17:40 -04:00
Calen Pennington
63244b514d Use a consistent CourseModeFactory from the course_modes module, rather than using one from student 2017-08-23 12:15:46 -04:00
Calen Pennington
a08447e420 Merge pull request #15883 from edx/ret/remove-old-test 
Remove a test that was only valid for XML-backed courses
 2017-08-23 12:15:19 -04:00
Jesse Zoldak
8cca5d1649 Remove flaky test PreRequisiteCourseTest.test_dashboard_message 2017-08-23 11:50:17 -04:00