Commit Graph

534 Commits

Author SHA1 Message Date
Julia Hansbrough
0b7594178b Moved reverification windows into common
Added verification sidebar, banner for major courseware sections, quality & test improvements
2014-01-31 22:08:08 +00:00
davestgermain
5122c292c7 Merge pull request #2343 from edx/dstgermain/a11y-page-titles
Added more descriptive page titles.
2014-01-30 14:33:48 -08:00
Dave St.Germain
636eab8b9e Added more descriptive page titles. 2014-01-30 17:32:03 -05:00
Chris Dodge
0d49305c4d add ability to have an optional password policy enforcement on account creation 2014-01-30 15:32:05 -05:00
Chris Dodge
8c60f2935a Add optional feature to lock out accounts after N failed login attempts. Lockouts will last M seconds.
add DB migration and fix earlier mistakes in student migration history

add tests and fix bugs that came out of those unit tests

remove unused import

pep8/pylint

address some PR feedback

fix tests

fix broken test

try to mock time

use freeze-gun to overload the system time to simulate the future
2014-01-29 16:54:28 -05:00
Calen Pennington
ce19f2887c Merge pull request #2294 from cpennington/language-dark-launch
Add the ability to dark-launch languages
2014-01-29 10:52:06 -08:00
Calen Pennington
271fbdb40a Switch dark_lang to database backed configuration 2014-01-29 13:24:41 -05:00
Calen Pennington
d379b35fa9 Add config_model, a library for database backed configuration
ConfigurationModels can be managed using the admin site. They are
append-only, and track the user who is making the change, and the time
that the change was made. The configuration is stored in the database,
and cached for performance.

[LMS-1220]
2014-01-29 09:17:19 -05:00
Calen Pennington
881e3ba564 Add the ability to dark-launch languages
To mark a language as dark-launched, add it to the DARK_LANGUAGES
django conf setting. To activate a dark-launched language, set he
query parameter `preview-lang` to the language code on any url.

[LMS-2045]
[LMS-2077]
[LMS-2076]
2014-01-29 09:16:16 -05:00
Xavier Antoviaque
386115aecf Selectively require/hide registration fields & add country/city fields
Extend the capabilities of the REGISTRATION_OPTIONAL_FIELDS
configuration variable, to allow to select, for each individual field,
if it should be 'hidden', 'optional' or 'required'.

Rename the configuration variable to REGISTRATION_EXTRA_FIELDS to reflect
the additional capabilities, and updates the defaults.

As extra fields, configurable through the REGISTRATION_EXTRA_FIELDS
variable. Hidden by default.

Tickets: MCKIN-168 MCKIN-184

Note: Studio also has a registration page, which uses the same account
creation page. It should be possible to use it without requiring the
variable from the LMS, as the fields are different.
2014-01-29 09:01:28 -05:00
Dave St.Germain
6d50ff7b61 Set the html language to the browser's specified language 2014-01-28 16:43:29 -05:00
daniel cebrian
7e2652b5a8 annotation tools
First set of fixes from the pull request

This does not include some of the testing files. The textannotation and
videoannotation test files are not ready. waiting for an answer on the
issue.

Deleted token line in api.py and added test for token generator

Added notes_spec.coffee

remove spec file

fixed minor error with the test

fixes some quality errors

fixed unit test

fixed unit test

added advanced module

Added notes_spec.coffee

remove spec file

Quality and  Testing Coverage

1. in test_textannotation.py I already check for line 75 as it states
in the diff in line 43, same with test_videoanntotation
2. Like you said, exceptions cannot be checked for
firebase_token_generator.py. The version of python that is active on
the edx server is 2.7 or higher, but the code is there for correctness.
Error checking works the same way.
3. I added a test for student/views/.py within tests and deleted the
unused secret assignment.
4. test_token_generator.py is now its own file

Added Secret Token data input

fixed token generator

Annotation Tools in Place

The purpose of this pull request is to install two major modules: (1) a
module to annotate text and (2) a module to annotate video. In either
case an instructor can declare them in advanced settings under
advanced_modules and input content (HTML in text, mp4 or YouTube videos
for video). Students will be able to highlight portions and add their
comments as well as reply to each other. There needs to be a storage
server set up per course as well as a secret token to talk with said
storage.

