Commit Graph

1058 Commits

Author SHA1 Message Date
Jason Bau
50f7c0ebed Merge pull request #2510 from edx/jbau/fix-timezone-test-breakage
fix tests that were breaking on dev envs due to TIME_ZONE='UTC'
2014-02-07 12:28:36 -08:00
Jason Bau
fc8efc3017 fix tests that were breaking on dev envs due to TIME_ZONE='UTC' 2014-02-06 23:07:26 -08:00
John Jarvis
6c5ad2b74a Merge pull request #2448 from edx/jarv/db-env-override
Jarv/db env override
2014-02-06 17:53:26 -05:00
Jason Bau
b525f40377 Start datetime localization in LMS
Currently just coerces the time displayed for due dates
(accordion.html and progess.html) to settings.TIME_ZONE
2014-02-06 07:57:56 -08:00
Calen Pennington
6d67d0c677 Merge pull request #1949 from cpennington/xblock-studio-js-and-css
Enable XBlock js and css in Studio
2014-02-05 08:19:45 -05:00
Calen Pennington
818ad15967 Merge pull request #2304 from cpennington/less-initialization
Don't force modulestore initialization when running lms manage.py, only when running via the wsgi file
2014-02-04 13:27:01 -08:00
Calen Pennington
13c894eb31 Remove extraneous configuration 2014-02-04 15:35:26 -05:00
Carson Gee
69097e7b4a Merge pull request #2032 from carsongee/cg/ssl-studio
More fully integrate and test ssl external auth in CMS
2014-02-04 09:54:17 -08:00
Carson Gee
8cbe263ca0 Rename of feature AUTH_USE_MIT_CERTIFICATES to AUTH_USE_CERTIFICATES across platform.
Caution! This is backwards incompatible
2014-02-04 10:50:48 -05:00
John Jarvis
d279dff9c9 fixing syntax 2014-02-04 09:26:25 -05:00
John Jarvis
442abde030 adding DB_MIGRATION_ENGINE and fixing defaults 2014-02-04 09:24:49 -05:00
John Jarvis
3fe701c037 check for None so an empty string is valid for a password 2014-02-04 09:11:48 -05:00
Calen Pennington
49217ebe8b Allow multiple client-side runtimes on a single page
Make XBlock client-side runtimes proper classes, so that handlerUrl can
be defined in a per-runtime way, and we can have multiple runtimes on a
single page.

[LMS-1630][LMS-1421][LMS-1517]
2014-02-04 08:55:36 -05:00
John Jarvis
d28f2f5905 adding check back in 2014-02-03 16:54:54 -05:00
Julia Hansbrough
cd95469b18 Removed LANGUAGE from devstack settings 2014-02-03 21:44:04 +00:00
John Jarvis
693497673a remove check for PASS 2014-02-03 16:42:22 -05:00
John Jarvis
ff7810d777 adding db overrides to aws_migrate.py 2014-02-03 14:49:41 -05:00
Calen Pennington
f5ffc94d16 Prep for initial language release 2014-02-03 13:35:56 -05:00
Will Daly
eae4adeb9b Merge pull request #2361 from edx/will/bok-choy-upgrade-and-lms-tests
Bok-choy upgrade, LMS tests, cleanup
2014-02-03 08:11:03 -08:00
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
Will Daly
e859a37001 Fix an issue with cache being cleared for bok_choy fast test
Change text in bok_choy scripts to green
Added feedback check for AI-assessment test
Added peer assessment feedback test
Updated Studio/LMS page objects and tests to use bok-choy v0.1.0
Added LMS bok-choy tests from e2e repo
2014-01-31 14:33:24 -05:00
chrisndodge
7dbec60829 Merge pull request #2384 from edx/chrisndodge/wire-in-aws-settings
wire in env settings into aws.py for session inactivity timeouts
2014-01-31 04:00:57 -08: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
7cd343e031 wire in env settings into aws.py 2014-01-30 16:38:43 -05:00
chrisndodge
5951eb8dae Merge pull request #2379 from edx/chrisndodge/lock-accounts-after-failed-attempts
Add AWS.py configuration hooks to tie in login failure lockout parameters
2014-01-30 13:08:48 -08:00
Chris Dodge
cdf8b7cf16 add aws.py hooks 2014-01-30 15:38:02 -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
chrisndodge
7162aa66f3 Merge pull request #2285 from antoviaque/registration-extra-fields
Registration extra fields: Selectively require/hide registration fields & add optional country/city fields
2014-01-29 08:09:53 -08:00
Will Daly
021bece881 Merge pull request #2239 from edx/will/ora-ai-and-peer-tests
ORA AI and Peer acceptance tests
2014-01-29 06:28:39 -08: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
davestgermain
b18945d1cf Merge pull request #2332 from edx/dstgermain/a11y-html-lang
Set the HTML language to the browser's specified language
2014-01-28 13:44:21 -08:00
Dave St.Germain
6d50ff7b61 Set the html language to the browser's specified language 2014-01-28 16:43:29 -05:00
Will Daly
b73c6f63fc Added stub XQueue server to bok_choy test suite.
Added feedback check for AI-assessment test

Added peer assessment feedback test
2014-01-28 14:57:28 -05:00
David Ormsbee
6e6a1d5021 Only create loc_cache CACHE entry if it doesn't exist in ENV_TOKENS config. 2014-01-28 12:30:38 -05:00
David Ormsbee
ee5ee92b37 Create local memory caching entry for location mapping. 2014-01-28 10:57:15 -05:00
Dave St.Germain
e738cc073d settings for i18n and debug toolbar on devstack 2014-01-27 16:14:18 -05:00
Dave St.Germain
cc31695764 settings for i18n and debug toolbar on devstack 2014-01-27 15:53:26 -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
Jay Zoldak
538ecf4852 Enable microsite tests
Move microsite test assets to common/test

Rename helper method to not have test in the name
Rename test css file
2014-01-23 10:42:51 -05:00
Jason Bau
4e413e4ecb Merge pull request #2190 from edx/jbau/fix-preview-config
move HOSTNAME_MODULESTORE_DEFAULT_MAPPING to lms.envs.aws (not lms.envs....
2014-01-21 13:26:10 -08:00
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release
Merging Release 2014-01-21
2014-01-21 12:41:05 -08:00
Adam Palay
981a7f9479 Revert django-debug-toolbar related updates on master, set version to 0.9.4
(STUD-1201)

Revert "Specific django-toolbar version (stable released) and update the panels in dev envs"

This reverts commit a465b082da.

Revert "Updated settings for devstack django debug toolbar"

This reverts commit 30199e8a61.
2014-01-17 14:17:38 -05:00
Will Daly
30199e8a61 Updated settings for devstack django debug toolbar 2014-01-16 18:53:11 -05:00