Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,252 Commits 1 Branch 0 Tags
596eee708595d84bf33b27ba71b651a5b223702e
Commit Graph

53252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dusenbery
596eee7085 Upgrade ORA to 2.6.12 | When fetching file URLs from keys stored in Submission records, don't break just because we encountered one missing file; there might be more, existing files after it. 2020-02-20 09:02:19 -05:00
Uzair Rasheed
f8bd5304b6 Merge pull request #23136 from edx/PROD-159/add-five-seconds-step-to-video-slider 
Add five seconds step to video slider
 2020-02-20 18:56:40 +05:00
Diana Huang
eaeed53b6f Merge pull request #23142 from edx/coryleeio/setting_profile_image_secret_key 
This key used to have underscores and was accidentally changed to not have underscores, setting it back to the old value
 2020-02-19 15:25:41 -05:00
Manjinder Singh
c540eb14ee Removing deprecated rest_framework_oauth library (#23139) 
* Removing deprecated rest_framework_oauth library

* removing dependecy of django-rest-framework-oauth

* removing oauth_provider from cms
 2020-02-19 15:10:59 -05:00
Jansen Kantor
9b6eb668f4 bump ora (#23140) 2020-02-19 14:25:36 -05:00
Diana Huang
2f019c4d23 Rename profile image hash seed to better describe what it is. 2020-02-19 13:11:45 -05:00
Dave St.Germain
5e6d3a0411 Merge pull request #22973 from eduNEXT/lmm/gradebook_full_name 
Display profile name in gradebook api
 2020-02-19 11:53:39 -05:00
Dave St.Germain
592b34b998 Merge pull request #21158 from eduNEXT/lmm/add_currency_choose_template 
Setting template to show currency defined in the course mode DB record
 2020-02-19 11:46:49 -05:00
Cory Lee
5b6feccffd This key used to have underscores and was accidentally changed to not have underscores, setting it back to the old value 2020-02-19 11:32:37 -05:00
Diana Huang
615068311f Merge pull request #23097 from edx/diana/remove-class-dashboard 
Remove class_dashboard.
 2020-02-19 10:57:12 -05:00
edX requirements bot
448b6a0d66 Updating Python Requirements (#23137) 2020-02-19 09:46:21 -05:00
Bill DeRusha
92cfa81473 Merge pull request #23138 from edx/revert-23127-msingh/remove_oauth 
Revert "Removing deprecated rest_framework_oauth library"
 2020-02-19 09:00:55 -05:00
Bill DeRusha
4b04a3b92e Revert "Removing deprecated rest_framework_oauth library (#23127)" 
This reverts commit 1f32bc63ef.
 2020-02-19 08:46:03 -05:00
Ahtisham Shahid
cf41d6ebef Merge pull request #23123 from edx/ahtisham/PROD-452 
Fixed staff debug in instructor tab
 2020-02-19 16:33:49 +05:00
Ahtisham Shahid
62e1ad6216 Fixed binding issue 
updated selector

updated var name
 2020-02-19 13:39:05 +05:00
uzairr
2f080e8cd9 Add five seconds step to video slider 
Currently, video is moving one second ahead or behind on each right
and left arrow key respectively.In order to make it compliant with
the industry standards like Youtube,its step is adjusted to five
seconds.

PROD-159
 2020-02-19 13:34:54 +05:00
Jansen Kantor
0e0b488fb5 EDUCATOR-4876: Correctly handle 'None' as a valid max_team_size (#23038) 
add default max team sizes, change ui to not show max for managed teams
 2020-02-18 16:44:20 -05:00
Dillon Dumesnil
39a59cbe33 Merge pull request #23133 from edx/ddumesnil/relevant-dates-AA-4 
Adding in try block for getting item from modulestore
 2020-02-18 15:57:40 -05:00
Marco Morales
9dc5457d07 Merge pull request #23117 from edx/marco/studio-learning-sequence-nav/styling-changes 
Styling updates to Studio Unit Page Sequence navigation
 2020-02-18 15:50:37 -05:00
Alex Dusenbery
aea6a373fa Upgrade ORA to 2.6.10 | Team submissions should also include file uploads from the submitter. 2020-02-18 15:34:23 -05:00
Dillon Dumesnil
a7a84ce9ab Adding in try block for getting item from modulestore 
This also includes updating the test to actually test for this use case

AA-4
 2020-02-18 15:23:38 -05:00
Ned Batchelder
626b35cd16 Merge pull request #22637 from thraxil/bookmarks-update-exblocks-cache-task-name 
update bookmarks update_xblocks_cache celery task name
 2020-02-18 15:15:10 -05:00
edX requirements bot
45ffefe8cb Updating Python Requirements (#23125) 2020-02-18 19:38:04 +00:00
Diana Huang
c99bf692cc Remove class_dashboard. 2020-02-18 13:35:26 -05:00
Manjinder Singh
d7bd80a100 Renamed OAuth2Authentication to BearerAuthentication (#23128) 
* Renamed OAuth2Authentication to BearerAuthentication
* Added back OAuth2Authentication name
-there are libraries such as edx-enterprise that still import OAuth2Authentication.  The OAuth2Authentication class should be fully removed when everything is importing BearerAuthentication correctly
 2020-02-18 13:29:29 -05:00
Awais Qureshi
d6ffabe5c4 Merge pull request #23107 from edx/awais786/BOM-1278 
BOM-1278
 2020-02-18 23:05:35 +05:00
Dillon Dumesnil
401a37dde5 Merge pull request #23079 from edx/ddumesnil/relevant-dates-AA-4 
AA-4: Show relevant dates in course dates sidebar
 2020-02-18 12:47:31 -05:00
Awais Qureshi
16c7f0a6b4 BOM-1278 
Upgrade django-toolbar.
 2020-02-18 22:38:48 +05:00
Dillon Dumesnil
be7ef9804d AA-4: Adding waffle flag for dates widget 2020-02-18 11:20:32 -05:00
Manjinder Singh
1f32bc63ef Removing deprecated rest_framework_oauth library (#23127) 2020-02-18 11:17:27 -05:00
Manjinder Singh
2274cd09b4 Added options to pytest calls (#23083) 
- added more default options to pytest calls in setup.cfg and pytest.ini files.
- pytest-json-report's plugin name in pluggy has changed, so added option for multiple names
 2020-02-18 08:58:44 -05:00
Dillon Dumesnil
5853cddfc1 AA-4: Extreme defensiveness over any fields accessed from modulestore 2020-02-18 08:43:45 -05:00
Dillon Dumesnil
fe91d63a0b Show relevant dates in course dates sidebar 
This includes (at least) upcoming assignments, FBE access
expiration, and course end date.

AA-4
 2020-02-18 08:42:15 -05:00
edX cache uploader bot
1369aa4333 Updating Bokchoy testing database cache (#23126) 2020-02-18 08:38:12 -05:00
Ahtisham Shahid
e185652aa1 Merge pull request #23108 from edx/ahtisham/PROD-1244 
Fixed Staff graded problem Import
 2020-02-18 17:36:48 +05:00
Aarif
399be25068 Merge pull request #23121 from edx/jsonfield-migration 
Added migration for JSONField
 2020-02-18 12:02:43 +05:00
Ahtisham Shahid
19ef1e70d9 updated dependencies 2020-02-18 10:46:14 +05:00
Diego Millan
2dd128bce0 Setting template to show currency defined in the course mode DB record 2020-02-17 11:45:50 -04:00
Luis Moreno
b602665edc Display profile name in gradebook aapi 2020-02-17 11:42:29 -04:00
Zia Fazal
28b657ef94 Merge pull request #23122 from edx/ziafazal/ENT-2269-b 
Pull `LEARNER_PORTAL_URL_ROOT` from environment tokens
 2020-02-17 19:26:45 +05:00
zia.fazal@arbisoft.com
6129f26ef4 Pull LEARNER_PORTAL_URL_ROOT from environment tokens 2020-02-17 18:53:09 +05:00
Ahtisham Shahid
60ad8c8813 Merge pull request #22989 from edx/ahtisham/PROD-452 
Fixed staff debug in instructor tab
 2020-02-17 18:15:18 +05:00
Aarif
41c886a42d Added migration for JSONField 2020-02-17 16:15:53 +05:00
Ahtisham Shahid
04421b648e Merge pull request #23041 from edx/ahtisham/PROD-920 
Video Transcripts setting not preserved
 2020-02-17 13:58:15 +05:00
Ahtisham Shahid
728f7d2c71 Updated Trascript functionality 
removed extras

fixed initial state of transcript

Fixed js tests

fixed js tests

created and fixed tests

Updated Trascript functionality

updated v name

fixed spacing
 2020-02-17 11:48:28 +05:00
edX Transifex Bot
2d65e864e4 fix(i18n): update translations 2020-02-16 16:26:20 -05:00
Marco Morales
2c0d89bee5 initial styling changes to Studio unit page navigation and breadcrumb context 2020-02-16 11:28:24 -05:00
Robert Raposa
6b55961499 Merge pull request #23115 from edx/robrap/update-auth-docs-2 
update auth docs
 2020-02-14 16:36:01 -05:00
Diana Huang
10aabf9072 Merge pull request #23113 from edx/diana/unpin-search 
Unpin edx-search and update to latest version.
 2020-02-14 14:14:05 -05:00
Diana Huang
59bb5fddd1 Unpin edx-search and update to latest version. 
https://openedx.atlassian.net/browse/BOM-1036
 2020-02-14 13:43:50 -05:00