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

1498 Commits

Author SHA1 Message Date
nadeemshahzad
993a21181a defaults to common.py 2019-06-25 13:01:29 +00:00
DawoudSheraz
5747e97895 Merge branch 'master' into private_to_public_319d54e 2019-06-19 11:22:07 +05:00
Calen Pennington
92d9a1f541 Merge pull request #20789 from cpennington/first-enroll-discount-strikeout 
Add strike-out price to LMS Course Home sidebar
 2019-06-18 13:02:15 -04:00
Calen Pennington
4152e16016 Install openedx.features.discounts in Studio so that it can be imported by student 2019-06-17 15:11:33 -04:00
Dave St.Germain
8ebdfb4b74 Added Staff Graded Points to CMS settings 2019-06-17 09:17:54 -04:00
Awais Jibran
66298b8761 fix activation emails for login failure 2019-06-12 16:35:56 +05:00
Ned Batchelder
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
Ned Batchelder
f0fa5f7169 Enable Studio API docs in devstack 2019-06-10 15:27:39 -04:00
Ned Batchelder
9257f68fd8 The default TIME_ZONE should be UTC 
In production, we use UTC as the time zone.  DRF 3.7.7 now puts all
times in the currently set timezone where it used to use UTC.  By
setting TIME_ZONE to UTC, we keep the same results we used to get.

In a few places, we had to change the expected test results to be UTC.
 2019-06-10 15:27:39 -04:00
Dave St.Germain
23ab20a6fd Prevent import failure on CMS 2019-06-10 10:49:06 -04:00
atesker
a914faf11c Adding simple history to track grade changes. Educator-4347 
added migration

Adding simple history to track grade changes. Educator-4347
Adding migration file

Adding simple history to track grade changes. Educator-4347
Adding migration file

Adding simple history to track grade changes. Educator-4347
Adding migration file

Re-adding lms.djangoapps reference to see if it will fix the build issues

Re-adding lms.djangoapps reference to see if it will fix the build issues
 2019-06-07 16:32:56 -04:00
Cory Lee
b9c7c10ca7 Merge pull request #20654 from open-craft/jill/cms-worker-grades 
SE-1076 Campus.il Fixes issue encountered when cms worker updates grades
 2019-05-23 09:39:29 -04:00
Jillian Vogel
320288c34a Fixes issue encountered when cms worker updates grades: 
Grades: SGF.update
...
Cannot grade student 2 in course course-v1:...  because of exception: 'Settings' object has no attribute 'GENERATE_PROFILE_SCORES'

(cherry picked from commit e0ae8f49a64c3148d446d7e535eca26016dd17d1)
 2019-05-21 08:49:02 +09:30
Dave St.Germain
0573b2e4d4 Grade runtime service support for Staff Graded Points 2019-05-16 10:21:46 -04:00
Brian Mesick
a4a009e57b Merge pull request #20222 from edx/bmedx/course_enrollment_history 
Re-adding django-simple-history for CourseEnrollment
 2019-05-09 13:02:07 -04:00
Awais Jibran
d53ba6cb1d Merge pull request #20358 from edx/zaid/prod-232 
Favicon icon fixed for studio.
 2019-05-08 18:40:39 +05:00
