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

49248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave St.Germain
39ad3b1dd8 Merge pull request #19848 from edx/dcs/decide-duedates 
Proposed decision on due date refactoring
 2019-03-18 13:11:58 -04:00
Dave St.Germain
5beddeb7ff Accepted ADR 2019-03-18 11:54:03 -04:00
Dave St.Germain
8b6496e860 Merge pull request #19955 from edx/dcs/proctoring-profed 
Enable proctoring for professional track learners
 2019-03-18 11:37:56 -04:00
Dave St.Germain
d1cd8e0407 Enable proctoring for professional track learners 2019-03-18 10:37:37 -04:00
Matt Hughes
223b8d6fe8 Merge pull request #20010 from edx/matthugs/allow-proctoring-exams-to-be-marked-error-after-submission-on-review-failure 
allow proctoring exams to be marked error after submission
 2019-03-18 09:50:09 -04:00
cclauss
9a0c995885 ur'strings' are syntax errors in Python 3 2019-03-17 13:56:02 +01:00
David Ormsbee
089817cf55 Merge pull request #19507 from open-craft/kshitij/fix-problem-response-report 
[BB-753] Fix issue with multiple responses for a single user returned by generate_report_data
 2019-03-15 15:36:47 -04:00
Matt Hughes
9b5d5c34d7 allow proctoring exams to be marked error after submission 
This is necessary to allow new proctoring backends to mark proctored
attempts in error, often due to unuploaded files from the application
or issues with multiple sets of files attached to the same testing
session.
 2019-03-15 13:39:05 -04:00
Audrey
b49dc257b3 Merge pull request #20009 from edx/aekao/REVEM-151/email-question-wording 
REVEM-151 Updating text when asking for learner emails
 2019-03-15 13:22:42 -04:00
Audrey Kao
6a0792f9a0 Updating text when asking for learner emails 2019-03-15 12:23:03 -04:00
singuliere
4b0ccde18d upgrade shapely 
Fixes: https://openedx.atlassian.net/browse/INCR-16
 2019-03-15 14:59:12 +01:00
Christie Rice
6a6c43cd6b Merge pull request #20002 from edx/crice/REVEM-246_url 
REVEM-246 Use existing method to get basket page URL
 2019-03-15 09:46:29 -04:00
Nimisha Asthagiri
9c3472ab24 Merge pull request #19845 from eduNEXT/fmo/studio_sso_over_lms_flag 
Make the studio login over the lms optional using a feature flag
 2019-03-15 08:23:02 -04:00
Ned Batchelder
53458cd3ea Merge pull request #19999 from edx/nedbat/skip-named-release-help-tests 
Skip named release help tests
 2019-03-14 20:14:54 -04:00
Alex Dusenbery
f35970bb39 EDUCATOR-4189 | Account for undefined values in commerce API Course objects. 2019-03-14 16:47:46 -04:00
Felipe Montoya
923a91734d Fixing lettuce tests 2019-03-14 15:21:03 -05:00
Christie Rice
94b680082a REVEM-246 Use existing method to get basket page URL 2019-03-14 15:12:14 -04:00
Ned Batchelder
561f0752ca Skip tests of help doc links on named release branches. 
@skip_unless_master is used to skip tests because on named release
branches, most work happens leading up to the first release on the
branch, and that is before the docs have been published.  Tests that
check readthedocs for the right doc page will fail during this time, and
it's just a big distraction.  Also, if we bork the docs, it's not the
end of the world, and we can fix it easily, so this is a good tradeoff.
 2019-03-14 14:01:30 -04:00
Calen Pennington
8ecf6d68b5 Merge pull request #19998 from cpennington/revert-aggressive-prefetching 
Revert "Improve the performance of access checking for a specific use…
 2019-03-14 11:40:05 -04:00
Christie Rice
38c559f6c2 Merge pull request #19989 from edx/crice/REVEM-207_programSkus 
REVEM-207 Add program price and purchase url to user metadata
 2019-03-14 11:31:59 -04:00
Matt Tuchfarber
634866dd0c Don't count a non-existing forums user as a failure 2019-03-14 11:15:25 -04:00
Matt Tuchfarber
5a164df3b7 quality 2019-03-14 10:44:40 -04:00
Calen Pennington
d8cd6135a6 Revert "Improve the performance of access checking for a specific user in CourseViewList by prefetching data" 
This reverts commit a2a340bcd0.
 2019-03-14 10:31:24 -04:00
Christie Rice
b2432ac5aa REVEM-207 Add program price and purchase url to user metadata 2019-03-14 10:15:48 -04:00
adeelehsan
2e369ce476 Merge pull request #19996 from edx/aehsan/removing_logs_added_for_learner-6943 
Removing logs
 2019-03-14 18:15:21 +05:00
