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

53207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Millan
2dd128bce0 Setting template to show currency defined in the course mode DB record 2020-02-17 11:45:50 -04:00
Ahtisham Shahid
04421b648e Merge pull request #23041 from edx/ahtisham/PROD-920 
Video Transcripts setting not preserved
 2020-02-17 13:58:15 +05:00
Ahtisham Shahid
728f7d2c71 Updated Trascript functionality 
removed extras

fixed initial state of transcript

Fixed js tests

fixed js tests

created and fixed tests

Updated Trascript functionality

updated v name

fixed spacing
 2020-02-17 11:48:28 +05:00
edX Transifex Bot
2d65e864e4 fix(i18n): update translations 2020-02-16 16:26:20 -05:00
Robert Raposa
6b55961499 Merge pull request #23115 from edx/robrap/update-auth-docs-2 
update auth docs
 2020-02-14 16:36:01 -05:00
Diana Huang
10aabf9072 Merge pull request #23113 from edx/diana/unpin-search 
Unpin edx-search and update to latest version.
 2020-02-14 14:14:05 -05:00
Diana Huang
59bb5fddd1 Unpin edx-search and update to latest version. 
https://openedx.atlassian.net/browse/BOM-1036
 2020-02-14 13:43:50 -05:00
Robert Raposa
0a64e11db7 update auth docs 
1. clarify asymmetric jwt decision.
2. move relevant auth docs to edx-drf-extensions and
edx-rest-api-client.
 2020-02-14 13:26:35 -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
Robert Raposa
d8c3cfe278 Merge pull request #23106 from edx/robrap/update-auth-docs 
remove hard line breaks
 2020-02-14 11:48:11 -05:00
Dave St.Germain
d01563de6d Merge pull request #23007 from edx/dcs/unauth-api 
Allow anonymous access to courseware API
 2020-02-14 11:30:56 -05:00
Tim McCormack
ceff4ff3c3 Merge pull request #23110 from edx/jenkins/upgrade-python-requirements-2cae703 
Python Requirements Update
 2020-02-14 16:18:03 +00:00
Dave St.Germain
9da8ff0f0b Allow anonymous access to courseware API, and return error message if user is unenrolled. 2020-02-14 11:03:15 -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
edX requirements bot
876b3cae42 Updating Python Requirements 2020-02-14 05:55:05 -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
Jansen Kantor
cec654f753 two csv upload team-creation bugs (#23036) 
fix csv-upload bugs
 2020-02-13 17:16:00 -05:00
edX requirements bot
61154f5dbc Python Requirements Update (#23103) 
* Updating Python Requirements

* Constrain edx-when version for now
 2020-02-13 15:22:01 -05:00
Kyle McCormick
bac070e8af fixup! fixup! Handle next and course_id in /login_ajax 
nvm, just skip_unless_lms
 2020-02-13 12:24:51 -05:00
Kyle McCormick
0875ede96f fixup! Handle next and course_id in /login_ajax 
fix test_login_success_with_redirect in studio
 2020-02-13 12:24:51 -05:00
Kyle McCormick
234eedd8c6 Handle next and course_id in /login_ajax 
Currently, the /login_ajax endpoint does not regard
any `next` or `course_id` parameters. This commit changes
that, sharing the logic that /login (which the current
templated login page uses) employs to cacluate
a redirect-after-login URL based on `next` and `course_id`.

The new functionality is behind ENABLE_LOGIN_MICROFRONTEND.
 2020-02-13 12:24:51 -05:00
Robert Raposa
1718cc91ba remove hard line breaks 2020-02-13 10:16:33 -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
edx-pipeline-bot
9d81f2a320 Merge pull request #23101 from edx/private_to_public_eaaebc6 
Mergeback PR from private to public.
 2020-02-13 04:40:20 -05:00
Awais Jibran
eaaebc6d93 Merge pull request #169 from edx/aj/sec-fix-capa 
SECURITY FIX : Fix CAPA Problems
 2020-02-13 13:52:29 +05:00
adeelehsan
49be02a052 Merge pull request #23096 from edx/aehsan/prod-1229/add_micromaster_to_contact_form 
MicroMaster added in contact us form
 2020-02-13 01:32:16 +05:00
adeelehsan
e18747a2e0 MicroMaster added in contact us form 
PROD-1229
 2020-02-13 00:06:00 +05:00
Calen Pennington
829aa23db3 Merge pull request #23091 from cpennington/replace-coverage-contexts-during-upload 
Replace old coverage context files when uploading
 2020-02-12 13:00:46 -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
Calen Pennington
06d0d9f3e1 Merge pull request #23086 from edx/nedbat/relative_coverage_files 
Use relative_files setting for coverage
 2020-02-12 11:43:19 -05:00
Calen Pennington
646cf1ed12 Replace old coverage context files when uploading 2020-02-12 11:29:32 -05:00
Calen Pennington
0031d07b86 Merge pull request #23085 from cpennington/upload-coverage-content 
Pipe COLLECT_WHO_TESTS_WHAT through to jenkins-report.sh so that we u…
 2020-02-12 10:09:17 -05:00
Saad Yousaf
6875ef3449 Merge pull request #23055 from edx/saad/PROD-1250 
Studio export/import bug with problems having more than one pre-tag in problem.
 2020-02-12 16:17:20 +05:00
adeelehsan
a41f992e10 MicroBachelor changed to Micro 
PROD-1229
 2020-02-12 15:27:25 +05:00
adeel khan
4bf736c854 Merge pull request #23078 from edx/adeel/prod_960_fixing_translations_failure 
Removing paver command
 2020-02-12 12:15:38 +05:00
edX cache uploader bot
2a1a936238 Updating Bokchoy testing database cache (#23081) 
Bokchoy testing database update
 2020-02-11 15:39:23 -05:00
Ned Batchelder
fbe8128360 Use relative_files setting for coverage 
This should make it easier to measure coverage in one place (Travis) and
work with it in another (devstack).
 2020-02-11 15:21:04 -05:00
Calen Pennington
ef80230700 Pipe COLLECT_WHO_TESTS_WHAT through to jenkins-report.sh so that we upload coverage contexts nightly 2020-02-11 15:04:00 -05:00
Manjinder Singh
def4d6e498 Updated edx-organization version (#23080) 2020-02-11 13:52:13 -05:00
Adeel Khan
5dae91bdf8 Removing paver command 
This is not needed in Makefile as
all the logic and invocation of
compilejs would be done via
ecommerce-script repo.

PROD-960
 2020-02-11 23:24:39 +05:00
Diana Huang
f6f77d19ba Merge pull request #23022 from edx/diana/remove-tracking-log-backend 
Drop tracking log table.
 2020-02-11 11:42:59 -05:00
Manjinder Singh
03a3c201cb Moved hooks around (#23077) 
This change only implements pytest hooks when we know pytest_json_report plugin has
been loaded. Previously, the hooks were being loaded before plugin, thus causing errors
cause(pytest_sessionfinish needs the plugin to function).
 2020-02-11 10:38:36 -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