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

17043 Commits

Author SHA1 Message Date
edX cache uploader bot
a72198d915 Updating Bokchoy testing database cache (#21006) 2019-07-09 13:03:53 -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
stv
488e4e1e02 Remove local copy of openedx-chem package 
now that we install it from an external repository.
 2019-06-21 11:49:31 -07:00
Calen Pennington
e37e7e67fb Add metrics and logging around track selection rendering without enrollment 2019-06-21 13:15:14 -04:00
Amit
4fb5679987 INCR-245: Make compatible with Python 3.x without breaking Python 2.7… (#20530) 
* INCR-245: Make compatible with Python 3.x without breaking Python 2.7 support > common/lib/capa/capa/safe_exec

* INCR-245: Add absolute_import to CODE_PROLOG
 2019-06-20 15:38:33 -04:00
Usman Khalid
0b27c62ca6 Convert VideoModule to VideoBlock. 
Some deprecated functionality has been removed:

- Reading data field and transforms being applied in the init() method.
- The source field.
- The source_visible attribute.
 2019-06-20 22:12:39 +05:00
edX cache uploader bot
23196519b3 Updating Bokchoy testing database cache (#20863) 2019-06-20 11:35:39 -04:00
Hassan Javeed
6d14f288e5 Added history to CourseMode 
DE-1557
 2019-06-20 19:04:26 +05:00
msingh
403a04b9fa Removing flacky test from test_lms_problems.py 2019-06-20 09:25:40 -04:00
edX cache uploader bot
392cc97ce9 Updating Bokchoy testing database cache (#20839) 2019-06-19 11:01:41 -04:00
edX Transifex Bot
82f48ec1df geoip2: update maxmind geolite country database 2019-06-19 09:43:35 +00:00
Jeremy Bowman
7b9a161875 Revert "Updating Bokchoy testing database cache (#20827)" (#20837) 
This reverts commit aef1986cac.
 2019-06-17 10:56:40 -04:00
edX cache uploader bot
aef1986cac Updating Bokchoy testing database cache (#20827) 2019-06-17 10:15:45 -04:00
Diana Huang
fe3d33091f More test fixes. 2019-06-14 15:20:50 -04:00
Jeremy Bowman
45e390d0ea Upgrade to edx-opaque-keys 1.0.1 (#20817) 2019-06-14 12:15:44 -04:00
Michael Roytman
05c0510cd3 add external_user_key to response and add ability to search by username, email, or external user key 
Code review comments - EDUCATOR-4319

undoing changes temporarily

undoing changes temporarily

Fixed exception handling

re-added changes after hard reset

removed waffle flag (wrong merge

removed waffle flag (wrong merge
 2019-06-14 08:36:00 -04:00
edX Transifex Bot
ec691f3be5 geoip2: update maxmind geolite country database 2019-06-12 16:58:05 -04:00
Amit
c54a18c9fc INCR-413: Run python-modernize and isort (#20786) 
* INCR-413: Run python-modernize and isort

* INCR-413: Fix for text_type usage
 2019-06-12 11:54:48 -04:00
edX cache uploader bot
d0de873217 Updating Bokchoy testing database cache (#20805) 2019-06-12 11:42:36 -04:00
Ned Batchelder
39c7a2db7c Revert "Use drf-yasg for Open API documentation" 2019-06-11 16:05:00 -04:00
Jeremy Bowman
237d264a50 DEPR-12 Remove microsites references from edxmako (#20796) 2019-06-11 15:27:10 -04:00
Ned Batchelder
756dd88691 Merge pull request #20393 from edx/nedbat/drf-yasg 
Use drf-yasg for Open API documentation
 2019-06-11 13:58:13 -04:00
edX cache uploader bot
a6c802b3f1 Updating Bokchoy testing database cache (#20788) 2019-06-11 12:24:54 -04:00
edx-pipeline-bot
de5d25eccc Merge pull request #20794 from edx/private_to_public_55dd3e1 
Mergeback PR from private to public.
 2019-06-11 19:17:13 +05:00
Ned Batchelder
8774ff1f9b Use ref_name to disambiguate serializers that drf-yasg would otherwise assume are the same. 2019-06-10 15:27:39 -04:00
Ned Batchelder
8a44397139 Is this field missing because it is None? 2019-06-10 15:27:39 -04:00
Matthew Piatetsky
aba836b517 Merge pull request #20674 from edx/REVEM-354 
add discount banner to track selection and discount price to upgrade button
 2019-06-07 11:35:34 -04:00