Commit Graph

1515 Commits

Author SHA1 Message Date
Julia Hansbrough
69b5b033fd Midcourse reverifications: dismissal banner
Added a banner that students can use to dismiss the "you have failed reverification" message.  Also, removed unused code, wired up the sidebar for design
2014-01-31 22:20:32 +00:00
Julia Hansbrough
3aa80654cb Midcourse reverification: fixing broken tests
Also, refactored code representing ReverifyInfo
2014-01-31 22:08:09 +00:00
Julia Hansbrough
3e1519c62a Midcourse reverification: increased quality
Also, removed an unused template
2014-01-31 22:08:09 +00: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
Jay Zoldak
9cfd649c08 Merge pull request #2137 from abdoosh00/feature/unicode
Unicode changes to support R to L script
2014-01-31 06:48:01 -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
Jay Zoldak
bc30addfb9 Unicode changes to support QRF
fixing unit tests

fixing merge error

fixing xqueue submission issue with unicode url (trial 0.1)

fixing fotmats as commented upon

removing yaml file language selection

Unicode changes to support QRF

removed unnecessary pass in modulestore/init.py

fixing merge error

fixing fotmats as commented upon

removing yaml file language selection

fixing pep8 violations

- fixing pylint violations

pylint violation

fixing line spaces and formats

ignore pylint E1101

remove empty line

fixing pylint violations

 pep8 violations

bulk mail unicode/decode

fix migration error

fix pep8 just to push again

more unicode/decode
Final changes to comments and error messages.
2014-01-30 16:20:36 -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
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
jorr-at-google
87aa71c450 Merge pull request #2309 from edx/jorr/feature/use-xblock-publish-api
Use the publish() api from xblock.runtime.Runtime
2014-01-29 09:25:33 -08: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
polesye
642c239a01 Fix speed persistence per video. 2014-01-29 16:49:39 +02: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
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
jorr
58c76afa9e Use the publish() api from xblock.runtime.Runtime 2014-01-28 14:16:34 -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
Giulio Gratta
78c85ea3b2 Merge pull request #2308 from edx/giulio/fix-error-msg-typo
Fixed all instances of "occured" typo
2014-01-27 10:46:13 -08:00
Giulio Gratta
0429ba7da3 Fixed all instances of "occured" typo 2014-01-24 16:13:26 -08: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
Oleg Marshev
ec6d9d585a Allow user with BetaTester role correctly use LTI. BLD-641. 2014-01-24 14:42:14 +02: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
4d4288f418 Merge pull request #2249 from cpennington/non-ascii-course-images
Fix non-ascii course image names
2014-01-22 07:50:13 -08: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
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release
Merging Release 2014-01-21
2014-01-21 12:41:05 -08:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Chris Dodge
c9718380ea catch additional FEATURE['ENABLE_MKTG_SITE'] checks and make sure MicrositeConfigurations will override the global setting
one more faulty login regarding ENABLE_MKTG_SITE=true situations
2014-01-16 17:04:17 -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
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
2014-01-14 13:28:47 -05:00
Ned Batchelder
1932c126b8 Rename DbModel to KvsFieldData. 2014-01-14 13:09:36 -05:00
Ned Batchelder
b6bd293266 Clean up some pre-existing formatting. 2014-01-14 13:09:35 -05:00
Sarina Canelake
129c24477f Merge pull request #2062 from jazkarta/feature-idde2
Individual Due Date Extension feature
2014-01-14 08:00:14 -08: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
Sarina Canelake
9ce10493ad Remove references to old university images 2014-01-14 09:27:03 -05:00
polesye
af56a2df72 BLD-518: Fix video volume cookie. 2014-01-13 12:03:57 +02:00