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

49056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Youngstrom
cc13efdc2c INCR-138 2019-03-29 09:52:59 -04:00
Michael Youngstrom
8ad58c35d3 Merge pull request #20075 from edx/youngstrom/INCR-169 
INCR-169
 2019-03-29 09:29:56 -04:00
Michael Youngstrom
a1a6131979 Merge pull request #20074 from edx/youngstrom/finish-catalog 
INCR-181
 2019-03-29 09:29:34 -04:00
Jeremy Bowman
cdc42026b8 Merge pull request #20080 from open-craft/guruprasad/INCR-180 
[INCR-180] Python 3.x compatibility changes - openedx/core/djangoapps/theming/tests
 2019-03-28 22:50:49 -07:00
Jeremy Bowman
46e8955d52 Merge pull request #20079 from edx/cliff/incr-41-upgrade-pdfminer 
INCR-41: Replace pdfminer with pdfminer.six
 2019-03-28 22:42:46 -07:00
Jeremy Bowman
1cb2960444 Merge pull request #20082 from edx/cliff/incr-39-remove-django-memcached-hashring 
INCR-39: Remove django-memcached-hashring
 2019-03-28 22:28:36 -07:00
Jeremy Bowman
cd8d7d0319 Merge pull request #20081 from edx/cliff/incr-107-restrict-pysqlite 
INCR-107: Restrict pysqlite to python 2.7
 2019-03-28 22:18:51 -07:00
J. Cliff Dyer
66f0677859 INCR-39: Remove django-memcached-hashring 2019-03-28 15:49:19 -07:00
J. Cliff Dyer
4ba281b970 INCR-107: Restrict pysqlite to python 2.7 2019-03-28 15:38:13 -07:00
Guruprasad Lakshmi Narayanan
2e305964f5 [INCR-180] Compatibility changes - openedx/core/djangoapps/theming/tests 2019-03-28 15:26:31 -07:00
Jeremy Bowman
082ca19757 Merge pull request #20059 from open-craft/incr-14/bump-python-memcached 
[WIP] [INCR-14] Bump python-memcached for Python 3 support
 2019-03-28 15:25:41 -07:00
J. Cliff Dyer
95aee94089 INCR-41: Replace pdfminer with pdfminer.six 2019-03-28 15:24:47 -07:00
Michael Youngstrom
b238752d94 INCR-169 2019-03-28 17:15:45 -04:00
Michael Youngstrom
a5e8c167eb Run python-modernize on openedx/core/djangoapps/catalog 2019-03-28 16:52:29 -04:00
Michael Youngstrom
63f799ff8f Merge pull request #20066 from edx/youngstrom/INCR-117 
INCR-117: Run python-modernize on catalog/management, catalog/migrations, catalog/tests
 2019-03-28 15:56:05 -04:00
Michael Youngstrom
c8f5d55a17 Merge pull request #20063 from edx/youngstrom/INCR-153 
INCR-153: Run python-modernize on openedx/core/djangoapps/credit/tests
 2019-03-28 15:55:53 -04:00
Cory Lee
f6bf01661a Merge pull request #19959 from edx/coryleeio/remove_aws_py 
Remove aws.py
 2019-03-28 15:25:35 -04:00
Christopher Pappas
3fcf99f65b ENT-1556 - Adding in roles claim to jwt for use with edx rbac 
Adding logic that adds roles to jwt

Quality fixes
 2019-03-28 14:17:07 -04:00
Cory Lee
fc402473c0 Merge branch 'master' into coryleeio/remove_aws_py 2019-03-28 14:08:02 -04:00
Michael Youngstrom
c5b99ec035 python-modernize and isort 2019-03-28 12:49:29 -04:00
Michael Youngstrom
6d3e7237da Merge pull request #20062 from edx/youngstrom/INCR-171 
INCR-171: Run python-modernize on openedx/core/djangoapps/profile_images
 2019-03-28 12:05:29 -04:00
Matt Hughes
fb8313d985 Merge pull request #20067 from edx/matthugs/fix-bug-with-exam-timer 
Fix bug with missing exam timer numbers
 2019-03-28 11:40:44 -04:00
