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

48741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Youngstrom
8a8dcd4c5c Merge pull request #19904 from edx/youngstrom/fix-xdist-checkout-issues 
Change git checkout on xdist workers
 2019-03-01 10:27:42 -05:00
David Ormsbee
9b358aaffc Merge pull request #19903 from edx/revert-19635-giovanni/bb-728-add-problem-response-report-api-upstream 
Revert "[BB-728] Add problem response report API"
 2019-02-28 14:44:33 -05:00
Michael Youngstrom
b1695b4966 Change git checkout on xdist workers 2019-02-28 14:10:35 -05:00
Ned Batchelder
989a939654 Merge pull request #19885 from eduNEXT/lmm/courselanguage 
Set the default language of the courses through config files
 2019-02-28 13:41:44 -05:00
David Ormsbee
8f65ab53f0 Revert "[BB-728] Add problem response report API" 2019-02-28 13:10:31 -05:00
Michael Youngstrom
50eb2c950a Merge pull request #19902 from edx/youngstrom/tweak 
Move jenkins context to env var in pipelines
 2019-02-28 13:09:17 -05:00
Michael Youngstrom
2fb8473e0a Move context to env var 2019-02-28 10:20:27 -05:00
Luis Moreno
717ec2d804 Set the default language of the courses through config files 2019-02-28 10:21:00 -04:00
Waheed Ahmed
4d558994ef Merge pull request #19899 from edx/waheed/LEARNER-6643-add-debug-log 
Added log for credit providers fetched from cache.
 2019-02-28 18:01:51 +05:00
Waheed Ahmed
a422e7f4b6 Added log for credit providers fetched from cache. 
LEARNER-6643
 2019-02-28 17:03:13 +05:00
David Ormsbee
3f82a279c9 Merge pull request #19315 from open-craft/giovanni/bb-548-ospr 
OSPR-2818 - Add Contact Us form customization options (BB-548)
 2019-02-27 20:36:23 -05:00
David Ormsbee
033e897e8e Merge pull request #19880 from open-craft/jill/ace-header-block 
SE-800 Wraps the email header in a block so it can be themed
 2019-02-27 18:03:16 -05:00
Ned Batchelder
ab23d51763 Merge pull request #19852 from stvstnfrd/fix/oom-upstream 
Handle out-of-memory exception on Sysadmin Courses
 2019-02-27 15:11:10 -05:00
stv
25be88932c Handle out-of-memory exception on Sysadmin Courses 
We've been running into OoM issues with this functionality while
executing on one of our smaller application servers.
- Sometimes this manifests by preventing the entire page from loading
  (exception during the GET).
- At others, it occurs using the `Delete course from site` functionality
  by breaking during the POST handler. This case is particularly
  frustrating because the course actually is deleted, but looks like it
  may not have been. Internally, this is because the 500 error occurs
  _after_ the course has been successfully deleted, though this is
  opaque to the end-user.

While this doesn't address the underlying memory issue,
it does at least allow the app to recover gracefully.
 2019-02-27 11:21:53 -08:00
Farhanah Sheets
fd6cd4f101 Merge pull request #19892 from edx/revert-19881-LEARNER-7131/improve-403-error-handling 
Revert PR 19881 - "Improve 403 error handling"
 2019-02-27 12:20:13 -05:00
Farhanah Sheets
bc00313a9c Revert "Improve 403 error handling" 2019-02-27 11:28:14 -05:00
David Ormsbee
9aa8ad4a30 Merge pull request #19304 from shadinaif/confirm_email_change_message_to_ace 
Convert (Email Change Confirmation) message to edx-ACE
 2019-02-27 10:12:32 -05:00
emma-green
4f1af19e77 Merge pull request #19882 from edx/emma-green/REVEM-176/D/Fix-course-program-cache 
fix course program cache
 2019-02-27 10:04:21 -05:00
adeelehsan
4b8d6a92a0 Merge pull request #19890 from edx/aehsan/LEARNER-6943/adding_logs_to_investigate_cache 
Added logs
 2019-02-27 19:25:11 +05:00
Shadi Naif
1b83f24d3c Convert the (Email Change Confirmation) message to use edx-ACE 
Basically, this was done by:
1. Adding new class type in [common/djangoapps/student/message_types.py]
2. Adding new files for the ace template in a new directory named
    [common/templates/student/edx_ace/emailchangeconfirmation]
3. Removing old template files
    [confirm_email_change.txt] and [email_change_subject.txt]
    from the directories:
    [lms/templates/emails] and
    [common/test/test_sites/test_site/templates/emails]
4. Converting the [confirm_email_change] code to use [ace.send()]
 2019-02-27 16:22:16 +02:00
Uzair Rasheed
989180dde3 Merge pull request #19881 from edx/LEARNER-7131/improve-403-error-handling 
Improve 403 error handling
 2019-02-27 18:27:25 +05:00
adeelehsan
fd062a9c12 Added logs 
adding logs to investigate cache.

learner-6943
 2019-02-27 17:31:40 +05:00
Emma Green
f36673aff9 fix course program cache 2019-02-26 16:42:12 -05:00
Farhanah Sheets
10dff07caa Merge pull request #19883 from edx/schen/revert_softwaresecure_prod 
Revert "LEARNER-6945 Populate software secure photo verification"
 2019-02-26 15:34:18 -05:00
