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

50092 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
2e9cae46cb Add drf-yasg 
* Install drf-yasg

* Add drf-yasg settings and urls

* Pin drf to make drf-yasg work

* Adjust config-models version to be compatible

* Remove django-rest-swagger (the old way)
 2019-06-21 17:47:26 -04:00
Calen Pennington
14f7b90fb8 Merge pull request #20872 from cpennington/track-selection-not-enrolled 
Add metrics and logging around track selection rendering without enro…
 2019-06-21 15:42:25 -04:00
Douglas Hall
f9d599a1a0 Add Discover New link to LMS header. (#20875) 2019-06-21 15:41:06 -04:00
jansenk
027a9bd2cc add api access request management command 2019-06-21 15:34:03 -04:00
Stu Young
16fcf22a7c bump code annotations (#20869) 2019-06-21 13:56:49 -04:00
Calen Pennington
e37e7e67fb Add metrics and logging around track selection rendering without enrollment 2019-06-21 13:15:14 -04:00
Calen Pennington
b14244fe01 Merge pull request #20862 from cpennington/mobile-fbe-fields 
Allow a limited subset of fields in the Course Block View for blocks …
 2019-06-21 12:25:56 -04:00
Manjinder Singh
a787cd51cf Merge pull request #20801 from edx/msingh/INCR-482 
INCR-482: ran python modernization and isort
 2019-06-21 11:10:37 -04:00
Andytr1
cac4ec0047 Merge pull request #20843 from edx/andytr1/grades_show_email_for_masters_track_only 
EDUCATOR-4319 gradebook show student email only for master's track.
 2019-06-21 09:29:58 -04:00
Amit
df949d6de1 INCR-480: Make compatible with Python 3.x and fixed line over length limit (#20833) 2019-06-20 16:20:49 -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
Calen Pennington
093fc9f68a Allow a limited subset of fields in the Course Block View for blocks that have been denied authorization 2019-06-20 15:23:32 -04:00
atesker
68ec2e184d gradebook show student email only for master's track. 
gradebook show student email only for master's track.

show emails for masters track - unit tests pass

fixed more unit tests and linting
 2019-06-20 14:51:38 -04:00
edX cache uploader bot
23196519b3 Updating Bokchoy testing database cache (#20863) 2019-06-20 11:35:39 -04:00
edX requirements bot
a8310f34c7 Updating Python Requirements (#20860) 2019-06-20 11:29:46 -04:00
Hassan
e6fc882cee Merge pull request #20847 from edx/hassan/add-history-to-coursemode 
Added history to CourseMode.
 2019-06-20 19:49:02 +05:00
Hassan Javeed
6d14f288e5 Added history to CourseMode 
DE-1557
 2019-06-20 19:04:26 +05:00
Usama Sadiq
d5a8a40a3a Merge pull request #20861 from edx/usama/INCR-476 
INCR-476
 2019-06-20 18:12:36 +05:00
usama sadiq
1630911131 Updated to Python3 
Added absolute import in both files
 2019-06-20 16:07:17 +05:00
edX cache uploader bot
392cc97ce9 Updating Bokchoy testing database cache (#20839) 2019-06-19 11:01:41 -04:00
Feanil Patel
d399364021 Merge pull request #20851 from edx/jenkins/upgrade-python-requirements-5414828 
Python Requirements Update
 2019-06-19 10:10:15 -04:00
Feanil Patel
eddcb87ea1 Merge pull request #20814 from amitvadhel/INCR-477 
INCR-477: Make compatible with Python 3.x
 2019-06-19 09:43:26 -04:00
edx-pipeline-bot
e61b1c7b9a Merge pull request #20832 from edx/private_to_public_319d54e 
Mergeback PR from private to public.
 2019-06-19 18:20:33 +05:00
Waheed Ahmed
e311dc2e4c Merge pull request #20849 from edx/geoip2-bot-update-country-database2019-06-19 
geoip2: update maxmind geolite country database
 2019-06-19 16:15:36 +05:00
edX requirements bot
e596499c3e Updating Python Requirements 2019-06-19 06:48:23 -04:00
edX Transifex Bot
82f48ec1df geoip2: update maxmind geolite country database 2019-06-19 09:43:35 +00:00
DawoudSheraz
5747e97895 Merge branch 'master' into private_to_public_319d54e 2019-06-19 11:22:07 +05:00
amitvadhel
05bf848b1f INCR-477: pylint: disable import-error for urljoin 2019-06-19 09:16:03 +03:00
amitvadhel
94f410f432 INCR-477: Make compatible with Python 3.x 2019-06-19 08:35:43 +03:00
Bessie Steinberg
5414828c00 Merge pull request #20845 from edx/bessiesteinberg/bump-edx-enterprise-to-1.6.15 
Bump edx-enterprise to 1.6.15
 2019-06-18 17:00:55 -04:00
Feanil Patel
e4bb4b0959 Merge pull request #20823 from edx/renovate/npm-underscore.string-vulnerability 
Update dependency underscore.string to v3.3.5 [SECURITY]
 2019-06-18 15:44:06 -04:00
Bessie Steinberg
bb2ba6e2a3 Bump edx-enterprise to 1.6.15 2019-06-18 15:14:05 -04:00
Feanil Patel
11895b843f Run npm install with our version of node. 2019-06-18 14:39:49 -04: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
2901d5f810 Centralize the strike-out price formatting to make correct accessibility easier 2019-06-18 11:00:08 -04:00
Zainab Amir
f55407a48d Merge pull request #20734 from edx/zamir/LEARNER_6220_remove_remember_me_button 
Remove Remember me button from login page
 2019-06-18 17:57:09 +05:00
Zainab Amir
fa8aeb69d9 Remove Remember me button from login page 
Remember me button does the same thing regardless of if it is checked
or not. Remember me button being unchecked makes a user think they
will be logged out at the end of a browsing session when this is in
fact not the case

LEARNER-6220
 2019-06-18 17:30:37 +05:00
George Babey
7460ecd1b0 Merge pull request #20838 from edx/bexline/enterprise_version_bump 
Version bump for edx-enterprise
 2019-06-17 18:15:48 -04:00
Brittney Exline
52d03626e2 Version bump for edx-enterprise 2019-06-17 14:28:05 -06:00
Dave St.Germain
6014426d83 Merge pull request #20835 from edx/dcs/sgp-setting 
Added Staff Graded Points to CMS settings
 2019-06-17 16:13:11 -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
Calen Pennington
f842717c49 Add strike-out price to LMS Course Home sock 2019-06-17 15:11:33 -04:00
Calen Pennington
26cb18b01d Fix test name typo 2019-06-17 15:11:33 -04:00
Calen Pennington
dc7daccfc8 Add strike-out price in LMS courseware 2019-06-17 15:11:33 -04:00
Calen Pennington
d2de618b20 Add strike-out price to LMS Course Home sidebar 2019-06-17 15:11:33 -04:00
Matt Hughes
023540c205 Merge pull request #20825 from edx/matthugs/draw-full-name-from-correct-place-fixing-instructor-dashboard-launch 
Backend-specific dashboard launches depend on the name field
 2019-06-17 11:57:36 -04:00
edX requirements bot
f56e2af599 Updating Python Requirements (#20834) 2019-06-17 11:48:57 -04:00
Matt Hughes
c5e7c71983 Backend-specific dashboard launches depend on the name field 
... being set and fail if there is none. We were drawing in this
information from the auth_user.first_name and .last_name fields, which
are deprecated on the edX platform.
 2019-06-17 11:11:03 -04: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