Commit Graph

266 Commits

Author SHA1 Message Date
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -04:00
adeelehsan
1eda18a317 Merge pull request #21367 from edx/private_to_public_76a13fa
Mergeback PR from private to public.
2019-08-19 15:06:30 +05:00
adeelehsan
76a13fae73 Merge pull request #156 from edx/aehsan/prod-349/remove_google_api_key_from_github
Removed google api key from github
2019-08-19 14:32:26 +05:00
Ayub
658cd5c62e BOM-70 (#21327)
* Update Financial Assistance logic

Use the zendesk proxy app instead of the unsupported zendesk library.

* Move to pre-fetching the group IDs.

Rather than making extra requests to zendesk to list all groups and find
a specific group ID. Just make a pre-filled list of group IDs for the
groups we care about.  When a group name is passed in, it is checked
against this list and the ticket is created in the correct group so the
right people can respond to it.
2019-08-16 13:05:35 -04:00
Ayub
26a1445c93 Revert "BOM-70" 2019-08-08 17:39:45 +05:00
adeelehsan
3136b3ecd3 Removed google api key from github
Prod-349
2019-08-08 02:12:21 +05:00
Ayub
3f2bd0a020 Merge pull request #21229 from edx/BOM-70
BOM-70
2019-08-06 18:48:42 +05:00
Ayub khan
c9080e257e -fixed tests 2019-08-06 15:31:41 +05:00
Ayub khan
9b3960ed90 -added zendesk api endpoints 2019-08-05 13:38:46 +05:00
Calen Pennington
7bbf4ad15c Switch courseware.masquerade_as_student over to using a StaffAccessRule with query checking 2019-08-02 15:06:35 -04:00
Christie Rice
1c9904859b REVMI-354 Add view_xqa permission (#21255) 2019-08-02 11:01:21 -04:00
Christie Rice
a9ebf91c4d REVMI-354 Revert masquerade changes (#21276) 2019-08-01 12:05:59 -04:00
Christie Rice
0426446549 REVMI-354 Add view_courseware permission (#21237) 2019-08-01 09:12:48 -04:00
Christie Rice
3d062aab62 REVMI-354 Add enroll_in_course permission (#21243)
* REVMI-354 Add enroll_in_course permission

* Fix test
2019-08-01 08:37:41 -04:00
Calen Pennington
136f58cb2d Add a staff-access specific bridgekeeper rule with full query support 2019-07-31 13:07:52 -04:00
Ayub
69b647ae08 Merge pull request #21104 from edx/INCR-432
INCR-432 python3 compatibility
2019-07-31 12:29:26 +05:00
Calen Pennington
2d1eb9923f Convert a has_access check into a bridgekeeper rule
This reverts commit 5e8f90caa1.
2019-07-30 12:02:24 -04:00
Ayub khan
ffc9e14635 INCR-432 python3 compatibility 2019-07-30 15:12:56 +05:00
Calen Pennington
5e8f90caa1 Revert "Convert a has_access check into a bridgekeeper rule" 2019-07-29 11:38:26 -04:00
Calen Pennington
7fba761050 Convert a has_access check into a bridgekeeper rule 2019-07-26 11:41:30 -04:00
adeelehsan
9fb1b53aa7 Translation removed from constants in financial form
PROD-410
2019-07-23 17:31:10 +05:00
Matt Tuchfarber
2583d317db Remove all references to Journals 2019-07-09 14:19:25 -04:00
Truong David
9dd5cb86c1 Fix translation issue related to message showed on courseware progress
page related to certification and course mode. Part 2 of 2.

Use ugettext_lazy instead of ugettext to ensure the strings shown are in
the language the user chose. Otherwise the strings are in the platform
language.
Keep the original ugettext for function financial_assistance_form.
The test for that function fails if the text is not in english.
2019-06-12 12:20:16 -04:00
Nimisha Asthagiri
6e214a85b0 Move common/djangoapps/enrollment to openedx/core/djangoapps/enrollments 2019-05-28 11:20:53 -04:00
Calen Pennington
ff73f7d746 Merge pull request #20397 from cpennington/revmi-34-attempt-2
Revmi 34 attempt 2
2019-05-20 10:35:39 -04:00
Waheed Ahmed
2c80a76f8e Add feature flag to disable honor mode certificates.
Added a feature flag to disable honor mode certificates for
edx.org, by default set to false to allow honor mode certificates
for open community.

PROD-269
2019-05-20 12:53:22 +05:00
Calen Pennington
755a5c7db6 Augment content_type_gating tests to detect the failure case from the original REVMI-34 implementation 2019-05-16 15:17:33 -04:00
Calen Pennington
7eeff8bf9a Re-resolve REVMI-34 to allow any access error to put a message in the courseware 2019-05-15 11:29:00 -04:00
Calen Pennington
8c0ad119ec Revert "Revert "Merge pull request #20272 from cpennington/revmi-34-recheck-access""
This reverts commit b64664932d.
2019-05-15 11:29:00 -04:00
Waheed Ahmed
98c286a009 Revert "Making honor code not eligible for Certificate"
This reverts commit 25130ae3c8.
2019-05-13 15:39:35 +05:00
Nimisha Asthagiri
eb0791ec89 Inter-app API cleanup for Grades 2019-05-04 11:35:06 -04:00
Matthew Piatetsky
b64664932d Revert "Merge pull request #20272 from cpennington/revmi-34-recheck-access"
This reverts commit 5d99714aed, reversing
changes made to 5424155cd0.
2019-04-26 13:19:13 -04:00
Matt Hughes
2dc19c4139 Merge pull request #20263 from edx/matthugs/EDUCATOR-4158-logged-out-course-page-masters-only-courses
Remove misleading copy for Master's-only courses' course pages'
2019-04-22 11:02:59 -04:00
Matt Hughes
1070ba0236 WIP: Remove misleading copy for Master's-only courses' course pages'
Logged out learners shouldn't be lead to believe they'll be able to
enroll themselves into such courses, which we're worried they may've
read into the existing copy

JIRA:EDUCATOR-4158
2019-04-19 10:30:24 -04:00
Calen Pennington
f18fc1e7aa Expose will_recheck_access further up the LMS xblock stack 2019-04-18 14:58:15 -04:00
Michael Roytman
f7d0753210 remove enroll CTA on course homepage for logged out users visiting a Master's only course 2019-04-16 16:05:56 -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
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
Usama
a826145d91 Progress Page update
Updated progress page certificate view for
unverified users.
2019-03-01 12:47:37 +05:00
Emma Green
57b7150b09 add course to program caching 2019-02-22 13:18:23 -05:00
Calen Pennington
78c8950ea3 Clean up a few remaining unicode format string errors 2019-02-20 15:28:14 -05:00
emma-green
cbf3f78325 Revert "WIP:Cache course runs to programs" 2019-02-20 12:03:07 -05:00
Emma Green
f2139bbe2f add courses to programs to cache 2019-02-19 15:17:23 -05:00
Pooja Kulkarni
9ddb1cc074 Implement public cohort
This PR is based on #19284 and is part of the
series of work related to the proposal #18134.

This PR avoids the assignment of
anonymous/unenrolled users to any cohort when
course is public. Anonymous or unenrolled users
will only see content that does not have a
content group assigned.
The "View Course" link to the course outline
is shown on the course about page for a course
marked public/public outline.
It also makes course handouts available for
public courses (not for public_outline).
This PR also hides the different warnings and
messages asking the user to sign-in and enroll
in the course, when the course is marked public.
It modifies the default public_view text to
include the component display_name when
unenrolled access is not available.
2019-02-07 21:42:21 +05:30
Matthew Piatetsky
6e81c84d8b fix unicode strings in lms/ part 1 2019-02-05 15:15:02 -05:00
Calen Pennington
95252f1a81 Run caniusepython3.pylint_checker 2019-02-01 10:03:42 -05:00
Calen Pennington
040b60c38c Stop swallowing UnicodeEncodeErrors in courseware rendering 2019-02-01 09:22:54 -05:00
Matthew Piatetsky
d98643c37f Merge pull request #19609 from edx/fix_masquerade_banner
ensure content start date banner only shows for currently open sections
2019-01-17 13:12:42 -05:00
Matthew Piatetsky
9ba3e0c5a5 ensure content start date banner only shows for currently open sections 2019-01-17 12:32:08 -05:00
Zia Fazal
d02efb1d24 Merge pull request #19604 from edx/ziafazal/WL-1660
WL-1660: Added ability to stop redirect to course home page
2019-01-16 12:17:23 +05:00