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

21335 Commits

Author SHA1 Message Date
Feanil Patel
cf5f9482e3 Merge pull request #23975 from edx/depr/shoppingcart-instructor-report 
instructor_task: remove shoppingcart (DEPR-43)
 2020-06-29 11:05:26 -04:00
Nimisha Asthagiri
80ea0a61f0 instructor_task: remove shoppingcart (DEPR-43) 2020-06-29 10:28:26 -04:00
alangsto
d694582441 Displays escalation email on Special Exams tab (#24331) 
* Displays escalation email on Special Exams tab of instructor dashboard. MST-274

* updates for requested changes

* updates necessary for unit testing

* Fixes for pylint warning

* fix for quality tests
 2020-06-29 09:11:48 -04:00
Awais Jibran
c106bfd83f Merge pull request #24254 from edx/aj/update-id-v-emails 
Updating ID Verification Approved email template.
 2020-06-29 13:07:35 +05:00
Awais Jibran
0142dcdf86 Adding ID Verification Approved email template. 
PROD-1639
 2020-06-29 12:17:55 +05:00
edX Transifex Bot
ce9d22254b fix(i18n): update translations 2020-06-28 17:45:57 -04:00
Aarif
9e34cb3df9 Removed deprecated future imports (#24295) 2020-06-28 23:40:03 +05:00
Ben Warzeski
64e8332d38 Topic teams actions (#24336) 
* modern eslint allowances

* update topic teams to request team membership per local teamset

* update tests for topic_teams change

* cleanup

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-06-26 14:46:51 -04:00
Danial Malik
c962423bbc Replace track calls with eventtracking in task_track and server_track (#24282) 
* Replace track calls with eventtracking in task_track and server_track

* Making  events compatible with events emitted via track app

* Fixed broken tests and quality violation

* Removed useless changes in shim. using  in  to have  and  keys in event context

Co-authored-by: zia.fazal@arbisoft.com <zia.fazal@arbisoft.com>
 2020-06-26 13:49:16 -04:00
Nathan Sprenkle
835ccafa5d Fix team size validation issue (#24290) 
* Edit team manage to check sizes at end of import

* Fix size validation to take new teams into account

* Remove redundant max size check

* Consolidate team membership counters

* Remove unused user_ids_by_teamset_id set

* Fix team removal to only occur after validation

* Update team full error message

* Prefetch users when looking up team counts
 2020-06-26 11:55:36 -04:00
Ali Akbar
e4bf35e556 Merge pull request #24313 from edx/aakbar/PROD-1688 
allow moderators to post in forum
 2020-06-26 17:00:47 +05:00
Ali-D-Akbar
e319e84969 allow moderators to post in forum 2020-06-26 16:29:54 +05:00
Matt Tuchfarber
4f1cd91113 Re-Add demographics prompt to edx.org theme (#24231) 
- Add bootstrap utility function to lms-base-v1 CSS
- Moved coaching sass to edx.org theme
- Banner feature flag and MB program gated
- Fixes previous issue of changes specificity in button selector by
  resetting the style inside the component's class
 2020-06-25 14:47:08 -04:00
Awais Qureshi
a16bc22876 Merge pull request #24310 from eduNEXT/eric/bom-1746 
[BD-6] Separate tests according to the python version, due to incompatibilities in sorted dicts.
 2020-06-25 23:05:25 +05:00
Diana Huang
8a1fad8c12 Merge pull request #24181 from edx/diana/dashboard-courses-blocked 
DEPR-43: Remove usage of CourseRegistrationCode and blocked courses from
 2020-06-25 13:59:26 -04:00
Eric Herrera
bf945e2aec Separate tests according to the python version, due to incompatibilities in sorted dicts. 2020-06-25 11:35:21 -04:00
Awais Qureshi
e4c891edb5 Merge pull request #24312 from eduNEXT/eric/monogengine_upgrade 
[BD-6] Upgrade mongoengine
 2020-06-25 20:22:21 +05:00
Calen Pennington
d933541dad Merge pull request #24302 from cpennington/prioritize-access-denied-messages 
Prioritize access denied messages
 2020-06-25 10:15:57 -04:00
Calen Pennington
aef3a20e5d Prioritize access denials in block transformers from groups that have messages associated with them 2020-06-25 09:51:50 -04:00
julianajlk
6dd820b6e3 Add Spanish translation to Financial Assistance form without breaking zendesk (#24309) 
REV-1204 Add translation by marking string as translatable w/o translating at runtime
 2020-06-25 08:50:23 -04:00
Eric Herrera
916307df1c Update exception name due to breaking changes introduced in mongoengine 0.19.0. 2020-06-24 20:46:56 -05:00
Dillon Dumesnil
a7dff8c21e Merge pull request #24303 from edx/ddumesnil/due-dates-in-courseware-AA-44 
AA-44: Adding due dates into courseware
 2020-06-24 09:22:01 -07:00
Dillon Dumesnil
7f6a2518cb AA-44: Adding due dates into courseware 
Due dates will only display for graded subsections.
If the assignment has already been completed, there will be a pill
to indicate that. If the assignment is past due, there will be a
pill. If it is upcoming, there are no pills
 2020-06-24 08:26:52 -07:00
Diana Huang
6aa300711b Remove usage of CourseRegistrationCode and blocked courses from 
dashboard.
 2020-06-24 09:38:20 -04:00
Carla Duarte
45d277beb6 Merge pull request #24286 from edx/ciduarte/AA-186 
AA-186: Updating Course Home Course Metadata API
 2020-06-24 08:47:41 -04:00
Waheed Ahmed
ab72a9d87d Fix embargo message issues. 
PROD-1753
 2020-06-24 14:45:47 +05:00
Robert Raposa
aa3ae13ad8 Merge pull request #24301 from edx/robrap/ARCHBOM-1304-add-waffle-migrations 
ARCHBOM-1304: add migration for flags using flag_undefined_default=True
 2020-06-23 15:34:14 -04:00
Robert Raposa
9b0024376a update flags using flag_undefined_default=True 
In order to enable us to remove flag_undefined_default, this
updates flags according to alternatives documented in:
https://github.com/edx/edx-platform/blob/master/openedx/core/djangoapps/waffle_utils/docs/decisions/0001-refactor-waffle-flag-default.rst

These flags were updated with a migration:
- enable_checklists_quality
- REJECTED_EXAM_OVERRIDES_GRADE
- ENFORCE_FREEZE_GRADE_AFTER_COURSE_END
- WRITABLE_GRADEBOOK

ARCHBOM-1304
 2020-06-23 14:37:50 -04:00
Waheed Ahmed
34263bbe1e Prevent multiple submissions on contact us form. 
PROD-1565
 2020-06-23 23:33:33 +05:00
Calen Pennington
31cace3e11 Prioritize access denials in the courseware from groups that have messages associated with them 2020-06-23 14:25:57 -04:00
Robert Raposa
7bf2ea72c6 ARCHBOM-1304: remove ENABLE_VIDEO_URL_REWRITE (#24300) 
* remove ENABLE_VIDEO_URL_REWRITE

The temporary waffle flag ENABLE_VIDEO_URL_REWRITE is no
longer needed, becaues the rollout is complete.
See https://openedx.atlassian.net/browse/PROD-62

ARCHBOM-1304

* fix quality
 2020-06-23 13:56:26 -04:00
Jansen Kantor
79a76887b2 rebind events on re-render (#24288) 2020-06-23 13:56:12 -04:00
Robert Raposa
6a5d95a517 fix quality 2020-06-23 13:26:31 -04:00
Matthew Piatetsky
b3c2d37dcc Merge pull request #24214 from edx/REV-774 
[REV-774] Show content type gating upsell when a limited access learner tries to access a timed exam
 2020-06-23 11:48:31 -04:00
Robert Raposa
624012e11c remove ENABLE_VIDEO_URL_REWRITE 
The temporary waffle flag ENABLE_VIDEO_URL_REWRITE is no
longer needed, becaues the rollout is complete.
See https://openedx.atlassian.net/browse/PROD-62

ARCHBOM-1304
 2020-06-23 11:19:32 -04:00
Aarif
27480cdd2f Removed deprecated future imports 2020-06-23 18:51:43 +05:00
Daphne Li-Chen
84b08f366d AA-122 created framework for dates widget on course outline 2020-06-22 16:24:39 -04:00
Matthew Piatetsky
78317ca115 Show content type gating upsell when a limited access learner tries to access a timed exam 
Otherwise, these learners could start the timer and then be unable to take the exam once they have access to the content
REV-774
 2020-06-22 16:18:58 -04:00
Carla Duarte
f1b15b677d AA-186: Updating Course Home Course Metadata API 
Added `is_enrolled` field to check if user's enrollment is active.
 2020-06-22 15:19:24 -04:00
Jansen Kantor
5c0fd63f13 emit an event when removing users from teams via csv (#24271) 2020-06-22 14:25:05 -04:00
atesker
34171e6d6e Disallow the condition of trying to add a master's learner to a non-protected team. 2020-06-22 09:20:32 -04:00
Michael Terry
7fbe2ff6da Merge pull request #24234 from edx/mikix/instructor-dashboard-pls 
AA-184: Fix extension dashboard for self-paced courses
 2020-06-22 08:56:27 -04:00
edX Transifex Bot
4f6aad45c8 fix(i18n): update translations 2020-06-21 17:35:47 -04:00
David Ormsbee
e69a5fce56 Merge pull request #24220 from open-craft/samuel/fix-youtube-metadata-api 
SE-2634 Fix crashes in yt_video_metadata
 2020-06-19 12:24:28 -04:00
David Ormsbee
0b4cf7e06c Merge pull request #23039 from open-craft/samuel/fix-unescaped-selector 
SE-2176 Fix elem not selected if id contains special chars
 2020-06-19 12:13:20 -04:00
Michael Terry
d4506b73f4 AA-184: Fix extension dashboard for self-paced courses 
- Have it load dates from edx-when, not just write to it. This
  fixes self-paced courses where edx-when is only place dates are
  kept.
- Have it read original date for a homework from edx-when when
  resetting a date. This fixes the message it gives the instructor
  about whether it was successfully reset.
- Have it recursively set a date, rather than assuming that dates
  are only ever set on the subsection layer. This fixes setting
  dates on self-paced courses (where dates are set all the way
  down) and just in case somebody somewhere edits the course xml
  to have a date where it's not expected.
 2020-06-19 11:34:52 -04:00
Dillon Dumesnil
a1e0dcc495 Merge pull request #24241 from edx/ddumesnil/AA-194 
AA-194: Updating edx-when version
 2020-06-19 07:48:47 -07:00
Dillon Dumesnil
1f035ab420 AA-194: Updating edx-when version 
Updating edx-when version to pull in a change related to not
returning dates if the enrollment happened after course end
(if no enrollment end date is set)
 2020-06-19 07:28:12 -07:00
Leonardo Martinez
b4fee68283 Fix the DeprecationWarning for unescape (#23936) 
This PR solves the DeprecationWarning mentioned in:
https://build.testeng.edx.org/job/edx-platform-python-pipeline-master/warning_5freport_5fall_2ehtml/

HTMLParser was renamed in html.parser in Python3:
https://docs.python.org/2/library/htmlparser.html#module-HTMLParser

* html_parser.HTMLParser().unescape from six.moves has been deprecated

* instead use html.unescape from Python3

Documentation for unescape in Python3:
https://docs.python.org/3/library/html.html#html.unescape

- html_parser from six.moves has been deprecated

- instead use html.parser from Python3

- Order imports using isort

- Delete unused import crum
 2020-06-19 09:27:45 -04:00
stvn
2f7372202b Update masquerade API to show only active partitions 2020-06-18 14:54:50 -07:00