Simon Chen
1f491b4190 Revert "LEARNER-6945 Populate software secure photo verification" 
This reverts commit 019f6c4dcf.
 2019-02-26 14:13:58 -05:00
Matt Tuchfarber
89c36ad65a Merge pull request #19858 from edx/bessiesteinberg/ent-1591 
ENT-1591: Validate Recovery Email a Primary Email
 2019-02-26 12:37:51 -05:00
Michael Youngstrom
7fee7183d4 Merge pull request #19876 from edx/youngstrom/run-unittests-on-linters 
Add path to linter unittests to testing environment
 2019-02-26 11:00:13 -05:00
Dave St.Germain
f507a22c52 Merge pull request #19873 from edx/dcs/upgrade-proctoring 
Updated edx-proctoring to 1.5.15
 2019-02-26 10:57:19 -05:00
Matt Hughes
790f598ded Merge pull request #19872 from edx/matthugs/old-IDV-flaky-bokchoy-test 
Add IDV bypass mechanism for bok_choy tests
 2019-02-26 10:50:09 -05:00
uzairr
aa39f2c438 Improve 403 error handling 
Currently, ajax calls in courseware is handling 403 like 401.In this
PR, proper modifications have been done to make it coherent with its
intended behaviour.

LEARNER-7131
 2019-02-26 19:05:48 +05:00
Waheed Ahmed
491c2e9e57 Merge pull request #19870 from edx/waheed/LEARNER-4304-segregate-account-settings-js-strings 
Segregate learner account settings strings.
 2019-02-26 18:06:35 +05:00
AsadAzam
69f2334934 Merge pull request #19867 from edx/asad/Educator-3928-add-logs 
Added logs
 2019-02-26 16:17:33 +05:00
Waheed Ahmed
375f1c0209 Segregate learner account settings strings. 
This would let the team order translations for the beta language message
to ensure that it remains translated for a wide set of partially supported
languages.

LEARNER-4304
 2019-02-26 14:24:51 +05:00
Jillian Vogel
a5db457132 Wraps the email header in a block so it can be themed 2019-02-26 14:05:29 +10:30
David Ormsbee
7da2308bc1 Merge pull request #19635 from open-craft/giovanni/bb-728-add-problem-response-report-api-upstream 
[BB-728] Add problem response report API
 2019-02-25 21:45:04 -05:00
Matt Hughes
b4664f8377 Add IDV bypass mechanism for bok_choy tests 
An older test was deleted based on flakiness around the ID
verification process; this test eliminates the dependency on IDV by
enabling manual ID verification (an enterprise-motivated workaround
for IDV requirements) via the auto_auth endpoint.

JIRA:EDUCATOR-1178
 2019-02-25 15:58:11 -05:00
Michael Youngstrom
4ca4030c3f Add linters path to unittests 2019-02-25 15:22:19 -05:00
Dave St.Germain
cd4f44a91b Fixed proctoring tests 2019-02-25 14:09:11 -05:00
Robert Raposa
f9a4fa6d06 Merge pull request #19871 from edx/robrap/reduce-thresholds 
Reduce xsslint thresholds.
 2019-02-25 13:31:07 -05:00
albemarle
ced18f5cc1 Merge pull request #19866 from edx/transifex-bot-update-translations2019-02-24 
Update translations
 2019-02-25 13:22:33 -05:00
Julia Eskew
0b1c37746b Merge pull request #19874 from edx/juliasq/add_skip_auth_flag_to_dot_app_cmd 
Add skip-authorization flag for DOT application creation.
 2019-02-25 13:18:49 -05:00
Julia Eskew
d74ec765b5 Add skip-authorization flag for DOT application creation. 2019-02-25 12:42:21 -05:00
Robert Raposa
0339bb8783 Reduce xsslint thresholds. 2019-02-25 12:13:48 -05:00
Dave St.Germain
d3b8ab3077 Updated edx-proctoring to 1.5.15 2019-02-25 11:08:58 -05:00
emma-green
507cfb8942 Merge pull request #19849 from edx/emma-green/REVEM-176/C/Hacky-cache-course_runs-to-programs 
add course to program caching
 2019-02-25 10:41:51 -05:00
Stu Young
98326d7986 Merge pull request #19847 from edx/testeng/bokchoy_auto_cache_update_e403eee0109f7f5f12f75aded566044bb302816b 
Bokchoy db cache update
 2019-02-25 10:36:16 -05:00
Nimisha Asthagiri
3b411890a6 Merge pull request #19510 from CredoEducation/text-input-problem-pr 
Bugfix: Text Input problem type expects numeric answer when correct answer starts with a number
 2019-02-25 10:28:32 -05:00
Dave St.Germain
954c8e1a67 Merge pull request #19771 from edx/dahlia/masters-track 
Added master's track
 2019-02-25 10:11:24 -05:00
David Ormsbee
0857a1cfe5 Merge pull request #19865 from edx/ormsbee/log_b64_cookie 
Improve SafeCookieData Error Logging
 2019-02-25 09:30:20 -05:00
asadazam93
12d20697c5 Added logs 2019-02-25 17:18:47 +05:00