Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,957 Commits 1 Branch 0 Tags
96844c1d05937e439bcf68cfbbe9db6ea0fa0651
Commit Graph

48957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Piatetsky
96844c1d05 do not show FBE upsell to full access users 2019-03-20 14:40:13 -04:00
Jeremy Bowman
7144b8ec63 Merge pull request #19911 from edx/jmbowman/TE-2871 
TE-2871 Switch to mysqlclient
 2019-03-20 14:18:50 -04:00
Calen Pennington
ae75adf2a9 Merge pull request #20032 from cpennington/fbe/no-send-cdl-disabled 
Don't send Access Expiry Emails to courses that don't have Course Dur…
 2019-03-20 12:30:03 -04:00
Calen Pennington
078b50e6eb Don't send Access Expiry Emails to courses that don't have Course Duration Limits enabled 2019-03-20 11:20:41 -04:00
adeelehsan
edafaa107f Merge pull request #20031 from edx/revert-20030-geoip2-bot-update-country-database2019-03-20 
Revert "geoip2: update maxmind geolite country database"
 2019-03-20 18:52:06 +05:00
Michael Roytman
20a9b7140c Merge pull request #20022 from edx/mroytman/update-studio-hiw-images 
update Studio How It Works images to reflect current state of Studio
 2019-03-20 09:25:52 -04:00
adeelehsan
ccd9b14974 Revert "geoip2: update maxmind geolite country database" 
This reverts commit 8e2b68e3f8.
 2019-03-20 15:12:43 +05:00
adeelehsan
8e2b68e3f8 geoip2: update maxmind geolite country database 2019-03-20 14:26:47 +05:00
Stu Young
581a6a725a Merge pull request #20020 from edx/testeng/bokchoy_auto_cache_update_c5af88e0004bfcbcc5076f70a5adce561f783218 
Bokchoy db cache update
 2019-03-19 15:49:09 -04:00
Jeremy Bowman
5e37a0c0bb Merge pull request #19621 from cclauss/Fix-ur-strings-for-Python3 
ur'strings' are syntax errors in Python 3
 2019-03-19 15:34:55 -04:00
edx-cache-uploader-bot
7e66e2a6f6 Updating migrations 2019-03-19 15:10:54 -04:00
Calen Pennington
1943640900 Merge pull request #20024 from cpennington/fbe/send-other-courses 
Continue attempting to enqueue messages even if they are disabled for…
 2019-03-19 14:46:59 -04:00
Calen Pennington
a6d3db2bf5 Continue attempting to enqueue messages even if they are disabled for one course 2019-03-19 13:01:16 -04:00
Calen Pennington
d567724163 Merge pull request #20008 from cpennington/fbe/get-courses-batched 
Fbe/get courses batched
 2019-03-19 11:53:19 -04:00
Calen Pennington
10963c122a Don't refetch CourseOverview with a course object already in-hand 2019-03-19 10:30:33 -04:00
Calen Pennington
544c7f7eff Batch queries to fetch all courses to prevent over-fetching during paging operations 2019-03-19 10:30:33 -04:00
Michael Roytman
c15746ccc0 update Studio How It Works images to reflect current state of Studio 2019-03-19 09:40:26 -04:00
adeel khan
8a8d341830 Merge pull request #20004 from edx/adeel/learner_6607_csrf_token_error 
Fix csrf token error by adding JwtAuthentication.
 2019-03-19 15:38:52 +05:00
cclauss
6a41d01c67 Back to r again 2019-03-19 07:50:22 +01:00
Jeremy Bowman
bc32513b0e Merge pull request #20006 from singuliere/INCR-16-shapely 
[INCR-16] upgrade shapely
 2019-03-18 16:50:43 -04:00
David Ormsbee
7dcad7af55 Merge pull request #16496 from open-craft/josh/announcements-feature 
Dashboard announcements feature
 2019-03-18 16:04:38 -04:00
Calen Pennington
6059e21bff Reapply "Improve the performance of access checking for a specific user in CourseViewList by prefetching data" 
This reverts commit d8cd6135a6.
 2019-03-18 15:24:40 -04:00
Adeel Khan
9c221ebcf5 Fix csrf token error by adding JwtAuthentication. 
BasketView post endpoint is raising csrf token
error because of missing JwtAuthentication class.

LEARNER-6607
 2019-03-19 00:04:18 +05:00
emma-green
504342b924 Merge pull request #20013 from edx/emma-green/REVMI-138/stop-the-bleeding 
REVMI-138 don't error if somethings wrong, just warn
 2019-03-18 14:38:55 -04:00
