Commit Graph

55757 Commits

Author SHA1 Message Date
stvn
e7fbb3d933 Merge PR #24749 open-craft/shimulch/styling-update-to-existing-course-content-search-page
* Commits:
  Styling Update to Existing Course Content Search Page
2020-09-15 10:10:07 -07:00
Jeff Chaves
d8c9a8f984 bumping enterprise version (#24984) 2020-09-15 12:49:10 -04:00
Feanil Patel
d264490fb7 Merge pull request #24952 from regisb/regisb/simplify-waffle-module-name
[BD-21] Simplify hack to obtain waffle module names
2020-09-15 11:19:43 -04:00
Jeff Chaves
13427973b5 bumping enterprise version to 3.8.5 (#24981) 2020-09-15 10:56:28 -04:00
Usman Khalid
8546fa6b6f Convert LibraryContentModule to LibraryContentBlock. (#24611) 2020-09-15 08:41:29 -04:00
edX cache uploader bot
5429f8510f Updating Bokchoy testing database cache (#24980) 2020-09-15 17:11:16 +05:00
Muhammad Ammar
83cf24c7fe Merge pull request #24977 from edx/ammar/upgrade-edx-enterprise
upgrade edx-enterprise
2020-09-15 16:23:44 +05:00
Shimul Chowdhury
9aee2a5e89 Styling Update to Existing Course Content Search Page 2020-09-15 16:11:16 +06:00
edX requirements bot
9363755aad Updating Python Requirements (#24979) 2020-09-15 13:19:41 +05:00
muhammad-ammar
7449589e6f upgrade edx-enterprise
ENT-3328
2020-09-14 23:07:26 +05:00
Mike OConnell
11e4cab622 Added remote IP to logging (#24932)
* Add remote IP to logging config

Add a new filter to get the remote IP for the current
request and include it in log statements

SEG-34

* Added line for formatting

Added line for formatting

SEG-34
2020-09-14 11:22:11 -04:00
Thomas Tracy
0151b80ab7 A modal used to collect demographics information (#24956)
* A modal used to collect demographics information

Add checkmark to final page (#24957)

Remove themeing to get ready for staging

MICROBA-574 | Dismiss CTA after learner finishes answering modal questions (#24965)

[MICROBA-574]
- Dismiss CTA after learner finishes answering demographics questions
- Cleanup comments

* Various initial bugfixes

- fixes 2 issues with the multiselect dropdown erasing state
- prevents input higher than 255 characters in the self describe
- fixes 400 errors when the user selects a default option
- Removes additional page count section

- Re-adding deleted JS file. Can't clean this up until after we cutover to using the new Demographics modal

* Add translatable string to clear button

* Remove extra page counter from the header for the third time

* Remove unneeded template context

Co-authored-by: Matt Tuchfarber <mtuchfarber@edx.org>
Co-authored-by: Justin Hynes <jhynes@edx.org>
2020-09-14 09:28:06 -04:00
Usama Sadiq
7bfd98c037 Merge pull request #24974 from edx/jenkins/upgrade-python-requirements-ee2a149
Python Requirements Update
2020-09-14 12:51:15 +05:00
Régis Behmo
307457a255 Simplify hack to obtain waffle module names
Instead of going up the stacktrace to find the module names of waffle
flags and switches, we manually pass the module __name__ whenever the
flag is created. This is similar to `logging.getLogger(__name__)`
standard behaviour.

As the waffle classes are used outside of edx-platform, we make the new
module_name argument an optional keyword argument. This will change once
we pull waffle_utils outside of edx-platform.

Note that the module name is normally only required to view the list of
existing waffle flags and switches. The module name should not be
necessary to verify if a flag is enabled. Thus, maybe it would make
sense to create a `add` class methor similar to:

    class WaffleFlag:
        @classmethod
        def add(cls, namespace, flag, module):
            instance = cls(namespace, flag)
            cls._class_instances.add((instance, module))
2020-09-14 09:30:24 +02:00
edX requirements bot
6cf35d7e70 Updating Python Requirements 2020-09-14 02:35:53 -04:00
edX Transifex Bot
ee2a1495ff fix(i18n): update translations 2020-09-13 17:44:38 -04:00
Jeff Chaves
a7d4425ca3 bumping enterprise version (#24971) 2020-09-11 15:27:18 -04:00
Binod Pant
0a6b2b9ded upgrade to 3.8.1 (#24969) 2020-09-11 14:56:13 -04:00
Syed Muhammad Dawoud Sheraz Ali
1d9c7e9168 Merge pull request #24867 from open-craft/kshitij/remove-report-path
[BB-2967] Remove report path from task output data
2020-09-11 21:02:59 +05:00
Troy Sankey
ef7ec74a49 Merge pull request #24946 from edx/pwnage101/DENG-379-no-crash-on-missing-themes-dir
Changes that enable the modernization of Analytics Exporter
2020-09-11 11:14:29 -04:00
Michael Terry
e4b75af4db Merge pull request #24963 from fghaas/doc-enable-learner-records
Fix documentation for ENABLE_LEARNER_RECORDS
2020-09-11 09:20:16 -04:00
Kshitij Sobti
9adeeb0056 Remove report path from task output data
Use alternative method for getting report download link
2020-09-11 14:12:28 +02:00
Florian Haas
125b502c79 Fix documentation for ENABLE_LEARNER_RECORDS
Commit 3222d3fd13 (LEARNER-5987)
introduced the ENABLE_LEARNER_RECORDS site configuration flag, but
incorrectly referred to it as ENABLE_CREDENTIALS_RECORDS in the
documentation for the credentials service.

Fix the reference with the correct flag name.
2020-09-11 14:12:18 +02:00
Usama Sadiq
8008715204 Merge pull request #24961 from edx/testeng/bokchoy_auto_cache_update_58e6d08fc9e1f674bc451dad626a3449b2049dd4
Bokchoy Testing DB Cache update
2020-09-11 12:07:07 +05:00
Usama Sadiq
f843f9ab5c Merge pull request #24962 from edx/jenkins/upgrade-python-requirements-9ebfd40
Python Requirements Update
2020-09-11 12:03:01 +05:00
edX requirements bot
3a8fe6f597 Updating Python Requirements 2020-09-11 01:39:15 -04:00
Troy Sankey
fce015e08c Create new analytics_exporter.py settings
These new settings files are intended to be used by the Analytics
Exporter automation managed by the DE team.  The Analytics Exporter must
be able to simply clone edx-platform, install requirements, fetch
remote-config, then just run management commands without needing to run
any ansible or pull down any docker/AMI images.  Since the theming app
includes a check that fails if the themes base dir cannot be found, and
that check runs on app startup, we must disable the app.

DENG-379
2020-09-10 21:21:47 -04:00
Troy Sankey
26276c796d export_olx management command: write bytes to stdout correctly
This must have been broken ever since we upgraded from Python 2 to 3.

DENG-379
2020-09-10 21:17:17 -04:00
Troy Sankey
e8ea73c652 Do not crash unexpectedly when looking for a file.
This function to search for themes dirs needs to be able to recover
gracefully if the base dirs do not exist.  This is NOT the app check,
it's just a themes collector---the app check will *properly* report an
error if the base dir does not exist.

DENG-379
2020-09-10 21:17:18 -04:00
edX cache uploader bot
6ce0cdf2b9 Updating Bokchoy testing database cache 2020-09-10 18:33:59 -04:00
Adam Stankiewicz
9ebfd405ef bump edx-enterprise to 3.8.0 (#24959) 2020-09-10 18:29:06 -04:00
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