Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,726 Commits 1 Branch 0 Tags
3a804ca2d57f9d8f650afaaa26b8569ede04fdda
Commit Graph

55726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dillon Dumesnil
3a804ca2d5 Merge pull request #24955 from edx/ddumesnil/date-tab-priority-aa-322 
AA-322: Adding priority to Dates Tab order
 2020-09-10 13:23:02 -07:00
Dillon Dumesnil
87474eadf6 AA-322: Adding priority to Dates Tab order 
This also starts taking priority into account for all tabs, and
not just dynamic tabs via the CourseTabPluginManager (see comments
in the code for more detail)
 2020-09-10 15:03:32 -04:00
Alexander J Sheehan
36e2a7719d Merge pull request #24942 from edx/alex-sheehan-edx/bumping-enterprise-3.7.8 
Alex sheehan edx/bumping enterprise 3.7.8
 2020-09-10 14:06:52 -04:00
Jansen Kantor
54f6cbdec9 EDUCATOR-5312: Learners unable to create new Teams if 0 teams currently exist (#24948) 
* reproduce

* Prevent 404 for empty non-private teamset

* add another teamset to teams view tests

* don't return 404 for staff querying empty private teamset
 2020-09-10 12:34:57 -04:00
Matt Tuchfarber
a8bc8a7b4d Merge pull request #24953 from edx/tuchfarber/remove_paid_mdoes 
Remove deprecated paid_modes param in programs
 2020-09-10 11:06:21 -04:00
Matt Tuchfarber
a391344dca Remove deprecated paid_modes param in programs 
paid_modes was replaced with paid_modes_only. Now that methods using
this function are changed, we can remove the param.
 2020-09-10 10:37:30 -04:00
Feanil Patel
0113633369 Merge pull request #24818 from edly-io/zubair/BD-18-optimize-paver-settings-call 
[BD-18] Optimize paver settings call
 2020-09-10 10:19:22 -04:00
Saad Yousaf
66297177e6 Merge pull request #24843 from edx/saad/PROD-1991 
[PROD-1991] - Add mgmt command to update entitlement mode.
 2020-09-10 15:25:24 +05:00
Usama Sadiq
a14d2b4037 Merge pull request #24949 from edx/jenkins/upgrade-python-requirements-2e49117 
Python Requirements Update
 2020-09-10 15:10:05 +05:00
Uzair Rasheed
ca6bedb54f Merge pull request #24883 from edx/VAN-14/convert-api-resp 
Modify the api response
 2020-09-10 14:16:18 +05:00
uzairr
c68155f76f Modify the api response 
Update the api response so that it cannot contain the response
in the form of HTML which may prove vulnerable for MFE in future.

VAN-14
 2020-09-10 12:39:09 +05:00
edX requirements bot
0aef129715 Updating Python Requirements 2020-09-10 02:57:57 -04:00
Matt Tuchfarber
2e491172b9 Merge pull request #24922 from edx/tuchfarber/fix_var_reuse 
Fix variable reuse bug in program enrollment check
 2020-09-09 15:23:35 -04:00
dependabot[bot]
b885af54a9 Bump lodash.mergewith from 4.6.1 to 4.6.2 (#24912) 
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-09 18:57:08 +00:00
Matt Tuchfarber
3cea568719 Fix variable reuse bug in program enrollment check 
Reuse of the variable paid_modes was causing the code to follow an
incorrect path. Changed the filtering version of the variable to
paid_modes_only. Had to keep both variables temporarily until I can fix
plugin code that uses this API.
 2020-09-09 14:05:48 -04:00
Alexander Sheehan
e708379f88 bumping enterprise to 3.7.8 2020-09-09 12:36:09 -04:00
Alexander Sheehan
f8b5c36156 bumping enterprise 2020-09-09 10:10:52 -04:00
Awais Qureshi
1b62b3cb7f Merge pull request #24939 from edx/jenkins/upgrade-python-requirements-d0bd99a 
Python Requirements Update
 2020-09-09 13:09:59 +05:00
edX requirements bot
c8cd262ef9 Updating Python Requirements 2020-09-09 01:31:39 -04:00
Jansen Kantor
d0bd99a028 EDUCATOR-5240: LMS Returns 500 when requesting grade override history for a Subsection a Course Staff does not have access to (#24849) 
* recreate issue

* add success and error_message

* catch case where target block has been hidden
 2020-09-08 15:59:33 -04:00
Muhammad Soban Javed
dd8e730b5c Merge pull request #24938 from edx/revert-24855-imsobanjaved/BOM-1994 
Revert "Upgrade redis to latest version"
 2020-09-09 00:29:48 +05:00
Muhammad Soban Javed
bc52a7adac Revert "Upgrade redis to latest version" 2020-09-08 23:41:12 +05:00
edx-pipeline-bot
36245ecb8f Merge pull request #24937 from edx/private_to_public_f87e1d2 
Mergeback PR from private to public.
 2020-09-08 22:21:44 +05:00
edX Transifex Bot
06bd4e8926 fix(i18n): update translations 2020-09-08 21:30:18 +05:00
edX cache uploader bot
df4ba9c8ba Updating Bokchoy testing database cache (#24935) 2020-09-08 20:19:51 +05:00
taliaedX
728d57aac2 Merge pull request #24888 from edx/trhodes/ENT-3350 
SAML Configuration API endpoint (And Public Flag)
 2020-09-08 10:42:45 -04:00
Dillon Dumesnil
0f3644fb3c Merge pull request #24923 from edx/ddumesnil/mobile-api-fixes-AA-324 
AA-324: Mobile API fixes
 2020-09-08 07:06:06 -07:00
Muhammad Soban Javed
c9e4e65ddb Merge pull request #24855 from edx/imsobanjaved/BOM-1994 
Upgrade redis to latest version
 2020-09-08 19:01:54 +05:00
Simon Chen
ba69d9b3dc MST-406 Update the proctoring library so we can prevent learners from creating exam attempts on past due exams (#24918) 2020-09-08 09:26:54 -04:00
SaadYousaf
0a3faf08a0 add mgmt command to update entitlement mode. 2020-09-08 18:22:47 +05:00
Zainab Amir
8f83d10528 Add Mechanism to enable logistration MFE (#24908) 
Add a toggle that in conjuction with REDIRECT_TO_ACCOUNT_MICROFRONTEND
enables or disables logistration MFE.

VAN-3
 2020-09-08 17:46:50 +05:00
Ali Akbar
f87e1d26a9 Merge pull request #202 from edx/sustaining/security-fixes-5 
Sustaining/security fixes 5
 2020-09-07 08:26:51 +05:00
Ali Akbar
e63770431f Merge pull request #196 from edx/sustaining/security-fixes-4 
Sustaining/security fixes 4
 2020-09-07 08:26:40 +05:00
Dillon Dumesnil
5f1fbe6fd8 AA-324: Mobile API fixes 
This updates the Android user agent regex to accept both
Build or MIUI and for "-" and "." to be allowed in that same
part of the user agent
 2020-09-04 16:06:51 -04:00
George Babey
94abf6f94b Merge pull request #24920 from edx/gbabey/3400 
Bump edx-enterprise to 3.7.4
 2020-09-04 15:16:05 -04:00
Talia
9cbd1907ea SAML Configuration API endpoint + Public flag 2020-09-04 14:58:05 -04:00
Matt Tuchfarber
1c8d90ae4f Merge pull request #24917 from edx/tuchfarber/add_debug_messaging_programs 
Add debugging for programs enrollment
 2020-09-04 14:27:16 -04:00
George Babey
e717758a96 Bump edx-enterprise to 3.7.4 2020-09-04 14:02:58 -04:00
Felipe Montoya
ad6a625704 Merge pull request #24237 from regisb/regisb/fix-no-csmh 
Fix problem viewing when CSMH is disabled
 2020-09-04 12:37:34 -05:00
Matt Tuchfarber
f90bcabcd7 Add debugging for programs enrollment 2020-09-04 12:05:06 -04:00
edX requirements bot
a77fede84f Updating Python Requirements (#24913) 2020-09-04 10:19:15 +05:00
Aura Milena Alba
9a8e9ea962 [BD-10] [DEPR-92] Remove edx-pattern-library package. (#24631) 2020-09-03 14:01:16 -04:00
stvn
06c9edf764 Merge PR #24675 open-craft/bb-2597-remove_bypass_home 
* Commits:
  Remove course bypass_home setting and references
 2020-09-03 10:09:46 -07:00
Dillon Dumesnil
a9b6ce9feb Merge pull request #24896 from edx/ddumesnil/aa-346 
AA-346: Have dashboard show the later of enrollment and course start
 2020-09-03 10:03:31 -07:00
Dillon Dumesnil
76034047eb Merge pull request #24891 from edx/ddumesnil/fix-reset-dates-banner-aa-318 
AA-318: Update PLS CTA to use the dates_banner_should_display
 2020-09-03 10:03:21 -07:00
Kyle McCormick
b24cb48eb0 Decentralized Devstack changes: Add and push Dockerfile; add decentralized devstack settings (#24666) 
* Add and push Dockerfile; add decentralized devstack settings

Co-Authored-By: Diana Huang <dkh@edx.org>
Co-Authored-By: Kyle McCormick <kmccormick@edx.org>

* Remove Python requirements hack

Remove the attempted optimization to the installation of Python
package dependencies.  The dependencies in edx-platform change
about three times per day, so this was of dubious value.  And
because npm is run through nodeenv, which is a Python package,
the Python dependencies installation has to happen first.

* ARCHBOM-1439: Changing workdir to /edx/app/edxapp/edx-platform (#24835)

Context: The Dockerfile tries to stay in sych with legacy stuff.
In the ansible we configure the directory structure such that things
relating to the app but not in the codebase,
such as the env file wind up in /edx/app/edxapp/.
And the codebase winds up in /edx/app/edxapp/edx-platform.

I think due to accident, the dockerfile does
/edx/app/edx-platform/edx-platform instead of /edx/app/edxapp/edx-platform.

This commit tries to have Dockerfile more reflect what is currently happening in production

* Update ports for decentralized devstack ARCHBOM-1447 (#24841)

Switch from the LMS ports we've historically used for NGINX to those used for gunicorn, and fix the Studio ports to match the ones we've historically used for its gunicorn service. Also removed some leftover bits of the requirements hack.

Co-authored-by: Adam Blackwell <ablackwell@edx.org>
Co-authored-by: Diana Huang <dkh@edx.org>
Co-authored-by: jinder1s <msingh@edx.org>
Co-authored-by: Jeremy Bowman <jbowman@edx.org>
Co-authored-by: Manjinder Singh <49171515+jinder1s@users.noreply.github.com>
 2020-09-03 11:47:08 -04:00
Dillon Dumesnil
767af37d3d AA-318: Update PLS CTA to use the dates_banner_should_display 
This will make it so audit and verified learners will not see the CTA
after due dates. Previously it would only check if the xblock is
self_paced and there are still attempts and it's past due
 2020-09-03 10:50:44 -04:00
Dillon Dumesnil
7bc755adce AA-346: Have dashboard show the later of enrollment and course start 
If it is a self-paced course, the dashboard would greedily show the user's
enrollment date. However, it is often possible to enroll before the start
date which leads to a weird dashboard experience. This resolves that issue.
 2020-09-03 10:40:36 -04:00
Adam Butterworth
1757fa3610 Revert "Revert "[BD-10] [DEPR-92] Remove pattern library of pavelib folder (#24591)" (#24635)" (#24695) 
This reverts commit a463fbeca9.
 2020-09-03 09:27:41 -04:00
Alex Dusenbery
2cbfd2c568 Upgrade edx-enterprise to 3.7.3 2020-09-03 09:12:14 -04:00