Changes:
1. Added test to check for the creation of a token in tests.py (along
with the rest of the tests for student/view.py)
2. Removed items in cms pertaining to annotation as this will only be
possible in the lms
3. Added more comments to firebase_token_generator.py, the test files,
students/views.py
4. Added some internationalization stuff to textannotation.html and
videoannotation.html. I need some help with doing it in javascript, but
the html is covered.

incorporated lib for traslate

fixed quality errors

fixed my notes with catch token

Text and Video Annotation Modules - First Iteration

The following code-change is the first iteration of the modules for
text and video annotation.

Installing Modules:
1. Under “Advanced Settings”, add “textannotation” and
“videoannotation” to the list of advanced_modules.
2. Add link to an external storage for annotations under
“annotation_storage_url”
3. Add the secret token for talking with said storage under
“annotation_token_secret”

Using Modules
1. When creating  new unit, you can find Text and Video annotation
modules under “Advanced” component
2. Make sure you have either Text or Video in one unit, but not both.
3. Annotations are only allowed on Live/Public version and not Studio.

Added missing templates and fixed more of the quality errors

Fixed annotator not existing issue in cmd and tried to find the get_html() from the annotation module class to the descriptor

Added a space after # in comments

Fixed issue with an empty Module and token links

Added licenses and fixed vis naming scheme and location.
2014-01-27 13:47:58 -05:00
Chris Dodge
fcefada2d7 add middleware to be able to expire inactive sessions after N seconds
configure middleware

add test for session inactive timeouts

add Studio inactive session timeout test

change login method used

add create_test_account to test

make sure the expected redirect URL is right

fix indenting problem

fix doc string since we moved from minutes to seconds

use utility methods rather than calling another test to set up and activate an account

clean up code violations

respond to PR feedback

use optional params to make code cleaner

pylint fix on test files
2014-01-24 10:36:21 -05:00
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release
Merging Release 2014-01-21
2014-01-21 12:41:05 -08:00
Diana Huang
fdf531aec0 Migrations for LinkedIn.
Clean up common.

Add the ability to dry-run the command without sending e-mail.

Don't save courses sent during a dry run

Switch to EmailMessage for LinkedIn so we can send HTML emails

Update subject copy.

Use correct name for CertificationName

Fix up certificate url information.
2014-01-16 17:03:15 -05:00
David Ormsbee
db7308adc1 Remove unused parts of LinkedIn API
Fix whitelist logic to handle empty lists.
2014-01-16 17:03:15 -05:00
Don Mitchell
3885e6cf78 Merge branch 'release'
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
2014-01-16 12:51:22 -05:00
Julia Hansbrough
f3f0e8a514 Merge pull request #1888 from edx/flowerhack/feature/certificate-revenue-reporting
Verified Certificate Reports
2014-01-15 06:18:17 -08:00
Julia Hansbrough
1664452a14 Final iteration 2014-01-15 13:06:50 +00:00
Julia Hansbrough
ea0ae11171 Response to CR 1-14 2014-01-15 00:27:14 +00:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
2014-01-14 14:36:01 -05:00
Chris Rossi
831f907c79 Add individual due dates feature.
Adds a feature to the edX platform which allows instructors to set
individual due dates for students on particular coursework. This code is
meant primarily for on-campus use--it is not intended that this feature
would be used for MOOCs. It adds a new tab, "Extensions", to the beta
instructor dashboard which allows changing due dates per student. This
feature is enabled by setting FEATURES['INDIVIDUAL_DUE_DATES'] = True.
2014-01-14 10:19:02 -05:00
Calen Pennington
417fe21d05 Enable pure XBlocks, but behind a feature flag
[LMS-226]
[LMS-2013]
2014-01-10 11:40:03 -05:00
David Baumgold
96558c85f9 Merge pull request #2113 from edx/db/enable-theme-in-startup
Do theme post-processing in startup hook
2014-01-09 12:19:17 -08:00
Sarina Canelake
c285bd11d5 Merge pull request #2108 from edx/jtauber/neuter-static-files
remove edx.org-specific content no longer used
2014-01-09 10:06:44 -08:00
Sarina Canelake
56a917cfb7 Fix 'JOBS' and 'PRESS' links at bottom of old site 2014-01-09 12:30:15 -05:00
David Ormsbee
ff192935d8 Removing JS gettext() in favor of server-side substitution.
[LMS-1680]
2014-01-09 10:24:09 -05:00
David Baumgold
08c9fd94d9 Do theme post-processing in startup hook 2014-01-08 13:27:30 -05:00
Julia Hansbrough
95affba643 More response to CR 2014-01-06 15:53:28 +00:00
e0d
86e3391b41 fixing merge conflict from release 2013-12-19 16:34:25 -05:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor
Stub Server Port Conflicts and Refactor
2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
2013-12-19 09:12:41 -05:00
Julia Hansbrough
f351b05031 Fixing email link injection bug
Several templates used a variable set by the user (the request host header).  This led to a vulnerability where an attacker could inject their domain name into these templates (i.e., activation emails).  This patch fixes this vulnerability.