Calen Pennington
f11f388efe Update dependencies 2019-03-18 14:31:37 -04:00
Emma Green
8445881c91 dont error if somethings wrong, just warn 2019-03-18 13:56:18 -04:00
Farhanah Sheets
a69ab50596 Merge pull request #19988 from raccoongang/fix_errors_not_shown_at_instructor_dashboard_course_team_management 
Fix bug: error messages are not shown in Course Team Management
 2019-03-18 13:52:00 -04:00
Dave St.Germain
39ad3b1dd8 Merge pull request #19848 from edx/dcs/decide-duedates 
Proposed decision on due date refactoring
 2019-03-18 13:11:58 -04:00
Dave St.Germain
5beddeb7ff Accepted ADR 2019-03-18 11:54:03 -04:00
Dave St.Germain
8b6496e860 Merge pull request #19955 from edx/dcs/proctoring-profed 
Enable proctoring for professional track learners
 2019-03-18 11:37:56 -04:00
Dave St.Germain
d1cd8e0407 Enable proctoring for professional track learners 2019-03-18 10:37:37 -04:00
Matt Hughes
223b8d6fe8 Merge pull request #20010 from edx/matthugs/allow-proctoring-exams-to-be-marked-error-after-submission-on-review-failure 
allow proctoring exams to be marked error after submission
 2019-03-18 09:50:09 -04:00
cclauss
9a0c995885 ur'strings' are syntax errors in Python 3 2019-03-17 13:56:02 +01:00
David Ormsbee
089817cf55 Merge pull request #19507 from open-craft/kshitij/fix-problem-response-report 
[BB-753] Fix issue with multiple responses for a single user returned by generate_report_data
 2019-03-15 15:36:47 -04:00
Matt Hughes
9b5d5c34d7 allow proctoring exams to be marked error after submission 
This is necessary to allow new proctoring backends to mark proctored
attempts in error, often due to unuploaded files from the application
or issues with multiple sets of files attached to the same testing
session.
 2019-03-15 13:39:05 -04:00
Audrey
b49dc257b3 Merge pull request #20009 from edx/aekao/REVEM-151/email-question-wording 
REVEM-151 Updating text when asking for learner emails
 2019-03-15 13:22:42 -04:00
Audrey Kao
6a0792f9a0 Updating text when asking for learner emails 2019-03-15 12:23:03 -04:00
singuliere
4b0ccde18d upgrade shapely 
Fixes: https://openedx.atlassian.net/browse/INCR-16
 2019-03-15 14:59:12 +01:00
Christie Rice
6a6c43cd6b Merge pull request #20002 from edx/crice/REVEM-246_url 
REVEM-246 Use existing method to get basket page URL
 2019-03-15 09:46:29 -04:00
Nimisha Asthagiri
9c3472ab24 Merge pull request #19845 from eduNEXT/fmo/studio_sso_over_lms_flag 
Make the studio login over the lms optional using a feature flag
 2019-03-15 08:23:02 -04:00
Ned Batchelder
53458cd3ea Merge pull request #19999 from edx/nedbat/skip-named-release-help-tests 
Skip named release help tests
 2019-03-14 20:14:54 -04:00
Alex Dusenbery
f35970bb39 EDUCATOR-4189 | Account for undefined values in commerce API Course objects. 2019-03-14 16:47:46 -04:00
Felipe Montoya
923a91734d Fixing lettuce tests 2019-03-14 15:21:03 -05:00
Christie Rice
94b680082a REVEM-246 Use existing method to get basket page URL 2019-03-14 15:12:14 -04:00
Ned Batchelder
561f0752ca Skip tests of help doc links on named release branches. 
@skip_unless_master is used to skip tests because on named release
branches, most work happens leading up to the first release on the
branch, and that is before the docs have been published.  Tests that
check readthedocs for the right doc page will fail during this time, and
it's just a big distraction.  Also, if we bork the docs, it's not the
end of the world, and we can fix it easily, so this is a good tradeoff.
 2019-03-14 14:01:30 -04:00
Calen Pennington
8ecf6d68b5 Merge pull request #19998 from cpennington/revert-aggressive-prefetching 
Revert "Improve the performance of access checking for a specific use…
 2019-03-14 11:40:05 -04:00
Christie Rice
38c559f6c2 Merge pull request #19989 from edx/crice/REVEM-207_programSkus 
REVEM-207 Add program price and purchase url to user metadata
 2019-03-14 11:31:59 -04:00
Calen Pennington
d8cd6135a6 Revert "Improve the performance of access checking for a specific user in CourseViewList by prefetching data" 
This reverts commit a2a340bcd0.
 2019-03-14 10:31:24 -04:00
Christie Rice
b2432ac5aa REVEM-207 Add program price and purchase url to user metadata 2019-03-14 10:15:48 -04:00
adeelehsan
2e369ce476 Merge pull request #19996 from edx/aehsan/removing_logs_added_for_learner-6943 
Removing logs
 2019-03-14 18:15:21 +05:00