Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
50,720 Commits 1 Branch 0 Tags
70e2aaa95bc349bd802bd15e529acbcaaeb92d88
Commit Graph

10362 Commits

Author SHA1 Message Date
Alex Dusenbery
70e2aaa95b EDUCATOR-4543 | Add utility functions to the catalog module that picks out all of the course_runs associated with a program, even those that live inside the curriculum of a sub-program. Use these functions to populate the course -> program index of the catalog/programs cache. Also some refactoring of a program_enrollments overview endpoint. 2019-08-05 11:30:19 -04:00
Calen Pennington
0c01c6f056 Merge pull request #21285 from cpennington/masquerade-permission 
Switch courseware.masquerade_as_student over to using a StaffAccessRu…
 2019-08-05 10:46:58 -04: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
Feanil Patel
dead415d2b :-( Moto and HTTPretty don't play well together. 
Moto has a vendored version of HTTPretty which also monkey patches the
socket object.  If you activate both, you get weird errors like
https://github.com/spulec/moto/issues/750

So we're opting not to activate both in this test.  We're are just using
the moto vendored version of httpretty for both our usage and the
mocking of boto.

I also removed the logic that seemed like it was just testing that our
mock is a mocking s3 correctly.
 2019-08-02 13:42:10 -04:00
Feanil Patel
624455c89a Use deprecated s3 mock from moto. 
Longer term we should move to boto3 in general and then we can use the
default moto mock for s3.
 2019-08-02 13:42:02 -04:00
David Ormsbee
358ba27a2a Merge pull request #21248 from open-craft/samuel/se-1155-fix-ccx-unicode 
SE-1155 [Campus.il] fix crashes on non-ascii in usernames for ccx enrollments
 2019-08-02 13:15:41 -04:00
Julia Eskew
a2dac21843 Add optional role parameter to course API endpoint. (#21059) 
* Add optional role parameter to course API endpoint.

* fixup! Add optional role parameter to course API endpoint.
 2019-08-02 12:52:30 -04:00
Christie Rice
bf414335cc REVMI-354 Add edit_bookmark permission (#21254) 2019-08-02 11:01:43 -04:00
Christie Rice
1c9904859b REVMI-354 Add view_xqa permission (#21255) 2019-08-02 11:01:21 -04:00
Nimisha Asthagiri
d20f68b6e0 Merge pull request #21282 from edx/arch/depr-15-notes-token 
DEPR-15: Remove usage of firebase-token-generator
 2019-08-02 09:19:07 -04:00
uzairr
80316c632d Update Help msgs of management commands 
PROD-399
 2019-08-02 15:20:26 +05:00
Usama Sadiq
2484c3118e Merge pull request #21273 from edx/usama/learner-6735-help-center-language 
Spanish Help Center Page Update
 2019-08-02 15:06:29 +05:00
usama sadiq
aa8003baeb Added check to exclude OpenEdx 
Added check to only apply the changes for
edx.org help center pages.
 2019-08-02 12:05:54 +05:00
Samuel Walladge
54f9434d46 Allows unicode usernames to be used in CCX enrollments and reports. 
Previously, unicode would result in a UnicodeEncodeError as a result of
the format string being str instead of unicode.

Additionally, the log calls would crash with a traceback (while not
affecting the program flow).
 2019-08-02 08:50:15 +09:30
Nimisha Asthagiri
c1a5d2fa06 DEPR-15: Remove usage of firebase-token-generator 
The old Notes Django app is the only caller of this no longer
supported library. I have verified that this old app is no
longer functional and is already slated to be removed as part
of DEPR-18.

So this commit simply removes the call to firebase-token-generator
and leaves removal of the Notes app to DEPR-18.
 2019-08-01 18:56:04 -04:00
Matthew Piatetsky
a4866d4163 [REVMI-354] add view_ccx_coach_dashboard permission (#21259) 
[REVMI-354] add view_ccx_coach_dashboard permission
 2019-08-01 15:17:53 -04:00
Christie Rice
c146f82e84 REVMI-354 REVMI-356 Revert more masquerade code (#21278) 
* REVMI-354 REVMI-356 Revert more masquerade code

* Fix quality
 2019-08-01 13:17:52 -04:00
Matthew Piatetsky
628ae59682 add view_ccx_coach_dashboard permission 2019-08-01 12:41:47 -04:00
Christie Rice
a9ebf91c4d REVMI-354 Revert masquerade changes (#21276) 2019-08-01 12:05:59 -04:00
David Ormsbee
b3614f3a00 Merge pull request #20954 from open-craft/symbolist/html-block 
HtmlModule to HtmlBlock [SE-1089]
 2019-08-01 11:36:23 -04:00
Matthew Piatetsky
6cc02f711d Merge pull request #21264 from edx/mpiatetsky_authz_5 
[REVMI-354] Add preview_certificates permission
 2019-08-01 09:48:39 -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
usama sadiq
825c02b4a2 Updated Spanish Language Code 
Changed Spanish language code from es to es-419
modified _build_help_center_url() to receive
selected language instead of default from settings.
 2019-08-01 13:24:30 +05:00
Usama Sadiq
c78db13de1 Merge pull request #21263 from edx/usama/learner-6735-help-center-language 
Updated Help Center Url
 2019-08-01 12:46:52 +05:00
usama sadiq
d83ec0f607 Updated Help Center Url 
Updated the generated url in the navigation
and footer based on the selected language of
the page.
 2019-08-01 12:12:06 +05:00
Calen Pennington
b5a8f67e64 Merge pull request #21219 from cpennington/permission-courseware-enable-masquerade 
Permission courseware enable masquerade
 2019-07-31 14:15:28 -04:00
Matthew Piatetsky
17ef02e34f add preview_certificates permission 2019-07-31 13:39:16 -04:00
Calen Pennington
136f58cb2d Add a staff-access specific bridgekeeper rule with full query support 2019-07-31 13:07:52 -04:00
Feanil Patel
8564c6768c StringIO moved between python2 and python3. 
Grab it from six instead.
 2019-07-31 11:45:31 -04:00
Uzair Rasheed
01ebee0dca Revert "Support a URL address as FOOTER_ORGANIZATION_LOGO" 2019-07-31 15:25:11 +05: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
c00b60ffa5 Merge pull request #21244 from cpennington/check-permissions-view-course-home 
Check permissions view course home
 2019-07-30 13:06:13 -04: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
Kyle McCormick
9f9a07db4f Stop the commerce API from deleting Masters course modes. 2019-07-30 11:18:23 -04:00
Nimisha Asthagiri
900b7e2515 Merge pull request #20001 from mahyard/master 
Support a URL address as FOOTER_ORGANIZATION_LOGO
 2019-07-30 08:16:44 -04:00
Ayub khan
ffc9e14635 INCR-432 python3 compatibility 2019-07-30 15:12:56 +05:00
Ayub khan
7ca32f9197 INCR-433 python3 compatibility 2019-07-30 12:21:56 +05:00
Calen Pennington
5e8f90caa1 Revert "Convert a has_access check into a bridgekeeper rule" 2019-07-29 11:38:26 -04:00
Dave St.Germain
97e10e168c Merge pull request #21231 from edx/dcs/count-cache 
Cache the total and filtered counts in the gradebook API.
 2019-07-29 10:13:01 -04:00
Dave St.Germain
9bd0d915dc Cache the total and filtered counts in the gradebook API. 2019-07-29 09:45:08 -04:00
Ayub
d5d10942b1 Merge pull request #21102 from edx/INCR-430 
INCR-430 python3 compatibility
 2019-07-29 13:21:07 +05:00
Calen Pennington
7fba761050 Convert a has_access check into a bridgekeeper rule 2019-07-26 11:41:30 -04:00
Zachary Hancock
2f6b4c0a46 Management command to reset program enrollment data (#21221) 
mgmt cmd to reset program enrollments data
 2019-07-26 09:39:40 -04:00
Ayub
b035c2f10b Merge pull request #21105 from edx/INCR-434 
INCR-434 python3 compatibility
 2019-07-26 13:05:43 +05:00
Ayub
ac919d6010 Merge pull request #21107 from edx/INCR-436 
INCR-436 python3 compatibility
 2019-07-26 13:03:40 +05:00
Ayub
ae574ae2cc Merge pull request #21108 from edx/INCR-437 
INCR-437 python3 compatibility
 2019-07-26 13:03:01 +05:00
Ayub
734d7a1308 Merge pull request #21109 from edx/INCR-438 
INCR-438 python3 compatibility
 2019-07-26 13:02:26 +05:00
David Ormsbee
b1f3d2cef2 Revert "Fix the unpredictable order randomization issue with randomized content blocks" 2019-07-25 13:42:20 -04:00
Dave St.Germain
75b0afe721 Merge pull request #21162 from edx/mroytman/EDUCATOR-4434-gradebook-user-counts 
add number of total users and number of filtered users to the gradebo…
 2019-07-25 09:54:09 -04:00