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

53597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awais Jibran
ebd6494af2 Merge pull request #23380 from edx/logs-cleanup 
Remove unnecessary logs.
 2020-03-12 16:38:54 +05:00
Nadeem Shahzad
ee8c8a18d3 Merge pull request #23374 from edx/nadeem/DOS-678 
add tags to pytest xdist worker (DOS-678)
 2020-03-12 15:37:47 +05:00
Awais Jibran
084b409662 Unnecessary logs. 2020-03-12 15:15:22 +05:00
Awais Jibran
6a25ca800b ~200k instances in last 7 days. 2020-03-12 14:22:52 +05:00
Zainab Amir
ed25521f61 Enable testing pipeline for video uploads to s3 (#23375) 
Add integration settings to enable upload of videos from from studio.
Settings enable user to connect to s3 bucket using mfa and assume role
functionality.

PROD-1214
 2020-03-12 12:19:52 +05:00
Nathan Sprenkle
5578cca1cc Show multiple team memberships in My Team tab (#23324) 
* Enable pagiation to show all a learner's teams on the "My Teams" tab
* Selectively hide/show pagination on the "My Teams" tab
* Increase "My Teams" page size to 5
 2020-03-11 15:05:15 -04:00
edX cache uploader bot
a277237f9d Updating Bokchoy testing database cache (#23376) 2020-03-11 14:12:02 -04:00
Calen Pennington
5a33c4b5ee Merge pull request #23357 from edx/mikix/reset-on-mode 
Reset schedule when mode changes
 2020-03-11 13:05:39 -04:00
Michael Terry
f56a01adbe Reset schedule when mode changes 
This way if an audit user upgrades a self paced course to verified,
their schedule will reset to the current time.

AA-60
 2020-03-11 11:53:49 -04:00
atesker
2c922dd795 EDUCATOR-4941 
cr1

cr2

cr3

cr3-remove unused var
 2020-03-11 10:50:13 -04:00
Alex Dusenbery
5db8023f74 Add LMS/CMS FEATURE toggles related to ORA; update to ORA 2.6.18. 2020-03-11 10:21:20 -04:00
Waheed Ahmed
f54b9a42e7 Disallow NaN value for speed key. 
The VideoBlock `handle_ajax` is allowing NaN values for speed key
and causing videos to not load. Also added a data migration to fix
the data for learners.

PROD-1148
 2020-03-11 18:45:49 +05:00
Dave St.Germain
99a0da8ade Merge pull request #23360 from edx/dcs/studio-nav 
Fixed the studio breadcrumbs to show the current chapter/section name.
 2020-03-11 09:32:03 -04:00
Samuel Walladge
badd608136 Allow overriding broker heartbeat (#21567) 
BROKER_HEARTBEAT appears to interfere with the celery worker
configuration. If we want to disable or change the heartbeat interval,
It must be from these configuration options.

Just setting --without-heartbeat and/or --heartbeat-interval on the
workers does not fully work. Eg. --without-heartbeat disables sending
heartbeats, but BROKER_HEARTBEAT = 60 means that the connection will get
a 60s heartbeat interval negotiated.
 2020-03-11 09:28:38 -04:00
nadeemshahzad
4b7ed730fc add tags to pytest xdist worker 2020-03-11 18:11:18 +05:00
Calen Pennington
1ce39a85a4 Merge pull request #23364 from cpennington/reset-schedule-masq 
Respect masquerade status when resetting student schedules
 2020-03-11 08:54:51 -04:00
Usama Sadiq
9dadc07453 Merge pull request #23143 from edx/bom-1277 
BOM-1277 Removed constraint on oauthlib and requests-oauthlib
 2020-03-11 17:21:55 +05:00
edX requirements bot
23c58e5766 Updating Python Requirements (#23371) 2020-03-11 08:20:04 -04:00
Ahtisham Shahid
1014f1941b Merge pull request #23340 from edx/ahtisham/PROD-1326 
update added workaround for CSV report  error
 2020-03-11 15:48:20 +05:00
usamasadiq
84744fdf88 BOM-1277 Removed constraint on requests-oauthlib and updated oauthlib 2020-03-11 11:15:24 +05:00
adeelehsan
e4a2ba2872 Merge pull request #23312 from edx/aehsan/prod-1222/fixed_pagination_for_course_api_view 
Fixed pagination.
 2020-03-11 10:35:00 +05:00
adeelehsan
98cc0b24db Fixed pagination. 
Before getting data validate the page number
on the current number of pages
 2020-03-11 10:04:04 +05:00
Jeff LaJoie
f624b2c94e Merge pull request #23361 from edx/jlajoie/local-time-for-dates-tab 
Uses user local time for dates tab
 2020-03-10 15:53:47 -04:00
Dillon Dumesnil
f395e5f5cf Merge pull request #23284 from edx/ddumesnil/calendar-sync-button-AA-36 
AA-36: Link to toggle calendar sync
 2020-03-10 15:37:01 -04:00
Calen Pennington
5235fa7bab Respect masquerade status when resetting student schedules 2020-03-10 15:10:01 -04:00
edX cache uploader bot
5fb02b181c Updating Bokchoy testing database cache (#23366) 2020-03-10 15:00:10 -04:00
Dillon Dumesnil
a59155e83c AA-36: Link to toggle calendar sync 2020-03-10 14:45:29 -04:00
Dave St.Germain
95abce3830 Fixed the studio breadcrumbs to show the current chapter/section name. 2020-03-10 14:29:56 -04:00
Brandon Baker
5034fe73ec Upgrade edx-enterprise to 2.5.2 (#23365) 
Pulling in changes to try and fix JSONField formatting in django admin.

ENT-2677
 2020-03-10 14:15:22 -04:00
Jeff LaJoie
bbfb630aa8 Uses user local time for dates tab 2020-03-10 13:41:25 -04:00
Michael Terry
2349541818 Merge pull request #23351 from edx/mikix/non-staff-deadline-banner 
Don't show reset-dates banner for staff
 2020-03-10 12:41:00 -04:00
Cory Lee
3816e1c474 DENG-17 Setting the start column on schedules to be nullable so that it (#23208) 
Setting the start column on schedules to be nullable so that it can be dropped.
 2020-03-10 10:26:32 -04:00
Jeff LaJoie
e60faeb7f0 Merge pull request #23346 from edx/jlajoie/dates-tab-for-sp-courses 
Enables Dates Tab for Self-Paced courses
 2020-03-10 08:11:28 -04:00
Ayub
b0a16fd9d0 Merge pull request #23248 from edx/BOM-1045 
Bom 1045 Upgrade edx-drf-extensions
 2020-03-10 16:33:05 +05:00
Ayub-khan
3c1140dc49 BOM-1045 
-Upgrade edx-drf-extensions
-settings-update
 2020-03-10 16:06:02 +05:00
David Joy
fa7cae74e0 Merge pull request #23355 from edx/djoy/course_metadata_staff_access_field 
Adding user_has_staff_access to course metadata response.
 2020-03-09 16:13:39 -04:00
Michael Terry
cba0dbd3f0 Merge pull request #23353 from edx/mikix/links-self-paced 
Provide links for self paced blocks
 2020-03-09 16:12:28 -04:00
Michael Terry
f6e85f758c Provide links for self paced blocks 
When self paced blocks don't have a start date set, still provide
a link to the block (noticable on dates side bar at the least).
 2020-03-09 15:42:37 -04:00
Dave St.Germain
9aeea8ac8b Merge pull request #23354 from edx/dcs/teams-overview 
Add another attribute to CourseOverview to support the Teams tab
 2020-03-09 15:39:05 -04:00
Jeff LaJoie
449ba74b37 Enables Dates Tab for Self-Paced courses 2020-03-09 15:20:46 -04:00
Michael Terry
c1d73e4f61 Don't show reset-dates banner for staff 
Much like we ignore due dates for homework in units for course
staff, we want to not bother them with a banner about being overdue.
 2020-03-09 15:19:21 -04:00
David Joy
13096ca586 Adding user_has_staff_access to course metadata response. 
We use this value in the client to understand whether or not we should be showing staff-only parts of the UI to the user.

Related to: https://openedx.atlassian.net/browse/TNL-7109
 2020-03-09 15:16:26 -04:00
Dave St.Germain
5a4d03b7b2 Add another attribute to CourseOverview to support the Teams tab 2020-03-09 15:12:44 -04:00
edX cache uploader bot
af7103c313 Updating Bokchoy testing database cache (#23352) 2020-03-09 15:09:59 -04:00
Cory Lee
e1c896f2fa DENG-17 Removing schedules history FK to auth_user so it can be ghost migrated alongside schedules since they are tied to the same model. (#23349) 2020-03-09 14:30:13 -04:00
Tim McCormack
291aea3e02 Roll back super-csv to 0.9.6 to see if it is breaking grade export (#23350) 
This partially reverts #23318.
 2020-03-09 17:59:27 +00:00
Tim McCormack
1fa29a60d5 Pin edx-drf-extensions to 4.0.0 for now until drf jwt issue fixed (#23347) 2020-03-09 16:49:50 +00:00
Dave St.Germain
e6ebc6caea Merge pull request #23315 from edx/dcs/mfe-redirect 
Redirect to learning microfrontend, except for exams
 2020-03-09 12:18:13 -04:00
Dave St.Germain
49c5d5194b Addressed review feedback 2020-03-09 11:28:48 -04:00
Dave St.Germain
28f33e1667 Defensive fix 2020-03-09 10:47:00 -04:00