Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,255 Commits 1 Branch 0 Tags
d00a0f5b0890a4e9d24bccbad3a40ba13275e7db
Commit Graph

423 Commits

Author SHA1 Message Date
polesye
faab4caeef BLD-837: Fix download transcript behavior. 2014-02-14 11:51:51 +02:00
Christina Roberts
0c74d6ac54 Merge pull request #2562 from edx/christina/lms-mixed 
Clean up of modulestore references (primarily LMS).
 2014-02-13 20:05:31 -05:00
Usman Khalid
21d8b40576 Added feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to configure display of histograms in Staff Debug Info panel. 
Generating histograms requires scanning the courseware_studentmodule table on
each view. This can make staff access to courseware very slow on large courses.

Default is False.

LMS-1199
 2014-02-13 17:15:20 +05:00
Usman Khalid
f6d7cb5065 Renamed feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to 'DISPLAY_DEBUG_INFO_TO_STAFF' to better communicate its purpose. 
Default is True.

LMS-1199
 2014-02-13 17:15:19 +05:00
Julia Hansbrough
d6c0ce161e Merge branch 'release' 2014-02-12 21:24:19 +00:00
Anton Stupak
9b0c8d266e Merge pull request #2557 from edx/anton/revert-download-transcript-rc 
Video: Revert Download transcript button behavior.
 2014-02-12 12:41:43 +02:00
polesye
f957b34427 BLD-811: Revert functionality. 2014-02-12 12:05:02 +02:00
cahrens
09d90b16af Clean up of modulestore references (primarly LMS). 
STUD-1151
 2014-02-11 14:29:22 -05:00
polesye
cebc0c47fd BLD-824: Download Video link missing from video player. 2014-02-11 20:17:22 +02:00
polesye
102d1cb253 Persist student progress in video. 
Student logins to edx, plays video, selects position, closes
browser, opens video, position is restored.

BLD-385
 2014-02-11 13:53:24 +00:00
Oleg Marshev
79ffcb7e94 Refactor stub implementation of LTI Provider. BLD-601. 2014-02-11 12:50:22 +02:00
Don Mitchell
16f0d12a1f Merge pull request #2356 from edx/dhm/mixed_ms_wrapper 
MixedModulestore wraps most getters, update_item, delete_item
 2014-02-10 16:01:50 -05:00
Ned Batchelder
30aede6fb2 Merge pull request #2541 from edx/ned/remove-unused-imports 
Remove unused imports.
 2014-02-10 15:00:49 -05:00
Dave St.Germain
01ac04ca60 Merge pull request #2496 from edx/dcs/a11y-hide-things 
For a11y, modal dialogs and script templates should be hidden...
 2014-02-10 14:50:30 -05:00
Ned Batchelder
1bd213beba Remove unused imports. 2014-02-10 14:07:50 -05:00
Dave St.Germain
44109d16ab For a11y, modal dialogs and script templates should be hidden from 
screen readers. Also, the mathjax message should be wrapped to prevent
non-IE browsers from complaining about a feature that is IE-only.
 2014-02-07 11:12:41 -05: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
Don Mitchell
1de9d55844 Review-driven changes (to-be-squashed) 2014-02-05 16:34:24 -05:00
Dave St.Germain
a6797899da Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections. 2014-02-05 11:32:08 -05:00
Don Mitchell
b8ea7f3c43 update_item and other refactorings continued 2014-02-05 10:24:24 -05:00
Don Mitchell
c601b75675 MixedModulestore wraps most getters, update_item, delete_item 
with code to translate between addressing schemes based on app
and persistence layer addressing scheme specification.

STUD-1206
 2014-02-05 09:34:30 -05:00
Chris Dodge
ad7348ec11 Allow author to cap enrollments in course 
add a test case for enrollment caps

pep8 fix
 2014-02-04 15:32:36 -05:00
Feanil Patel
5e5c59cab2 Merge remote-tracking branch 'origin/release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml.py

Took the changes that were on the release branch.
 2014-02-03 16:39:40 -05: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
David Baumgold
751669cbe7 /create_account: use proper HTTP status codes 
Use status code 400 when there is a validation error in creating an account.
 2014-01-30 15:23:57 -05:00
Adam Palay
5372bcff51 Detached pages from XML courses are set to appropriate descriptor class (LMS-2094) 
Add tests
 2014-01-30 13:52:07 -05:00
Chris Dodge
3554c52a20 update test to reflect that the non-microsite homepage has been changed to remove all the partnership content 2014-01-30 10:26:13 -05:00
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00
Anton Stupak
a077dc815c Merge pull request #2352 from edx/anton/fix-persist-speed-per-video 
Video: Fix speed persistence per video.
 2014-01-30 00:04:31 -08:00
polesye
642c239a01 Fix speed persistence per video. 2014-01-29 16:49:39 +02: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
Chris Dodge
8262b6564e pep8 cleanup 2014-01-24 11:59:56 -05:00
chrisndodge
88391c7ec6 Merge pull request #2278 from edx/cdodge/session-inactivity-timeout 
add middleware to be able to expire inactive sessions after N seconds
 2014-01-24 08:25:24 -08: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
polesye
1d74838698 BLD-237: Persist speed preferences between videos. 2014-01-23 20:54:40 +02:00
Anton Stupak
5bacfcc32b Merge pull request #2045 from edx/anton/video-merge-fields 
Merge "video sources" and "download video" into the same field
 2014-01-23 09:31:11 -08: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
polesye
645007f910 BLD-364: Merge "video sources" and "download video" fields. 2014-01-23 11:27:28 +02:00
Anton Stupak
2ef095d9b5 Merge pull request #2149 from edx/anton/video-download-transcript 
Allows students to download the transcript of the video without timecodes
 2014-01-22 12:03:41 -08:00
polesye
4a36fa892b BLD-368: Turn "download transcript" into a dropdown. 2014-01-22 18:25:03 +02:00
Calen Pennington
a6035698d5 Correctly compute course image location when using mongo modulestore 
[LMS-2073]
[STUD-1197]
 2014-01-22 07:17:40 -05:00
Calen Pennington
923c2ff46e Add failing tests for course image names 
Tests LMS-2073 (non-ascii course image names) and STUD-1197 (spaces in
course image names)
 2014-01-22 07:16:30 -05:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -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
Don Mitchell
ad3140a6e6 Cleaned up modules to reflect centralizing auth 2014-01-14 17:04:44 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones 
STUD-1006
 2014-01-14 17:04:44 -05:00
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -05: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