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

20798 Commits

Author SHA1 Message Date
Jeff LaJoie
11a9a4e471 AA-51: Adds in 'Up next' banner to course home 2020-03-16 15:50:19 -04:00
Awais Jibran
d95e8724d8 Merge pull request #23342 from edx/aj/disable-forums-digests 
(story): Add switch to disable forum digest in prod.
 2020-03-16 20:49:07 +05:00
Michael Terry
4c241e57fe Add func to generate ics for schedule 
This is an unused-as-of-yet utility function to generate a bunch
of ics files for a user's course schedule. Will be used as part
of the calendar_sync feature package.

AA-37
 2020-03-16 10:51:51 -04:00
Awais Qureshi
0f002bafb8 BOM-1399 
checking django-wiki and fixing deprecation warnings.
 2020-03-16 14:37:18 +05:00
Hammad Ahmad Waqas
f692739da3 Merge pull request #23191 from edx/hammad/ENT-2580 
ENT-2580 | added management command to push old enrollments to ecommerce
 2020-03-16 12:55:38 +05:00
Awais Jibran
ac0779f0ff Merge pull request #23402 from edx/logs-cleanup 
Handle deprecation warn by importing right class.
 2020-03-13 23:55:08 +05:00
Zachary Hancock
2325b3af7a history on bulk create of enrollments (#23389) 
fixes bug where bulk creation of enrollments caused no new history records to be created
 2020-03-13 12:55:58 -04:00
Awais Jibran
65094cbf35 Handle deprecation warn by importing right class. 
2900k/ last 7 days
 2020-03-13 21:50:40 +05:00
Simon Chen
b34af45393 MST-157 Create a new program enrollments inspector support tool to help edX support members to inspect the existing states of program enrollees 
This reverts commit 37f3c3f829.
 2020-03-13 11:28:16 -04:00
Albert (AJ) St. Aubin
a5ec801a2a Add an Admin page view to add External IDs for Users in bulk 
[MICROBA-152]
 2020-03-13 10:20:24 -04:00
Nick
18e3c2fd52 Merge pull request #23373 from edx/AA-59-reset-dates-banner-on-courseware 
AA-59 show reset dates banner on courseware page
 2020-03-13 08:14:00 -04:00
Nicholas D'Alfonso
3cee26feb4 AA-59 show reset dates banner on courseware page 
- Also, only show banner if the course end_date has not already
  pass AND if the user is verified within the course.
 2020-03-12 19:52:54 -04:00
David Ormsbee
37f3c3f829 Revert "MST-157 Create a new program enrollments inspector support tool to help edX support members to inspect the existing states of program enrollees" 
This reverts commit 9bdcb9c5f5.
 2020-03-12 17:28:58 -04:00
Simon Chen
9bdcb9c5f5 MST-157 Create a new program enrollments inspector support tool to help edX support members to inspect the existing states of program enrollees 2020-03-12 15:47:26 -04:00
Abdul Hannan
fa6633ba4e DO NOT MERGE - NEED FAKE - Rename start in schedule 5/5 (#22392) 
* Remove start field in Schedules

Co-authored-by: hunytalk <ahannan@edx.org>
Co-authored-by: Cory Lee <cory@edx.org>
 2020-03-12 15:40:19 -04:00
Dillon Dumesnil
c3493d5138 Merge pull request #23356 from edx/ddumesnil/AA-58 
AA-58: Add date-summary-container html back in
 2020-03-12 10:51:04 -04:00
Awais Jibran
ebd6494af2 Merge pull request #23380 from edx/logs-cleanup 
Remove unnecessary logs.
 2020-03-12 16:38:54 +05:00
Awais Jibran
084b409662 Unnecessary logs. 2020-03-12 15:15:22 +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
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
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
Dillon Dumesnil
9586a2e3e8 AA-58: Add date-summary-container html back in 2020-03-11 09:24:09 -04: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
Dillon Dumesnil
a59155e83c AA-36: Link to toggle calendar sync 2020-03-10 14:45:29 -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
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-khan
3c1140dc49 BOM-1045 
-Upgrade edx-drf-extensions
-settings-update
 2020-03-10 16:06:02 +05:00
Awais Jibran
88c6d412e5 Add switch to disable forum digest in prod. 2020-03-10 13:25:55 +05: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
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
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
Dave St.Germain
2f148496bf Redirect to learning microfrontend when the waffle flag is set, except for exams 2020-03-09 10:47:00 -04:00
David Ormsbee
f6c9f626dc Merge pull request #23337 from edx/ormsbee/cmfe_second_waffle 
Create flag for Courseware MFE staff rollout.
 2020-03-09 10:24:08 -04:00
David Ormsbee
ed9062f409 Create flag for Courseware MFE staff rollout. 
Create the COURSEWARE_MICROFRONTEND_COURSE_TEAM_PREVIEW
CourseWaffleFlag (courseware.microfrontend_course_team_preview) to
enable us to roll out the new Courseware MFE as a preview to
select course teams without affecting their students. TNL-7117

This commit also fixes an issue where these links are shown in Old
Mongo courses (TNL-7116). Old Mongo is marked for deprecation
(DEPR-58), and is not intended to ever be supported by the new MFE.
 2020-03-09 10:01:41 -04:00
Awais Jibran
b43a01f0e6 Merge pull request #23326 from edx/logs-cleanup 
Remove unnecessary logs
 2020-03-09 16:29:25 +05:00
edX Transifex Bot
f005cc74c5 fix(i18n): update translations 2020-03-09 06:55:18 +00:00
Awais Jibran
a114af926e Temporary log removed. 
1k instances in last 24 hours.
 2020-03-07 11:50:39 +05:00
Michael Terry
605c986ff3 Mark experiment events as non interactive 
Specifically, set the 'nonInteraction' segment event property to 1.
 2020-03-06 14:46:35 -05:00
David Ormsbee
be1d3a98f7 Merge pull request #23317 from edx/ormsbee/courseware_mfe_button_visibility 
Show MFE preview to course staff (if waffle set)
 2020-03-06 11:58:08 -05:00
Tim McCormack
a783690507 Fix the way we launch celery (needs pointer to celery app, not env file) (#23325) 
This is a fix to PR #23222.
 2020-03-06 16:08:05 +00:00
David Ormsbee
767f16d795 Fix nested sequence display in Courseware MFE 
Check to make sure that "activate_block_id" is actually a Unit
(VerticalBlock) before using it to build a link to the Courseware
MFE. We were previously sending sequence block keys here, causing
the MFE to render a whole sequence where only a unit was desired.

Fixes TNL-7115
 2020-03-06 11:01:28 -05:00
David Ormsbee
979906275c Show Courseware MFE link to course staff. 
Show a link the courseware MFE to course staff if the
ENABLE_COURSEWARE_MICROFRONTEND feature is enabled and the
REDIRECT_TO_COURSEWARE_MICROFRONTEND CourseWaffleFlag is active
for that course. Previously only global staff could see this link.

This commit also adds ENABLE_COURSEWARE_MICROFRONTEND to
lms/envs/common.py and makes this value True by default on
devstack, since that front end application should soon be part
of devstack: https://github.com/edx/devstack/pull/484

Related to TNL-6982 and TNL-7045.
 2020-03-06 11:00:22 -05:00
Awais Jibran
c547af074f Remove unessary logs 2020-03-06 12:16:03 +05:00