Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

12296 Commits

Author SHA1 Message Date
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
Aarif
4b1ef3005e Merge pull request #21116 from edx/INCR-447 
INCR-447 Python 3 compatibility
 2019-07-25 14:51:17 +05:00
Uzair Rasheed
408ca5645f Merge pull request #21050 from edx/LEARNER-3761/capa-grading-exception 
Restrict grading endpoints in LMS
 2019-07-25 14:23:24 +05:00
Aarif
cb530bf788 Merge pull request #21113 from edx/INCR-444 
INCR-444 Python 3 compatibility
 2019-07-25 12:43:33 +05:00
Michael Roytman
77dc0fa9f0 add number of total users and number of filtered users to the gradebook API 2019-07-24 23:02:04 -04:00
Farhanah Sheets
889f5e4e58 Merge pull request #21212 from edx/fsheets/PROD-500 
Fix: Do not compare Software Secure expiry_date when NULL
 2019-07-24 17:05:18 -04:00
Farhanah Sheets
fed5322725 Filter NULL expiry_date from SoftwareSecure filter query 2019-07-24 16:44:38 -04:00
Guruprasad Lakshmi Narayanan
d7647c66e3 Select children again when current children don't match the selections 
This prevents errors when the current children do not match the
selected children any more.
 2019-07-25 00:58:11 +05:30
Guruprasad Lakshmi Narayanan
df4aee23b9 Fix the order randomization behaviour of Randomized Content Block 
The Randomized Content Block XBlock only randomizes the selection of
the children blocks and has unpredictable randomization of
the order of the selected child blocks due to the usage of sets, which
are unordered, for storing the selected blocks. This becomes apparent
when all the available child blocks in a library are chosen for a
Randomized Content Block, to randomize just the order of the child
blocks and not just the selection of the blocks. The order of the
selected blocks ends up being similar for multiple learners.

This change modifies the XBlock to store the selected child blocks in
a list, instead of a set, after randomly shuffling them.
 2019-07-25 00:58:11 +05:30
Usman Khalid
8dfc8e5fda Convert AboutModule, CourseInfoModule, HtmlModule and StaticTabModule to XBlocks. 2019-07-24 20:19:44 +05:00
uzairr
9276aac8d2 Restrict grading endpoints in LMS 
Cuurently, grading endpoints in capa module are vulnerable as they
are not restricted.To avoid it, changes have been made so that
they are available only for logged-in users.

LEARNER-3761
 2019-07-24 19:20:13 +05:00
aarif
8f6569f462 ran python-modernize and isort on files mentioned in INCR-444 
changes made to comply with quality
 2019-07-24 19:07:55 +05:00
Aarif
8526a989c3 Merge pull request #21115 from edx/INCR-446 
INCR-446 Python 3 compatibility
 2019-07-24 16:21:05 +05:00
adeelehsan
43604eb6f7 Merge pull request #21188 from edx/aehsan/prod-410/translation_strings_are_passed_to_zendesk 
Translation moved to field level for questions in financial form
 2019-07-23 18:17:44 +05:00
adeelehsan
9fb1b53aa7 Translation removed from constants in financial form 
PROD-410
 2019-07-23 17:31:10 +05:00
noraiz-anwar
570cd673ef change task_input field's type from CharField to TextField 2019-07-23 17:21:03 +05:00
Aarif
00717a5f77 Merge pull request #21117 from edx/INCR-448 
INCR-448 Python 3 compatibility
 2019-07-23 12:26:25 +05:00