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

20648 Commits

Author SHA1 Message Date
Jansen Kantor
0e0b488fb5 EDUCATOR-4876: Correctly handle 'None' as a valid max_team_size (#23038) 
add default max team sizes, change ui to not show max for managed teams
 2020-02-18 16:44:20 -05:00
Dillon Dumesnil
39a59cbe33 Merge pull request #23133 from edx/ddumesnil/relevant-dates-AA-4 
Adding in try block for getting item from modulestore
 2020-02-18 15:57:40 -05:00
Dillon Dumesnil
a7a84ce9ab Adding in try block for getting item from modulestore 
This also includes updating the test to actually test for this use case

AA-4
 2020-02-18 15:23:38 -05:00
Manjinder Singh
d7bd80a100 Renamed OAuth2Authentication to BearerAuthentication (#23128) 
* Renamed OAuth2Authentication to BearerAuthentication
* Added back OAuth2Authentication name
-there are libraries such as edx-enterprise that still import OAuth2Authentication.  The OAuth2Authentication class should be fully removed when everything is importing BearerAuthentication correctly
 2020-02-18 13:29:29 -05:00
Dillon Dumesnil
be7ef9804d AA-4: Adding waffle flag for dates widget 2020-02-18 11:20:32 -05:00
Dillon Dumesnil
5853cddfc1 AA-4: Extreme defensiveness over any fields accessed from modulestore 2020-02-18 08:43:45 -05:00
Dillon Dumesnil
fe91d63a0b Show relevant dates in course dates sidebar 
This includes (at least) upcoming assignments, FBE access
expiration, and course end date.

AA-4
 2020-02-18 08:42:15 -05:00
zia.fazal@arbisoft.com
6129f26ef4 Pull LEARNER_PORTAL_URL_ROOT from environment tokens 2020-02-17 18:53:09 +05:00
Ahtisham Shahid
60ad8c8813 Merge pull request #22989 from edx/ahtisham/PROD-452 
Fixed staff debug in instructor tab
 2020-02-17 18:15:18 +05:00
Manjinder Singh
a18d936d46 Revert "Adding new settings to correct places (#23051)" (#23112) 
This reverts commit f08185443e.
 2020-02-14 13:14:18 -05:00
Nathan Sprenkle
c66176da13 Add error reporting to UI for CSV team management (#23035) 
* Add error banner for upload memberships errors

* Edit error message language

* Fix linter warnings
 2020-02-14 09:58:58 -05:00
Christie Rice
8fb4049c62 Remove flaky test (#23075) 2020-02-14 09:05:45 -05:00
Zia Fazal
352318738a Merge pull request #23099 from edx/ziafazal/ENT-2626 
ENT-2626: Stop hitting enterprise API in case of 404 error
 2020-02-14 16:37:16 +05:00
adeel khan
2cae703496 Merge pull request #23073 from edx/adeel/prod_1243_hide_mobile_course_available 
Using DISABLE_MOBILE_COURSE_AVAILABLE flag to disable mobile course available settings
 2020-02-14 15:26:05 +05:00
zia.fazal@arbisoft.com
2453bc8c05 Stop showing hitting enterprise API in case of 404 error 
Stop showing hitting enterprise API when request is originated as result of 404 error.

fixed quality violations

Removed line break

add unit tests

Updated test docstring
 2020-02-14 15:16:51 +05:00
Uzair Rasheed
eab4e632ab Merge pull request #23105 from edx/PROD-1034/justify-text-to-improve-usablity 
Justify the course banner text to improve usablity
 2020-02-14 14:46:57 +05:00
Ahtisham Shahid
19137e2737 Fixed staff debug on instructor page 
added unit test js

fixed test js

updated test commetn

updated xss
 2020-02-14 12:20:14 +05:00
Jansen Kantor
cec654f753 two csv upload team-creation bugs (#23036) 
fix csv-upload bugs
 2020-02-13 17:16:00 -05:00
Adeel Khan
d8fb768684 Using Feature flag to disable Mobile Course Available UI 
This patch would disable Mobile Course Available
UI field in studio's advanced settings based on
DISABLE_MOBILE_COURSE_AVAILABLE flag..

PROD-1243
 2020-02-13 19:49:09 +05:00
uzairr
55f87d2ee5 Justify the course banner text to improve usablity 
Course banner text is justified from both sides which is creating
extra spaces between the text ultimately impacting on usability.
To improve it, its alignment is modified and now it is no longer
affecting usability.

PROD-1034
 2020-02-13 17:25:35 +05:00
adeelehsan
e18747a2e0 MicroMaster added in contact us form 
PROD-1229
 2020-02-13 00:06:00 +05:00
adeelehsan
47393b5f7e Merge pull request #23089 from edx/aehsan/prod-1229/changed_microbachelors_to_micro 
MicroBachelor changed to Micro
 2020-02-12 22:59:40 +05:00
Jeremy Bowman
e1d1c29c00 Fix DRF deprecation warnings (#23082) 
Fix all deprecation warnings generated by Django REST Framework during the unit tests:

* ``The `base_name` argument is pending deprecation in favor of `basename`.`` (86 occurrences)
* `` `detail_route` is deprecated and will be removed in 3.10 in favor of `action`, which accepts a `detail` bool. Use `@action(detail=True)` instead.`` (18 occurrences)
 2020-02-12 12:51:40 -05:00
adeelehsan
a41f992e10 MicroBachelor changed to Micro 
PROD-1229
 2020-02-12 15:27:25 +05:00
Manjinder Singh
cce8cdd661 Replacing OAuth2Auth (#23067) 
- Removing deprecated auth classes
- Replacing OAuth2AuthenticationAllowInactiveUserDeprecated with OAuth2AuthenticationAllowInactiveUser
- the old class was a child class of a deprecated class that we are removing and replacing.
 2020-02-11 10:38:13 -05:00
adeelehsan
da23496535 Merge pull request #23071 from edx/aehsan/prod-1188/monog_socket_timeout_increased 
Mongo socket timeout increased.
 2020-02-11 19:58:00 +05:00
Christie Rice
1167ce74c8 MICROBA-149 Create external user id tables (#23064) 
* MICROBA-149 Create user id tables

* Move to openedx

* Rename app in doc

* Update PII tag

* Update doc
 2020-02-11 08:17:28 -05:00
adeelehsan
374ecba38c Mongo socket timeout increased 
prod-1188
 2020-02-11 15:42:37 +05:00
Ayub-khan
d3a02bc3e5 BOM-1121 
-Updated middleware setting to use use middleware insted of
middleware_classes
-github install of django-method-override fork to support
new style middleware in django1.11
 2020-02-11 14:35:26 +05:00
Adam Butterworth
53c1d2a0da Hide display titles for vertical blocks embedded in microfrontends (#23006) 
Relates to TNL-7048. Since bookmarking is handled in the courseware microfrontend, it needs to also manage the display of a unit title.
 2020-02-10 13:32:08 -05:00
Dillon Dumesnil
b4fed7c2a4 Merge pull request #23063 from edx/ddumesnil/revert-AA-4 
Revert commits for AA-4
 2020-02-10 13:11:19 -05:00
Dillon Dumesnil
00fe1495b4 Revert commits for AA-4 2020-02-10 12:10:59 -05:00
Feanil Patel
4422fb36cf Merge pull request #23037 from edx/feanil/bom-939 
BOM-939 Update pickle procotol version.
 2020-02-10 11:36:20 -05:00
Manjinder Singh
f08185443e Adding new settings to correct places (#23051) 
These settings are used to toggle new authentication class in discussion and bookmarks app. The auth class is in openedx/core/lib/api/authentication.py and was added to replace deprecated OAuth2Authentication class in [rest_framework_oauth library](https://github.com/jpadilla/django-rest-framework-oauth)
 2020-02-10 10:17:31 -05:00
Dillon Dumesnil
9b9c261c77 Merge pull request #23058 from edx/ddumesnil/relevant-dates-AA-4 
AA-4: Be more defensive about not finding an item in modulestore
 2020-02-10 09:36:50 -05:00
Hasnain Naveed
535869ff15 Merge pull request #22790 from edx/hasnain-naveed/ENT-2511 
ENT-2511 | Disabled the admin panel's login page.
 2020-02-10 18:23:53 +05:00
Alan Zarembok
804e1c3b8e Merge pull request #23034 from edx/azarembok/cert-url 
PROD-1236: Change URL returned for generated certificates to use UUID.
 2020-02-10 08:18:12 -05:00
Dillon Dumesnil
7b68869a14 AA-4: Be more defensive about not finding an item in modulestore 2020-02-10 08:03:16 -05:00
Zia Fazal
26891841e4 Merge pull request #22987 from edx/ziafazal/ENT-2269 
ENT-2269: Added ability to logout from IDP when logout flow is triggered from learner portal
 2020-02-10 12:53:41 +05:00
DawoudSheraz
0b1c7db967 add multiple correct values check for Dropdown problems 2020-02-10 11:36:28 +05:00
Dillon Dumesnil
2e71793ba5 Merge pull request #23044 from edx/ddumesnil/relevant-dates-AA-4 
AA-4: CSS updates in date widget
 2020-02-08 13:49:00 -05:00
Dillon Dumesnil
490e93635f AA-4: CSS updates in date widget 2020-02-07 11:53:23 -05:00
Dillon Dumesnil
7444980fbd Merge pull request #22911 from edx/ddumesnil/relevant-dates-AA-4 
Show relevant dates in course dates sidebar
 2020-02-07 10:27:43 -05:00
Alan Zarembok
70955119f1 PROD-1236: Change URL returned for generated certificates to use UUID, for consistency across api calls. 2020-02-07 10:19:55 -05:00
zia.fazal@arbisoft.com
d7ed021b8d Added ability to logout from IDP 
Logout link should be displayed only for learner portal

Added changed to display only for learner portal
Added unit tests

check third_party_auth is enabled

Changes to extend SSO logout link feature to Oauth providers

Fixed quality violations

Removed unncessary assert

Reviewer feedback changes
 2020-02-07 19:38:36 +05:00
Muhammad Soban Javed
6dfcddd6d8 Merge pull request #23030 from edx/BOM-1251 
Fixing deprecated django-filter features
 2020-02-07 18:45:30 +05:00
Feanil Patel
1cb5e63246 Rename the serializer to better match its purpose. 2020-02-06 17:05:21 -05:00
Dillon Dumesnil
23486a560d Show relevant dates in course dates sidebar 
This includes (at least) upcoming assignments, FBE access
expiration, and course end date.

AA-4
 2020-02-06 16:01:46 -05:00
Jansen Kantor
d4d6b33272 EDUCATOR-4879: Implement teams CSV GET endpoint (#23005) 
* wip

* get

* quality

* change oauth2 to deprecated?

* quality

* remove duplicate enrollment check function

* code review
 2020-02-06 15:06:23 -05:00
Diana Huang
8c41447484 Merge pull request #23026 from edx/diana/shut-oauth-dispatch 
Add toggle to remove access to DOP code paths.
 2020-02-06 13:42:00 -05:00