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

19868 Commits

Author SHA1 Message Date
Alan Zarembok
1e6d6de4c1 Merge pull request #21093 from edx/azarembok/handle-capa-exceptions 
PROD-448: Capa problems become uneditable.
 2019-07-11 17:34:31 -04:00
Alan Zarembok
95616d7d11 PROD-448: Gracefully handle exceptions from user-supplied code in 
advanced problems so that they do not become uneditable.
 2019-07-11 14:45:58 -04:00
Matt Tuchfarber
b1998e202e Merge pull request #20945 from edx/tuchfarber/remove_journals 
Remove all references to Journals
 2019-07-11 11:08:24 -04:00
Amit
0044bef4fd INCR-393: Updates on Python 3.x (#21054) 2019-07-11 10:21:47 -04:00
aarif
0750f9a262 ran python-modernize and isort on files mentioned in INCR-423 2019-07-11 16:46:50 +05:00
Ayub khan
1521f5fce0 INCR-418 2019-07-11 16:00:23 +05:00
Ayub khan
811356b002 INCR-417 python3 compatibility 2019-07-11 15:54:47 +05:00
Ayub khan
a13321cc76 INCR-416 python3 compatibility 2019-07-11 15:45:22 +05:00
Ayub khan
e40e18ab32 INCR-414 python3 compatibility 2019-07-11 15:38:18 +05:00
Ayub khan
f4fc14ca92 INCR-408 python3 compatibility 2019-07-11 15:19:08 +05:00
Ayub khan
07275a5715 INCR-407 python3 compatibility 2019-07-11 15:14:30 +05:00
Ayub khan
8a7a39af11 INCR-406 python3 compatibility 2019-07-11 15:09:27 +05:00
Ayub khan
102dca6ae6 INCR-403 python3 compatibility 2019-07-11 14:45:01 +05:00
Ayub khan
6661745e77 INCR-402 python3 compatibility 2019-07-11 14:42:14 +05:00
arbisoft
e87dc6cc77 Fixing python-modernize issues. 2019-07-11 14:24:38 +05:00
arbisoft
004d856316 Fixing python-modernize issues. 2019-07-11 14:04:05 +05:00
arbisoft
c82b0110b0 Fixing python-modernize issues. 2019-07-11 13:37:11 +05:00
arbisoft
503622c5d2 Fixing python-modernize issues. 2019-07-11 12:59:47 +05:00
amitvadhel
182a177b4e INCR-411: Updates on Python 3.x 2019-07-11 00:15:33 +03:00
edX Transifex Bot
3298119374 geoip2: update maxmind geolite country database 2019-07-10 20:33:14 +00:00
Edward Zarecor
ecb5d000a3 Merge pull request #20931 from edx/e0d/fix-circuit-js 
Adding changes from CT to fix circuit simulator on moder chrome.
 2019-07-10 12:28:24 -04:00
David Ormsbee
930d7f2867 Revert "SE-1151 Campus.il Inlines all 36 discussion underscore templates (#20742)" 
This reverts commit 44562a1592.
 2019-07-10 11:45:28 -04:00
Edward Zarecor
2596b67664 updating to ensureHTML 2019-07-10 10:07:52 -04:00
Matt Tuchfarber
2583d317db Remove all references to Journals 2019-07-09 14:19:25 -04:00
edX cache uploader bot
a72198d915 Updating Bokchoy testing database cache (#21006) 2019-07-09 13:03:53 -04:00
Edward Zarecor
9153703212 Adding changes from CT to fix circuit simulator on moder chrome. 2019-07-09 10:04:42 -04:00
Aarif
831be7d7e6 Merge pull request #20963 from mraarif/INCR-319 
INCR-319 - python 3 compatibility
 2019-07-09 12:03:24 +05:00
Ayub
7291d8409b Merge pull request #20961 from Ayub-Khan/INCR-320 
INCR-320 python 3 compatibility
 2019-07-09 12:01:43 +05:00
Awais Qureshi
a566c0a05f Merge pull request #20960 from awais786/awais786/INCR-321 
INCR-321 python3 compatibilty
 2019-07-09 11:55:27 +05:00
Jillian Vogel
44562a1592 SE-1151 Campus.il Inlines all 36 discussion underscore templates (#20742) 
Inlines all 36 discussion underscore templates

imported by lms/templates/discussion/_underscore_templates.html
to reduce file system load when displaying inline discussion blocks.

Ignored error where fix required changing the translated text string,
due to differences between underscore and HtmlUtils format strings.
 2019-07-08 11:26:43 -04:00
Ayub khan
9fb5c146e8 -python 3 compatibility 2019-07-08 20:02:10 +05:00
root
0f22c9ff9b python 3 compatibility 2019-07-08 12:16:46 +00:00
arbisoft
ebcd75965b python3 compatibilty 2019-07-08 16:25:58 +05:00
edX cache uploader bot
f0d1d39135 Updating Bokchoy testing database cache (#20952) 2019-07-05 12:28:09 -04:00
edX Transifex Bot
07b83294d8 geoip2: update maxmind geolite country database 2019-07-03 17:03:04 -04:00
Zainab Amir
f6603cb8cf Update verification expiry email criteria (#20725) 
If already DEFAULT Number of emails are sent, then verify that user
is enrolled in at least one verified course run for which the course
has not ended else stop sending emails

LEARNER-7313
 2019-07-03 14:19:22 +05:00
edX cache uploader bot
4770a1487e Updating Bokchoy testing database cache (#20924) 2019-07-01 11:30:46 -04:00
emma-green
7f467075ad Merge pull request #20916 from edx/emma-green/remove-discount-banner-display-flag 
remove discount banner display flag
 2019-07-01 10:38:42 -04:00
Emma Green
c4ae093e75 remove discount banner display flag 2019-06-28 14:46:21 -04:00
adeelehsan
2d369490dd Flag added to load limited courses on Dashboard 
Dashboard is set to load 250 courses instead of
all the courses. A flag is also added to change
the number the courses to load.

PROD-204
 2019-06-28 22:51:41 +05:00
Feanil Patel
c5b86eb5c7 Merge pull request #20384 from open-craft/symbolist/video-xblock 
VideoModule to VideoBlock [SE-602]
 2019-06-27 16:23:00 -04:00
edX Transifex Bot
540dd815e6 geoip2: update maxmind geolite country database 2019-06-26 17:08:18 -04:00
Calen Pennington
39efc54a27 Merge pull request #20884 from cpennington/discount-no-previous-purchase 
REVEM-289: Discount no previous purchase
 2019-06-25 17:12:19 -04:00
Feanil Patel
de20d7414c Merge pull request #20400 from stvstnfrd/split-core/chem 
Split common/lib/chem into separate repository
 2019-06-25 14:45:35 -04:00
Ned Batchelder
aa13a634a6 Merge pull request #20821 from edx/nedbat/drf-yasg 
Upgrade djangorestframework and install drf-yasg to get better OpenAPI support
 2019-06-25 13:49:13 -04:00
Calen Pennington
390122ec93 Make CourseOverviewFactory create new courses every time (unless otherwise specified) 2019-06-25 12:04:59 -04:00
Jeremy Bowman
50a2641e1c Remove flaky problem reset tests (#20870) 2019-06-24 13:20:50 -04:00
Manjinder Singh
eb5e44c2d1 Merge pull request #20841 from edx/msingh/removing_flacky_test 
Removing flaky tests
 2019-06-24 11:10:23 -04:00
Christie Rice
b8401beaae REVEM-374 Remove course prices from dashboard (#20856) 2019-06-24 08:56:05 -04:00
Ned Batchelder
b3a731550c Fix problems that drf-yasg uncovered. 
These were originally fixed individually, but had to be reverted, and
are now combined in one commit.  The originals were:

7b9040f6b0 This enum was backwards
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same.
8a44397139 Is this field missing because it is None?
4a1154a7ca Give a safer buffer for clearing the rate limiting
64c47856dd DRF 3.7.4 changed how you delegate to another view, so don't
7359ca4fb2 Is this right? It fixes two tests
fdd66e5390 Adjust the expected error message for DRF 3.7.7
9257f68fd8 The default TIME_ZONE should be UTC
 2019-06-21 18:04:15 -04:00