Jeremy Bowman
5eac6aa049 Upgrade to django-pipeline 1.6.14 (#20449) 2019-05-07 16:01:37 -04:00
zaidbamber161
caf7a2c23f Fix favicon for edx studio 2019-05-07 18:36:49 +05:00
bmedx
17cb93dd51 Re-adding django-simple-history for CourseEnrollment 2019-05-03 16:16:41 -04:00
Nimisha Asthagiri
dfa3728edf Move django_comment_common from common to openedx 2019-05-03 12:10:18 -04:00
Nimisha Asthagiri
ef0e06cc0a Revert "Discussions consolidation" 2019-05-02 14:59:56 -04:00
Nimisha Asthagiri
df962a31b7 Move django_comment_common to openedx/core/djangoapps/discussion_common 2019-05-01 19:15:02 -04:00
Michael Youngstrom
bfe10720c6 Remove lettuce infrastructure 2019-04-18 09:58:21 -04:00
albemarle
05a682f55e use new, shorter names for feature toggle annotations (#20202) 2019-04-12 15:46:09 -04:00
Christopher Pappas
59a1d6ab41 ENT-1556 | Updating settings files to grab SYSTEM_WIDE_ROLE_CLASSES from config as expected 
Moving rbac settings above plugins

Moving the setting above plugins in common.py for the lms and cms as well
 2019-04-05 17:27:13 -04:00
Cory Lee
f6bf01661a Merge pull request #19959 from edx/coryleeio/remove_aws_py 
Remove aws.py
 2019-03-28 15:25:35 -04:00
Christopher Pappas
3fcf99f65b ENT-1556 - Adding in roles claim to jwt for use with edx rbac 
Adding logic that adds roles to jwt

Quality fixes
 2019-03-28 14:17:07 -04:00
Cory Lee
ac4845d052 DEPR-14 Remove AWS.py 2019-03-28 10:48:34 -04:00
Matt Tuchfarber
e6a7c58182 Merge pull request #19853 from edx/tuchfarber/add_username_replacement_api 
Adds username replacement API
 2019-03-21 12:39:23 -04:00
Matt Tuchfarber
cda681e2f1 fix python tests 2019-03-13 23:04:41 -04:00
Felipe Montoya
9195ec9f30 Addressing second feedback about redirect logic on logout behing feature flag 2019-03-11 13:09:13 -05:00
Felipe Montoya
14b4223b5e Addressing feedback 2019-03-11 12:02:38 -05:00
Felipe Montoya
80b977fff4 Make the studio login over the lms optional using a feature flag 2019-03-11 12:01:03 -05:00
Cory Lee
2108b69ff1 "Use single yaml config instead of two json configs" 
This reverts commit 8c805999e6.
 2019-03-05 11:27:36 -05:00
Mike Dikan
2c149ca6be Removing the Deprecated the 'external_auth' package in favor of 'third_party_auth' which is the current recommendation. 2019-03-02 16:06:46 -05:00
Cory Lee
8c805999e6 Revert "Use single yaml config instead of two json configs" 
This reverts commit b0b8a76dd9.
 2019-03-01 17:31:10 -05:00
Cory Lee
b0b8a76dd9 Use single yaml config instead of two json configs 2019-03-01 12:55:40 -05:00
Luis Moreno
717ec2d804 Set the default language of the courses through config files 2019-02-28 10:21:00 -04:00
David Ormsbee
1d7c082562 Merge pull request #19859 from edx/ormsbee/cookie_logging 
Add cookie size monitoring New Relic metrics.
 2019-02-22 19:26:31 -05:00
David Ormsbee
76620e0bf2 Add cookie size monitoring New Relic metrics. 
This adds middleware that will create custom parameter metrics in
New Relic to track the size of all the cookies being received for
our domain. The custom fields are "cookies_total_size" and a
separate named parameter for every cookie size, e.g.
"cookies.csrftoken.size".

This is intended to help us track cookie growth and better diagnose
issues where users lose their sessions. It is toggled by the
'request_utils.capture_cookie_sizes' Waffle Flag.
 2019-02-22 18:18:41 -05:00
Farhanah Sheets
5b38c7e39e Merge pull request #19825 from edx/aehsan/learner-6238/update_deprecated_pygeoip_to_geoip2 
update pygeopip to geoip2
 2019-02-21 13:02:47 -05:00
Calen Pennington
78c8950ea3 Clean up a few remaining unicode format string errors 2019-02-20 15:28:14 -05:00
adeelehsan
3e2764d9c0 update pygeopip to geoip2 
Update deprecated pygeoip
to geoip2 and all usages
of it

Learner-6238
 2019-02-21 00:42:05 +05:00
Troy Sankey
11c3588fcc Load IDA_LOGOUT_URI_LIST in all the necessary places 
I missed the LMS production settings, and Studio in its entirety.
 2019-02-13 12:17:02 -05:00
Troy Sankey
10afe5e52f Additionally logout from a settings list of extra logout URIs 
Currently, the LMS logout endpoint should iframe in the logout pages of
all the IDAs you were logged into. In short, this was made possible with
DOP because keeping track of the logout URIs and leaving a trail of
evidence in the user cookies was part of what we added in our fork of
DOP.  In the case of DOT, we don't have time or desire to fork DOT to
mirror this behavior, so our stop-gap solution is to log out the user
from a list of logout URIs in settings.
 2019-02-12 19:44:41 -05:00
syedimranhassan
b7f9a78603 Changed time zone to UTC for lms/cms 2019-01-23 15:34:56 +05:00
edx-pipeline-bot
674677daf5 Merge pull request #19577 from edx/private_to_public_21245f3 
Mergeback PR from private to public.
 2019-01-10 15:02:38 -05:00
Diana Huang
6572d99e76 Remove all references to datadog from our code. 2019-01-08 15:41:24 -05:00
Julia Eskew
b350db7ede Read salt for retirement hashing from config. 2019-01-08 15:25:20 -05:00
Dave St.Germain
c71c12545a These settings now come from edx-proctoring 2018-12-21 11:16:27 -05:00