Iana Vasylieva
2962538791 Fix bug: errors are not shown when modifying course team in Instructor Dashboard > Membership 2019-03-14 13:24:35 +02:00
adeelehsan
b4f1a774c2 Removing logs 
Removing all the logs added for
the investigation of learner-6943
 2019-03-14 15:23:10 +05:00
Kshitij Sobti
a76c6dca87 Fix issue with multiple responses for a single user returned by generate_report_data 
Before this fix if an XBlock's generate_report_data method returned multiple
responses for the same user from a single user state, the report generator would
end up overwriting each response over the previous one such that only the last
response would be preserved.
 2019-03-14 12:07:20 +05:30
Matt Tuchfarber
cda681e2f1 fix python tests 2019-03-13 23:04:41 -04:00
Matt Tuchfarber
f224f38a21 testing 2019-03-13 19:12:21 -04:00
Matt Tuchfarber
bb1964f9ef make discussion api match others 2019-03-13 19:04:46 -04:00
Douglas Hall
0c06bd3c20 Merge pull request #19994 from edx/douglashall/per_site_profile_microfrontend_redirect 
Allow profile microfrontend redirect to be configured per site.
 2019-03-13 17:14:01 -04:00
Douglas Hall
7ef33dac6c Allow profile microfrontend redirect to be configured per site. 2019-03-13 16:27:36 -04:00
Matt Tuchfarber
26a4093cb5 Add tests to User API 2019-03-13 16:17:10 -04:00
Matt Tuchfarber
ab74bb4c97 Make discussion API bulk friendly 2019-03-13 15:59:28 -04:00
Calen Pennington
18fc7d573b Merge pull request #19990 from cpennington/fix-org-course-docs 
Update the documentation and validation on org_course to make the for…
 2019-03-13 15:01:27 -04:00
Calen Pennington
12e130667c Merge pull request #19985 from cpennington/log-user-id 
Log current userid in all log messages
 2019-03-13 14:53:13 -04:00
Cali Stenson
01828034c4 Update enrollment course_price to verified price. 2019-03-13 14:52:33 -04:00
David Ormsbee
07e93bc264 Merge pull request #19837 from open-craft/opencraft/edx-platform/devan/show-enroll-links-on-public-courses-only-if-self-enrollment-allowed 
Show enroll links on public courses only if self enrollment allowed
 2019-03-13 14:25:53 -04:00
Calen Pennington
5150775f1c Update the documentation and validation on org_course to make the formatting clear 2019-03-13 14:25:16 -04:00
Zia Fazal
b13eb81e74 Merge pull request #19987 from edx/ziafazal/WL-1895 
WL-1895:updated edx-enterprise version
 2019-03-13 20:08:16 +05:00
Michael Youngstrom
5567c0bb1e Merge pull request #19983 from edx/testeng/bokchoy_auto_cache_update_392ea9f212793c6c53ae42042598bb20f5d70a7b 
Bokchoy db cache update
 2019-03-13 09:57:28 -04:00
Zia Fazal
2ecb436360 WL-1895:updated edx-enterprise version 2019-03-13 18:13:10 +05:00
Nimisha Asthagiri
4d70669d4d Merge pull request #19981 from edx/arch/jwt-expiration 
JWT cookies: remove refresh cookie, cookies expiration
 2019-03-12 18:18:27 -04:00
Devan Rehunathan
c6f87d49f2 Show Enroll links on public courses only if self-enrollment is allowed 
This commit updates the Info messages on the course page to display
more informative messages to the user. Specifically, messages for Public
and Invitation-only courses.
 2019-03-12 21:24:56 +00:00
Michael Roytman
23b3229e36 Merge pull request #19979 from edx/mroytman/EDUCATOR-4085-exam-code-button-styling 
add some styling to copy exam code button and bump version of edx-pro…
 2019-03-12 16:26:54 -04:00
Calen Pennington
b2d213ec08 fixup! Log current userid in all log messages 2019-03-12 15:13:57 -04:00
Calen Pennington
f9ff332a16 Merge pull request #19984 from cpennington/fbe/add-org-course-config 
Add org-course (and any future KEY_FIELDS) to FBE django admin pages
 2019-03-12 14:37:02 -04:00
Calen Pennington
e6dada4b52 fixup! Log current userid in all log messages 2019-03-12 14:13:13 -04:00
Calen Pennington
721dd3bc8a Log current userid in all log messages 
REVMI-60
 2019-03-12 13:55:08 -04:00