Michael Youngstrom
488e54247d group 2019-03-28 11:14:51 -04:00
Cory Lee
ac4845d052 DEPR-14 Remove AWS.py 2019-03-28 10:48:34 -04:00
Matt Hughes
43e6cb871b Fix bug with missing exam timer numbers 2019-03-28 10:34:12 -04:00
Michael Youngstrom
1139eb6bfb Run python-modernize on openedx/core/djangoapps/credit/tests 2019-03-28 09:57:20 -04:00
Michael Youngstrom
0ab0f6bda8 run python-modernize openedx/core/djangoapps/profile_images 2019-03-28 09:51:19 -04:00
adeelehsan
17a993b70a Merge pull request #20052 from edx/aehsan/leraner-5581/proctoring_exam_banner_on_top 
Proctoring exam always on top
 2019-03-28 17:58:53 +05:00
Robert Raposa
fe69add748 Merge pull request #20057 from edx/robrap/ARCH-603-fix-user-id-scope 
ARCH-603: Add user_id scope to various defaults.
 2019-03-27 20:09:13 -04:00
Robert Raposa
e52db402b8 add user_id scope to the list of available scopes 
This should have been done when the scope was first added as part
of (#19765).

ARCH-603
 2019-03-27 19:00:04 -04:00
Matthew Piatetsky
470b085fcf Merge pull request #20064 from edx/revert-20003-mobile-access-denied 
Revert "REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason"
 2019-03-27 18:18:19 -04:00
Matthew Piatetsky
8eae694566 Revert "REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason" 2019-03-27 16:30:37 -04:00
Calen Pennington
6a15e57092 Merge pull request #20056 from cpennington/fbe/access-expiry-no-binning 
Don't use multiple bins per course when sending Access Expiry Emails
 2019-03-27 12:49:28 -04:00
Douglas Hall
555bba1d3c Merge pull request #20060 from edx/douglashall/ARCH-586 
ARCH-586 Always send 404 response on requests for non-existent user accounts.
 2019-03-27 12:42:24 -04:00
Douglas Hall
7fdc4a9f73 Always send 404 response on requests for non-existent user accounts. 2019-03-27 11:19:23 -04:00
Thomas Tracy
d71d1dd454 Merge pull request #20011 from edx/ttracy/ENT-1584-tracking-for-email-change 
Ttracy/ent 1584 tracking for email change
 2019-03-27 09:26:45 -04:00
AsadAzam
1dcba3eed3 Merge pull request #20043 from edx/Educator-4013-addtional-timing-logs 
Adding more timing logs as course-rerun is slow for mitx-7.00x
 2019-03-27 15:39:18 +05:00
Paulo Viadanna
8ef1a6329f Bump python-memcached for Python 3 support 2019-03-26 15:41:40 -07:00
Matthew Piatetsky
e6b55ede3d Merge pull request #20003 from edx/mobile-access-denied 
REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason
 2019-03-26 17:33:57 -04:00
Matthew Piatetsky
4bb539c9aa update user partition and access_denied_message_filter transformers 2019-03-26 15:26:59 -04:00
Calen Pennington
537696d861 Don't use multiple bins per course when sending Access Expiry Emails 2019-03-26 14:33:12 -04:00
Christie Rice
9de31aad7b Merge pull request #20012 from edx/crice/REVEM-246_status 
REVEM-246 Add program status and one-click eligibility
 2019-03-26 14:15:24 -04:00
Thomas Tracy
1f8a9f5dc7 Added a tracking event for when the user switches their secondary email to their primary. 2019-03-26 13:41:34 -04:00
Douglas Hall
dfcdc1ce6e Merge pull request #20054 from edx/douglashall/ARCH-494 
ARCH-494 Validate UserProfile.bio field.
 2019-03-26 12:25:22 -04:00
Christie Rice
b28515b276 REVEM-246 Add program status and one-click eligibility 2019-03-26 10:51:58 -04:00
Douglas Hall
b444ea2471 Validate UserProfile.bio field. 2019-03-26 10:25:27 -04:00
Matt Hughes
adf64e6daf Merge pull request #20050 from edx/matthugs/fix-instructor-exam-config-launch 
fixing issue with instructor service not being loaded in studio
 2019-03-26 09:29:26 -04:00
adeelehsan
a504045ff4 Proctoring exam always on top 
proctoring banner was interfering
with course goal banner. Z-index
added on proctoring banner to make
sure its always on top

learner-5581
 2019-03-26 16:23:27 +05:00
Zainab Amir
a5189ad769 Merge pull request #20051 from edx/zamir/LEARNER_5532_change_css_on_edge_about_page 
LEARNER-5532 Change css for edX edge about page
 2019-03-26 15:49:50 +05:00
Zainab Amir
e0eea23e78 Change css for edX edge about page 
Removed padding and increased the height to 100% to make enroll
button visible on mobile view for courses with long title

LEARNER-5532
 2019-03-26 14:43:21 +05:00