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

19868 Commits

Author SHA1 Message Date
Diana Huang
c9323abd0e Move password reset logic and code to user_authn. 2019-11-05 10:03:22 -05:00
edX cache uploader bot
c7eece3cbb Updating Bokchoy testing database cache (#22234) 2019-11-04 15:22:36 -05:00
Matthew Piatetsky
6eb5466ee5 Merge pull request #22198 from edx/REV-693 
[REV-693] Create table to keep track of FBE holdback experiment enrollments
 2019-11-04 14:40:26 -05:00
julianajlk
afae1f1d2a a11y: add role to FPD banner (#22225) 
REV-705
 2019-11-04 10:46:53 -05:00
Manjinder Singh
cb186d94d3 Fixing test by using six.assertCountEqual (#22219) 
* using six.assertCountEqual

* Fix type mismatches in css migrations
 2019-11-04 09:29:32 -05:00
Hasnain Naveed
6820b20059 Merge pull request #22207 from edx/hasnain-naveed/ENT-2437 
ENT-2437 | get_enterprise_customer_for_learner method replaced with e…
 2019-11-04 15:45:26 +05:00
Nimisha Asthagiri
1bcaa945d9 Merge pull request #22216 from edx/diana/registration-form-factory-move 
Move RegistrationFormFactory from user_api to user_authn
 2019-11-02 17:57:59 -04:00
Diana Huang
d65447998c Move RegistrationFormFactory from user_api to user_authn. 
And get_registration_extension_form.
 2019-11-01 14:49:12 -04:00
Matthew Piatetsky
8d8626ca1f address comments 2019-11-01 13:41:01 -04:00
Feanil Patel
e8b5d82e45 Revert "Fix static urls in pdf_viewer.html to correctly display PDF viewer for textbooks" 2019-11-01 11:48:46 -04:00
Awais Qureshi
d3e57f1d36 Merge pull request #22209 from edx/awais786/BOM-998 
BOM-998
 2019-11-01 19:31:38 +05:00
hasnain-naveed
4b827d5be0 ENT-2437 | get_enterprise_customer_for_learner method replaced with enterprise_customer_for_request. 2019-11-01 17:19:56 +05:00
Nimisha Asthagiri
748398e57a Merge pull request #22173 from edx/diana/logistration-refactor 
Move RegistrationView from user_api to user_authn
 2019-11-01 08:13:39 -04:00
Diana Huang
e026006f9a Move RegistrationView from user_api to user_authn. 2019-11-01 07:41:48 -04:00
Awais Qureshi
076a2b5a7e BOM-998 
Fixing decoding issue.
Fixing flaky unit test.
 2019-11-01 15:54:23 +05:00
Awais Jibran
d891ae5522 Merge pull request #22192 from edx/aj/improve-logging-capa 
Add error in logging
 2019-11-01 11:25:28 +05:00
Matthew Piatetsky
c2774083ea create table that excludes enrollments from FBE 2019-10-31 16:30:52 -04:00
Ned Batchelder
b9563acaac Merge pull request #19441 from danialmalik/pdf_viewer_static_url_fix 
Fix static urls in pdf_viewer.html to correctly display PDF viewer for textbooks
 2019-10-31 15:46:45 -04:00
Jeremy Bowman
a6b8cbe627 Remove obsolete field type BOM-996 (#22203) 2019-10-31 15:23:58 -04:00
Awais Jibran
5e11708e11 Adding ContextualizeTextError. 2019-10-31 23:37:20 +05:00
Feanil Patel
9f9d904592 Update code to use the new rounding method. 
See the commit that added round_away_from_zero for details.

IN the case of dashboard_data.py:

We don't first cast to decimal here because in python 2 this didn't do
anything.  The python 2 rounding method would just cast things to float
before doing the rounding anyway so it just wastes cpu cycles.  In
python 3 this causes some typing issues so just removing it.
 2019-10-31 14:29:57 -04:00
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
Awais Jibran
cb2a24711e Add error in logging 2019-10-31 09:48:58 +05:00
edX Transifex Bot
6c0ede859e geoip2: update maxmind geolite country database 2019-10-30 17:03:31 -04:00
edX cache uploader bot
0b47380680 Updating Bokchoy testing database cache (#22186) 2019-10-30 14:25:44 -04:00
Jeremy Bowman
24cf5bbb84 Make discussion stub server URL handling deterministic BOM-994 (#22180) 2019-10-30 14:17:05 -04:00
Awais Jibran
38f296fa93 Merge pull request #22182 from edx/aj/improve-logging-capa 
Improve logging when a CAPA problem fails to display HTML
 2019-10-30 14:54:26 +05:00
Awais Jibran
c0a26e932d Improve logging when a CAPA problem fails to display HTML 2019-10-30 14:23:50 +05:00
Awais Jibran
3ee5969f73 fixed language issue and added test #2 2019-10-30 14:02:50 +05:00
Awais Jibran
a27bd563b4 Merge pull request #22102 from edx/as/bug/tinymce-add-image 
JavaScript Error when inserting second image in Studio
 2019-10-30 12:59:56 +05:00
Awais Jibran
222c74e855 JavaScript Error when inserting second image in Studio 2019-10-30 12:21:40 +05:00
Kyle McCormick
3858036a4e Expand and refactor teams configuration on course. (#22168) 
Wrap CourseModule.teams_configuration in TeamsConfig
class, centralizing parsing, validation, error handling,
etc. Wrapped object is exposed on 'teams_conf' field.

Old code still uses 'teams_configuration' dict;
we should change this in the future (MST-18).

MST-16
 2019-10-29 16:10:19 -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
Awais Qureshi
c3733d05e0 Merge pull request #22154 from edx/awais786/BOM-995 
BOM-995
 2019-10-28 11:40:40 +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
Awais Qureshi
2760d401c7 BOM-995 
Fixing acceptance test.
 2019-10-26 15:05:33 +05:00
Aarif
4285d265b8 Merge pull request #22128 from edx/BOM-992 
changes made to sanitize the urls for consistent comparison - BOM-992
 2019-10-25 23:20:25 +05:00
edX cache uploader bot
468b4771d4 Updating Bokchoy testing database cache (#22157) 2019-10-25 10:48:10 -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
aarif
45338f4160 changes made to sanitize the urls for consistent comparison 
changes made to finalize the url sanitization to make url comparison consistent

changes made to avoid running sanitize in python 2

changes made to substitute proper query param in url for comparison

changes made to split and compare the query parameter with expected url

updated the split logic to properly split/slice url parts for comparison

updated the dashboard template to remove encode and avoid bytes encoded embeded url

updated the dashboard template to enclose social media urls with unicode
 2019-10-25 15:20:32 +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
edX cache uploader bot
2ccbeda27d Updating Bokchoy testing database cache (#22148) 2019-10-24 15:05:24 -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