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

18698 Commits

Author SHA1 Message Date
Alex Dusenbery
12c502b35f Change gradebook GET endpoint to allow filtering by multiple attributes. 2018-11-13 16:18:52 -05:00
Bill Filler
210549f314 Merge pull request #19146 from edx/bfiller/add-expired-mobile 
mobile api changes for course expiration
 2018-11-13 13:22:59 -05:00
Awais Jibran
4b9a8547d4 Merge pull request #19258 from edx/revert/paulo/anonymous-views 
Revert "Merge pull request #18720 from open-craft/paulo/anonymous-views"
 2018-11-12 13:03:44 +05:00
Rabia Iftikhar
9175139f94 Merge pull request #19238 from edx/ri/EDUCATOR-3668-add-logs 
EDUCATOR-3668 add temporary logs to track to track the invocation of compute_all_grades_for_course task
 2018-11-12 12:23:40 +05:00
Bill Filler
cebd85e681 Add expiration banner to progress page 
In audit mode, add expiration banner to course progress page

REVE-6
 2018-11-09 16:13:35 -05:00
Awais Jibran
194c6bacb6 Revert "Merge pull request #18720 from open-craft/paulo/anonymous-views" 
This reverts commit f9ae594dfe, reversing
changes made to 7c08e50fde.
 2018-11-09 22:49:14 +05:00
Bill Filler
a1f2c2cdde Fix edx-drf-extension imports 2018-11-09 09:56:23 -05:00
Dave St.Germain
efa583283d Merge pull request #18975 from open-craft/MCKIN-8395/cohorts-api 
Cohorting API
 2018-11-09 07:25:38 -05:00
Paulo Viadanna
17c0d6d59f Add an alternative cohort management API 
This is primarily intended to be used for server to server
communication. The endpoints support OAuth2 authentication.
 2018-11-09 15:13:55 +05:30
Matthew Piatetsky
98069ba2cb Merge pull request #19250 from edx/REV-503/add-banner-to-courseware 
add expiration banner
 2018-11-08 18:17:43 -05:00
Matthew Piatetsky
6cc4fb34be add expiration banner 2018-11-08 17:27:12 -05:00
Matt Tuchfarber
be472a8d52 Extract upsell into template, extract ecomm call, use mobile utils 2018-11-08 11:40:06 -05:00
Gabe Mulley
372d51fd46 Display an upsell message instead of gated content 
REV-504
 2018-11-08 11:40:02 -05:00
Dave St.Germain
6e7d19024f Merge pull request #19032 from open-craft/jill/add_cohorts_to_bulk_enroll 
Add cohorts to BulkEnroll endpoint.
 2018-11-08 11:36:19 -05:00
afzaledx
2238843286 Add cohorts to BulkEnroll endpoint. 2018-11-08 09:23:07 +10:30
rabiaiftikhar
14ed80a488 EDUCATOR-3668 add temperory logs 2018-11-08 02:46:39 +05:00
Douglas Hall
42d445c901 Merge pull request #19246 from edx/douglashall/set_devstack_jwt_algorithm 
Set the JWT_SIGNING_ALGORITHM setting for devstack.
 2018-11-07 15:52:33 -05:00
Douglas Hall
1c17d3f855 Set the JWT_SIGNING_ALGORITHM setting for devstack. 2018-11-07 15:23:12 -05:00
Matthew Piatetsky
dfe189e9bb change access_duration to be weeks_to_complete or MIN_DURATION for both SP and IP courses 2018-11-07 13:18:25 -05:00
David Ormsbee
f9ae594dfe Merge pull request #18720 from open-craft/paulo/anonymous-views 
Support for anonymous_view
 2018-11-07 08:45:15 -05:00
Paulo Viadanna
e6e0a02e0a Adds CouseModule.course_visibility and XBlock.public_view() for unenrolled users access to courses. 
The course_visiblity field can have one of three values:
1. private (default): This keeps the standard access rules.
2. public_outline: Allows unenrolled and anonymous users access to the outline.
3. public: Allows unenrolled and anonymous users access to both outline and
   course content.

When an unenrolled user accesses course content, instead of student_view(),
public_view() is used. A default implementation is provided for XBlocks
which do not implement this view. The public_view() must not have any
functionality which assumes the presence of a valid User and should show
a readonly only interface for the XBlock content.
 2018-11-07 16:18:39 +05:00
Douglas Hall
b0eb347c32 Set CORS_ALLOW_HEADERS in devstack settings. 2018-11-06 14:56:31 -05:00
Ned Batchelder
63d84d65e5 Merge pull request #19215 from edx/nedbat/remove-unused-imports 
Remove unused imports
 2018-11-06 13:57:46 -05:00
edx-pipeline-bot
112a3d1bba Merge pull request #19228 from edx/release-mergeback-to-master 
Merge release back to master
 2018-11-06 09:40:47 -05:00
Douglas Hall
726b28d4fa Add LOGIN_REDIRECT_WHITELIST setting to production settings. 2018-11-05 14:31:56 -05:00
Farhanah Sheets
44f10be03c Unicode developer_message to handle Spanish failures 2018-11-05 14:00:07 -05:00
Calen Pennington
6c5ee7209c Merge pull request #19108 from cpennington/stacked-configuration-models 
Stacked configuration models
 2018-11-05 13:43:25 -05:00
