Commit Graph

21652 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
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
Usman Khalid
8546fa6b6f Convert LibraryContentModule to LibraryContentBlock. (#24611) 2020-09-15 08:41:29 -04:00
Shimul Chowdhury
9aee2a5e89 Styling Update to Existing Course Content Search Page 2020-09-15 16:11:16 +06: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
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 Transifex Bot
ee2a1495ff fix(i18n): update translations 2020-09-13 17:44:38 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 Stankiewicz
d7e6e01bae Map admin feature roles to admin system role (#24897) 2020-09-02 15:45:33 -04:00
Adam Butterworth
6231bad22e Revert "Revert "[BD-10] [DEPR-92] Remove directories that includes pattern library."" (#24696) 2020-09-02 15:39:58 -04:00
Bill Currie
6edd28c73c Remove course bypass_home setting and references 2020-09-02 19:26:03 +02:00
Carla Duarte
559f7261c7 Merge pull request #24887 from edx/ciduarte/swagger-bug
Fix for Swagger error
2020-09-01 14:02:43 -04:00
Carla Duarte
11d52f154f Fix for Swagger error 2020-09-01 11:38:46 -04:00
Ali-D-Akbar
893a01f1bf PROD-1613 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
e65874c6a3 PROD-1618 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
a36904e6ee PROD-1600 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
b5cee96c56 PROD-1601 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
71322bb4fe PROD-1606 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
51577629ea PROD-1607 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
e6a080ed4d PROD-1608 2020-09-01 16:22:20 +05:00
Ali-D-Akbar
4cbccce4e2 PROD-1611 2020-09-01 16:22:20 +05:00
Michael Terry
a7ab16355a Merge pull request #24878 from edx/mikix/outline-tweaks
AA-126: Expose more course-outline info to learning MFE
2020-08-31 16:25:47 -04:00
Michael Terry
c653ac2c8a AA-126: Expose more course-outline info to learning MFE
- Use the same get_course_outline_block_tree call that the current
  outline uses
- Show number of problems in subsection display names
- Don't send links if the user is not enrolled or course isn't public
- Send subsection icons to MFE
- Send subsection descriptions to MFE
- Send completion info to MFE
2020-08-31 15:38:41 -04:00
David Ormsbee
961b71f15d Merge pull request #22446 from open-craft/agrendalath/bb-1505-fix_mobile_timer
Fix timer text wrapping on smaller screens
2020-08-31 13:24:34 -04:00
Dillon Dumesnil
315b974b82 Merge pull request #24868 from edx/ddumesnil/courseware-due-date-fixes
AA-314/AA-330: Updates to courseware due date.
2020-08-31 09:49:22 -07:00
Dillon Dumesnil
1341068d20 AA-314/AA-330: Updates to courseware due date.
This will fix a bug about if assignment type is None, we will only
show the due date.
This will also fix a bug where we would show the assignment type and
due date on non-scored units within a subsection. Now it will only
show on scored units.
This also fixes the pill that displays from stretching out if the due
date text is multi-lined.
2020-08-31 10:50:42 -04:00
Carla Duarte
4e6bff8868 Merge pull request #24819 from edx/ciduarte/AA-125
AA-125: Add Course Goals to MFE API
2020-08-31 09:28:57 -04:00
edX Transifex Bot
7a7cb2f984 fix(i18n): update translations 2020-08-30 17:48:44 -04:00
Régis Behmo
2a5a4fe2ba Fix problem viewing when CSMH is disabled
When the extended courseware module history feature is disabled
(ENABLE_CSMH_EXTENDED=false), the coursewarehistoryextended application
cannot be added to INSTALLED_APPS. Otherwise, the
StudentModuleHistoryExtended model is loaded in the project: it contains
signal receivers that automatically save objects to the student history
table. This table does not exist because the CSMH flag is disabled and
there is no student_module_history database.

So the feature flag is disabled and coursewarehistoryextended is not
part of INSTALLED_APPS: this was the default behaviour in Ironwood. To
make sure that this behaviour keeps working, we also need to make sure
that the migrations do not depend on the coursewarehistoryextended app
when the feature flag is disabled.
2020-08-29 18:06:12 +02:00
Carla Duarte
6392722e0e AA-125: Add Course Goals to MFE API 2020-08-28 10:31:59 -04:00
Agrendalath
acccc3a981 Fix exam timer text wrapping on smaller screens
This fixes wrapping the exam-text bar on smaller screens during timed exams, which prevented users from viewing the exam's content.
2020-08-28 14:56:26 +02:00
Ali Akbar
75495fd003 Merge pull request #24865 from edx/aakbar/remove-data-download-logs
Remove problem report and data download logs
2020-08-28 15:00:47 +05:00