Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
danial
ea53c3922d Fix static urls in pdf_viewer.html to correctly display pdf viewer for course text books 2019-10-31 13:57:59 +05:00
Jeremy Bowman
24cf5bbb84 Make discussion stub server URL handling deterministic BOM-994 (#22180) 2019-10-30 14:17:05 -04:00
Manjinder Singh
6f1be3ed2c BOM-933: Fix type mismatches in various migrations 6 (#22170) 
* Fix type mismatches in coursewaqre

* Fix type mismatch in credit migrations

* Fix type mismatch in status migrations

* Fix type mismatch in user_api migrations

* Review Fixes
 2019-10-29 10:36:10 -04:00
Nimisha Asthagiri
f533134db1 Merge pull request #22086 from edx/arch/user-authn-delete-deprecated 
User Authn: Remove deprecated, ENABLE_COMBINED_LOGIN_REGISTRATION
 2019-10-29 09:37:53 -04:00
Nimisha Asthagiri
db42c7e1e2 User Authn: Remove deprecated, ENABLE_COMBINED_LOGIN_REGISTRATION 2019-10-29 08:57:58 -04:00
Andytr1
122ee29a13 Merge pull request #22158 from edx/andytr1/prod-waffle-flag-for-report 
PROD-826 - add waffle flag
 2019-10-28 14:03:31 -04:00
Uzair Rasheed
a32786a184 Merge pull request #22111 from edx/PROD-769/add-warning-to-verification-card 
Add warning to the bottom of verification status card on dashboard.
 2019-10-28 13:25:56 +05:00
atesker
c007499a54 PROD-826 - Add CourseWaffleFlag that restricts the set of ProblemGradeReport enrollees to only verified learners. 
cr comments

added unit test

removed debug

style
 2019-10-27 15:23:47 -04:00
Matthew Piatetsky
9df790cca5 Merge pull request #22123 from edx/REV-728 
[REV-728] add discount percentage configuration
 2019-10-25 10:10:20 -04:00
uzairr
386e05d3b1 Add warning to the bottom of verification status card on dashboard. 
Learners are not allowed to make an attempt of the procotored exam if
they verify their identity near to proctored exam date.To make them,
aware about their expiry date, modification are done to the status card
so that user experience will be improved.

PROD-769
 2019-10-25 18:09:39 +05:00
Awais Qureshi
2cf8341189 Merge pull request #22138 from edx/awais786/BOM-968 
BOM-968
 2019-10-25 14:55:27 +05:00
Ayub
8cc509e448 Merge pull request #22107 from edx/BOM-949 
BOM-949
 2019-10-25 11:01:51 +05:00
Manjinder Singh
80c7f5af01 BOM-933: Fix type mismatches in various migrations 5 (#22147) 
* fix type mismatch in third_party_auth migrations

* fix type mismatch in verify_student  migrations

* fix type mismatch in video_config  migrations

* fix type mismatch in verified_track_content  migrations

* fix type mismatch in commercemigrations

* fix type mismatch in xblock_config migrations

* fix type mismatch in course_creators migrations

* fix type mismatch in contentstore migrations
 2019-10-24 16:08:04 -04:00
Jason Myatt
da90e2e851 Merge pull request #22131 from edx/jmyatt/enable_null_order_numbers_in_entitlements_admin 
Allow empty order numbers in django admin for Entitlements
 2019-10-24 14:21:15 -04:00
Manjinder Singh
7f3045cf75 BOM-933: Fix type mismatches in various migrations 4 (#22146) 
* fix type mismatch in course_goals  migrations

* fix type mismatch in experiments  migrations

* fix type mismatch in xblock_django  migrations

* fix type mismatch in catalog  migrations

* fix type mismatch in static_replace  migrations

* fix type mismatch in bulk_email  migrations

* fix type mismatch in course_overviews migrations
 2019-10-24 13:47:51 -04:00
Jason Myatt
c30865cce6 Allow empty order numbers in django admin for Entitlements 2019-10-24 12:52:41 -04:00
Manjinder Singh
a384e753fd BOM-933: Fix type mismatches in various migrations (#22112) 
* Fix type mismatches in the course_modes migrations

* Fix type mismatches in the course_action_state migrations

* Fix type mismatches in the schedules migrations

* Fix type mismatches in grades migrations

* Fix type mismatches in video_pipeline

* Fix type mismatches in api_admin

* Fix mismatches in credential migrations
 2019-10-24 11:42:39 -04:00
Awais Qureshi
6abaf893f1 BOM-968 
Fixing migrations.
 2019-10-24 15:21:13 +05:00
Ayub khan
897bd25b01 BOM-949 
student: Explicitly Set fields to unicode to avoid migration
 2019-10-24 13:16:57 +05:00
Manjinder Singh
a40f1d9bd6 BOM-933: Fix type mismatches in various migrations 2 (#22115) 
* Fix type mismatches in track migrations

* Fix type mismatches in oauth_dispatch

* Fix type mismatches in badges migrations

* fix type mismatch in contentserver migrations

* Fix type mismatches in mobile_api migrations

* fix type mismatch in crawlers migrations

* fix type mismatch in dark_lang migrations

* fix type mismatch in branding  migrations
 2019-10-23 13:04:36 -04:00
Matthew Piatetsky
86bb0cfa2c add discount percentage configuration 2019-10-23 12:00:34 -04:00
julianajlk
6e0914ad5d add FPD banner to courseware (#22113) 
REV-980
 2019-10-23 09:33:11 -04:00
Zia Fazal
7ccd2a6901 Refactored enterprise unlink code to fix ENT-1890 
Refactored enterprise unlink code to fix ENT-1890

Fixed quality violations and brokent test

Fixed pylint quality violations

Fixed failing unit test

Fixed broken test after rebasing with master
 2019-10-23 11:35:58 +05:00
Braden MacDonald
5fc73468b3 Change completion API to work with any learning context 2019-10-22 14:04:31 -04:00
Feanil Patel
9946fd3918 Merge pull request #22099 from edx/revert-22058-julianajlk/REV-980/first-purchase-discount-courseware 
Revert "add first purchase discount to courseware (#22058)"
 2019-10-22 09:39:08 -04:00
Feanil Patel
aa25b4a365 Merge pull request #22097 from edx/feanil/fix_sandbox_issues 
Feanil/fix sandbox issues
 2019-10-21 14:08:29 -04:00
julianajlk
98f907f23c Revert "add first purchase discount to courseware (#22058)" 
This reverts commit 059b619794.
 2019-10-21 13:57:18 -04:00
julianajlk
059b619794 add first purchase discount to courseware (#22058) 
REV-980.
* moved get_first_purchase_offer_banner_fragment to Discounts utils.py
* added banner wrapper method
* updated banner with time limit
 2019-10-21 13:56:38 -04:00
Feanil Patel
798dde2156 Fix type mismatches in the course_modes migrations. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 10:56:50 -04:00
Ned Batchelder
ea30aba6fc Revert pull request #22042 
Revert "Fix code quality test failures"

This reverts commit 8c55e11d1f.

Revert "Fix celery send_activation_email task failure"

This reverts commit 810eea0e51.

Revert "Convert Account Activation Emails to edx-ACE"

This reverts commit 7984c37a4f.
 2019-10-18 15:31:09 -04:00
Ned Batchelder
855346e9e1 Merge pull request #22042 from mahyard/activation-email-to-ace 
Activation email to ace
 2019-10-18 12:10:20 -04:00
Calen Pennington
97cc816d0b Pre-select the course overview during dashboard loading 2019-10-17 13:02:02 -04:00
Calen Pennington
7ceb0e30fa Mark course outline with graded and scored status in the DOM so that we can run optimizely code on them 2019-10-17 12:14:49 -04:00
Jeremy Bowman
e258fab1ea Fix YouTube stub under Python 3 BOM-930 (#22056) 2019-10-17 10:43:04 -04:00
Mahyar Damavand
8c55e11d1f Fix code quality test failures 2019-10-16 22:30:31 +03:30
Matthew Piatetsky
7436f9c186 Merge pull request #21915 from edx/REV-733 
[REV-733] check if discount expired
 2019-10-16 12:03:58 -04:00
Matthew Piatetsky
f6d0bf77df check if discount expired 2019-10-16 11:32:27 -04:00
Chris Pappas
0e1dba1b24 ENT-1289 | Running make upgrade to bump edx-enterprise (#22047) 2019-10-16 10:18:15 -04:00
Mahyar Damavand
810eea0e51 Fix celery send_activation_email task failure 2019-10-15 18:30:13 +03:30
Bill DeRusha
d9180b472d Merge pull request #22006 from edx/bderusha/remove-mailchimp 
remove mailchimp tracking
 2019-10-15 09:47:08 -04:00
Christie Rice
1d5fcc60bb ENT-1604 Send signal when user is verified via SSO (#21946) 2019-10-15 08:18:54 -04:00
Shadi Naif
7984c37a4f Convert Account Activation Emails to edx-ACE 2019-10-14 17:22:03 +03:30
Bill DeRusha
5a6b51bccf remove mailchimp tracking 2019-10-11 15:38:05 -04:00
Awais Qureshi
c446964721 BOM-916 
Fixed double decoding issue.
Fixed the mock.assertMethod. Dict keys were coming different order.
 2019-10-11 18:24:28 +05:00
Jeremy Bowman
9c92bd96ed Fix assertions failing under Python 3 BOM-668 (#21978) 2019-10-10 15:22:07 -04:00
jinder1s
eceb53c688 encoding str and opening file in rb mode 2019-10-09 16:48:51 -04:00
Manjinder Singh
b8495dd6b7 Merge pull request #21793 from edx/msingh/test_requirejs_path_overrides_fix 
BOM-614: AssertionError: Lists differ Fix 2 and 3
 2019-10-09 11:34:59 -04:00
jinder1s
feb3e5f0a5 calling assertCountEqual 2019-10-09 10:58:23 -04:00
Manjinder Singh
a315317315 Merge branch 'master' into msingh/python3_test_lti_stub_py 2019-10-09 08:51:15 -04:00
jinder1s
d025657942 review fixes 2019-10-09 08:49:25 -04:00