Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,804 Commits 1 Branch 0 Tags
751669cbe76d59fb303fa182e6f739f39152ffd0
Commit Graph

7356 Commits

Author SHA1 Message Date
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
David Baumgold
7b4ea225da Remove periods from error messages 2014-01-30 15:23:57 -05:00
chrisndodge
1b7e144beb Merge pull request #2331 from edx/chrisndodge/lock-accounts-after-failed-attempts 
Ability to lock out accounts for N seconds after M failed login attempts
 2014-01-30 07:34:06 -08:00
Christina Roberts
088a713788 Merge pull request #2330 from edx/christina/export-commands 
Export conversion script
 2014-01-30 06:59:22 -08:00
David Baumgold
08fb49506a Merge pull request #2302 from edx/db/django-command-migrate-to-split 
Django command for migrating courses to split-mongo (and deleting)
 2014-01-30 06:51:27 -08:00
cahrens
2ee964345f Convert between export formats. 
STUD-1196
 2014-01-30 09:22:43 -05:00
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00
Waheed Ahmed
d12e7e8877 Fixed allowing for execution of arbitrary Javascript in student response. 
ORA-256
 2014-01-30 16:17:48 +05: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
David Baumgold
dd627edae4 add logging for auditing when split-mongo courses are deleted 2014-01-29 16:57:23 -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
David Baumgold
a0bc10a1c3 Merge pull request #2357 from edx/db/move-doc-url-func 
Move doc_url function out of edxmako middleware
 2014-01-29 12:59:31 -08:00
David Baumgold
e18507f188 fix pep8/pylint issues 2014-01-29 15:11:04 -05:00
David Baumgold
692502c0fb Don't cache falsy values 2014-01-29 15:11:04 -05:00
David Baumgold
096088cc75 fix test failures: clear loc_mapper cache 2014-01-29 15:11:03 -05:00
David Baumgold
de96a47eac happy path unit test 2014-01-29 15:11:03 -05:00
David Baumgold
9e8be1bbc3 make SplitMigrator take a User object, rather than a user ID 2014-01-29 15:11:02 -05:00
David Baumgold
b25b3e1bef Move doc_url function out of edxmako middleware 2014-01-29 14:52:43 -05:00
Jim Abramson
74067b80e3 Merge pull request #2266 from edx/jsa/forums-response-button 
add "Add A Response" button to thread views in discussion tab / inline
 2014-01-29 11:48:32 -08: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
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
Alexander Kryklia
4234daeb46 Merge pull request #2353 from edx/alex/no_error_on_empty_answer_to_master 
Alex/no error on empty answer to master
 2014-01-29 07:05:40 -08:00
polesye
642c239a01 Fix speed persistence per video. 2014-01-29 16:49:39 +02:00
Calen Pennington
8424f610d5 Merge pull request #2171 from cpennington/pylint-cleanup 
Fix pylint violations from #2129
 2014-01-29 06:38:17 -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
Alexander Kryklia
9876c993c5 Fix test for isnan student answer. 2014-01-29 16:07:26 +02:00
Alexander Kryklia
2653e9634a Should not raise exception on empty answer. 2014-01-29 16:07:19 +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
jorr
58c76afa9e Use the publish() api from xblock.runtime.Runtime 2014-01-28 14:16:34 -08:00
jsa
9b54abe308 add "Add A Response" button to thread views in discussion tab / inline 
JIRA: FOR-373
 2014-01-28 17:13:16 -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
Don Mitchell
38a6bf6824 Add set to mocked cache 2014-01-28 12:24:41 -05:00
Don Mitchell
14be0b6c7a Cache course location translations 2014-01-28 10:34:31 -05:00
Usman Khalid
1efe74ec53 Refactored tests so that individual fields in the body arg are checked and not the whole serialized body. 
ORA-197
 2014-01-28 18:44:16 +05:00
Usman Khalid
989a1b6252 If unable to send submission to grader store it instead. 
ORA-197
 2014-01-28 17:57:16 +05:00
Usman Khalid
d2ede8339a For multistep openended problems after moving to a openendedmodule step keep trying to resend submission to grader until it succeeds. 
ORA-197
 2014-01-28 17:57:16 +05:00
Usman Khalid
b21d606494 If unable to send submission/feedback to xqueue return an error instead of silently failing. 
ORA-197
 2014-01-28 17:57:16 +05:00
Waheed Ahmed
d872527603 Merge pull request #2228 from edx/waheed/ora201-large-posts-to-ora-like-peer-grading-feedback 
Really large posts to ORA like peer grading feedback fixed.
 2014-01-28 03:27:44 -08:00
Waheed Ahmed
800bb96f43 Merge pull request #2059 from edx/waheed/ora202-self-assessment-deadlines-not-apply-on-rubrics 
Fixed self assessment deadlines don't apply to the submission of the rubric
 2014-01-28 03:25:21 -08:00
Waheed Ahmed
d5cadf0008 Really large posts to ORA like peer grading feedback fixed. 
ORA-201
 2014-01-28 15:50:16 +05:00
Waheed Ahmed
8e36dfedb9 Fixed self assessment deadlines don't apply to the submission of the rubric. 
ORA-202
 2014-01-28 15:48:21 +05:00
Valera Rozuvan
d33c4fc81f Fix for BLD-708: Firefox YouTube video start time. 
In Firefox YouTube video with start time plays from 00:00:00.
The reason was that seekTo() could not start playing a video from
a point that hasn't been buffered yet. Why this started happening
just now, really is hard to explain.

BLD-708.
 2014-01-28 12:24:03 +02:00
Christina Roberts
0c7e203624 Merge pull request #2333 from lduarte1991/master 
Updating Annotator CSS
 2014-01-27 14:15:46 -08:00
lduarte1991
d214cb8778 Updating Annotator CSS 
The change in the css keeps fonts as they were and does not change them
purely based on annotating a section.
 2014-01-27 17:12:13 -05:00
Will Daly
9b9cf7fe81 Merge pull request #2327 from edx/will/disable-flakey-ora-tests 
Disabled flakey open-ended tests
 2014-01-27 13:39:55 -08:00
Giulio Gratta
65c76cd6a7 Added help text to tooltips and sr flag spans 2014-01-27 13:27:24 -08:00
Will Daly
0277cec600 Disabled flakey open-ended tests 2014-01-27 15:21:55 -05:00