Douglas Hall
82133433c5 Merge pull request #19211 from edx/douglashall/corsheaders_allow_methods 
Allow custom USE-JWT-COOKIE header on cross origin requests.
 2018-11-05 11:33:41 -05:00
Douglas Hall
0f125c7a62 Allow custom USE-JWT-COOKIE header on cross origin requests. 2018-11-05 10:56:22 -05:00
Ahsan Ulhaq
0c00416deb About Me textarea character counter accessibility issue 
LEARNER-6612
 2018-11-05 19:11:18 +05:00
Shadi Naif
4df2073376 Fix exceptions raised when a lazy text is used in json dump 2018-11-05 12:24:45 +02:00
Ned Batchelder
3353e7425e Remove unused imports 2018-11-03 16:07:05 -04:00
Calen Pennington
8901bf4482 Add a facility for building stacked configuration models that control the same configuration on a Global, Site, Org and Course level 2018-11-02 15:36:01 -04:00
Ned Batchelder
8acea435cf setUpClassAndTestData is tricker than pylint understands 2018-11-02 11:06:59 -04:00
Ned Batchelder
59d78031d8 Fix trailing-comma-tuple warnings 2018-11-02 11:06:59 -04:00
Simon Chen
428c061b07 Merge pull request #19200 from edx/schen/gradebook-no-auto-grade 
Remove auto grade column from override modal
 2018-11-01 16:14:58 -04:00
Simon Chen
34fd4a65f0 Remove auto grade column from override modal 2018-11-01 15:37:06 -04:00
Alex Dusenbery
53b60607d6 Gradebook data: generate a label attribute if none exists (like for ungraded content). 2018-11-01 15:31:48 -04:00
Bill Filler
026d574576 mobile-api changes to support gated-content 
Change behavior of existing v0.5 mobile api /api/mobile/v0.5/users/{username}/course_enrollments/ to exclude expired courses due to audit duration limits from the result set.
Add v1 version of mobile api /api/mobile/v1/users/{username}/course_enrollments/ that returns all enrollments and includes a field audiit_access_expires that contains expiration date (or null).

REV-495
 2018-11-01 10:13:52 -04:00
Feanil Patel
f323ab00ed Merge pull request #19194 from edx/feanil/revert_gunicorn_upgrade 
Revert "upgrade gunicorn 19.0 and make upgrade"
 2018-10-31 16:37:59 -04:00
Alex Dusenbery
99705e54a6 Remove GenericAPIView subclass from grades API views; add a test that /api-docs/ works. 2018-10-31 16:10:31 -04:00
Feanil Patel
4e13a1c2dd Revert "upgrade gunicorn 19.0 and make upgrade" 
This reverts commit f6c215ae5b.
 2018-10-31 15:01:00 -04:00
Calen Pennington
83d676cbfa Add Content Type Gating Behind Waffle Flag 
Content Type Gating: Xblocks that have a graded component cannot be
accessed by audit track users.
  - Caveats:
    - In studio, instructors can set certain xblocks to be available to
      all users, but graded components will default to not being
      available for audit users
    - If a course does not have a verified mode option, all users will
      have access to graded content.

The Waffle Flag: The waffle flag is of for now.
  It's name is: ```content_type_gating.debug```

This Commit Does NOT Include: Displaying for a user WHY they do not have
access to a specific piece of content.  That change will be part of
another PR.
 2018-10-31 12:34:48 -04:00
Alex Dusenbery
2ff3a38d91 EDUCATOR-3625 | Add filters for cohort_id and enrollment mode to gradebook API. 2018-10-31 12:29:16 -04:00
Robert Raposa
53239bdf37 Remove JWT_COOKIES_FLAG. 
The JWT_COOKIES_FLAG was a temporary flag used for rollout of the new
JWT cookies. These are live in Production, so we are removing the flag.

Without this flag, we set JWT cookies during login. However, this
requires an oAuth Client that isn't always available during unit tests.
We introduced a feature flag that is only used for unit tests to
disable setting the JWT cookies. The code explains a bit more why this
solution was selected over adding the oauth client to the database.

ARCH-247
 2018-10-31 10:29:05 -04:00
Douglas Hall
ebede18831 Merge pull request #19183 from edx/douglashall/explicit_jwt_cookie 
Use JWT cookies for authentication when explicitly requested by client.
 2018-10-30 20:04:00 -04:00
Alex Dusenbery
0aa0b4d28d EDUCATOR-3630 | Check if grades are frozen before processing gradebook POST request. 2018-10-30 16:22:07 -04:00
Simon Chen
eeb4c34b0f Merge pull request #19187 from edx/schen/fixgradebookprod 
Update the lms cookie name reference for production
 2018-10-30 16:13:20 -04:00
Douglas Hall
d8d18829e6 Use JWT cookies for authentication when explicitly requested by client. 2018-10-30 15:56:26 -04:00
Matt Tuchfarber
9c0e8567f1 Merge pull request #19178 from edx/tuchfarber/REV-508 
Update course mode selection text for content gating
 2018-10-30 15:42:03 -04:00