LMS-532
2013-12-18 13:38:36 -05:00
Don Mitchell
5f2517978d Move default DOC_STORE_CONFIG to common 2013-12-17 13:09:38 -05:00
Will Daly
7bf68907f3 Merge pull request #1935 from edx/will/ignore-symlink-staticfiles
Add ignore patterns for staticfiles to avoid processing symlink dirs
2013-12-16 09:01:17 -08:00
Carson Gee
ccc87337d6 Add sysadmin dashboard
For seeing overview of system status, for deleting and loading
courses, for seeing log of git imports of courseware.  Includes command
for importing course XML from git repositories.

Added a lot of tests for additional coverage with some minor fixes
those tests discovered
2013-12-15 19:06:05 -05:00
Will Daly
4c842409f7 Add ignore patterns for staticfiles to avoid processing symlink dirs 2013-12-12 10:33:38 -05:00
David Baumgold
fb13bed947 Updating comments and docs for MITx -> edX transition 2013-12-10 13:21:18 -05:00
David Baumgold
b32f2bc170 MITX_ROOT_URL => EDX_ROOT_URL 2013-12-04 12:59:35 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
Jason Bau
f94565d699 Merge pull request #1685 from edx/jbau/shopping-cart/report
CSV Reporting of Shopping Cart Purchases, with tests
2013-11-26 11:45:59 -08:00
David Ormsbee
901ad22652 Make ENABLE_S3_GRADE_DOWNLOADS disabled by default, enabled in dev.
Having ENABLE_S3_GRADE_DOWNLOADS enabled by default in common.py
could lead to surprising behavior for folks downstream. They'd
suddenly see a grade download screen on their new instructor
dashboard, but the links by default would be local files and
couldn't be used in an actual production environment. So we disable
by default and let people explicitly enable it and set it up for
S3 if they wish.

LMS-58
2013-11-22 10:06:34 -05:00
David Ormsbee
a99fd08004 Fix error case where we have items in our grading csv output
that are not present in a given student's gradeset.

General code cleanup and addition of comments.

Instructor dashboard API unit tests.

LMS-58
2013-11-22 10:06:28 -05:00
Sarina Canelake
e2423386cb UX for Data Download tab on instructor dash
Restrict grade report generation to 'is_superuser' users (can be overridden with
feature flag ALLOW_COURSE_STAFF_GRADE_DOWNLOADS); all staff users can download
generated files.

LMS-58
2013-11-22 10:06:22 -05:00
David Ormsbee
e0aa8cf78a Grade report celery task and direct file push to S3 from the new instructor dashboard.
Hook up display of grade files ready for download to new instructor dashboard.

LMS-58
2013-11-22 10:06:10 -05:00
Jason Bau
c8a98051dd CSV Reporting of Shopping Cart Purchases, with tests
squashing to one commit to make cherry-picking by feature possible
2013-11-18 14:45:41 -08:00
Usman Khalid
e370fb9585 Merge pull request #1502 from edx/usman/lms1355-wiki-permissions
Stricter permissions for the wiki
2013-11-13 02:44:14 -08:00
Usman Khalid
9542230afd Added granular permissions for managing wiki articles
LMS-1355
2013-11-13 01:40:23 +05:00