Commit Graph

5737 Commits

Author SHA1 Message Date
Carlos Andrés Rocha
f4fe6de38f Merge pull request #684 from rocha/test-invalid-youtube-ids
Add test for invalid YouTube IDs strings
2013-08-15 10:13:26 -07:00
Vik Paruchuri
c9e0d36d16 Merge pull request #621 from edx/fix/vik/oe-issues
Fix/vik/oe issues
2013-08-15 08:27:34 -07:00
Carlos Andrés Rocha
9199f1d08b Add test for invalid YouTube IDs strings 2013-08-15 11:06:53 -04:00
Peter Baratta
55b67e39bb Merge pull request #680 from edx/peterb/move-numpy-seterr
Move the silencing of numpy's warnings into test_calc.py
2013-08-15 07:31:03 -07:00
Peter Baratta
5f3dd37f98 Move the silencing of numpy's warnings into test_calc.py
..because that is where it is the most annoying/visible. Otherwise it really
has no effect on the LMS or anything else.
2013-08-15 08:54:43 -04:00
Valera Rozuvan
8ba9497fd9 Merge pull request #675 from edx/anton/disable_0-25x_speed
Add filter for playback rates.
2013-08-14 19:46:58 -07:00
Sarina Canelake
6a1e88cf77 Merge pull request #681 from edx/sarina/hotfix/fix-combinedopenended
Fix error seen in combinedopenended modules
2013-08-14 13:53:52 -07:00
Sarina Canelake
f438922a88 Fix error seen in combinedopenended modules 2013-08-14 16:36:33 -04:00
John Jarvis
4c469cc414 Merge pull request #666 from edx/jarv/add-get-grades
adding django-admin commands to dump grades to a csv file
2013-08-14 11:42:51 -07:00
John Jarvis
7dc7406d3c updating help for --course 2013-08-14 14:42:24 -04:00
David Ormsbee
57a8063517 Merge pull request #651 from edx/ormsbee/enrollment_modes
Add mode and is_active to CourseEnrollment, shift enrollment logic to model
2013-08-14 10:45:27 -07:00
David Ormsbee
3ce87583ab Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.
Features coming down the pipe will want to be able to:
* Refer to enrollments before they are actually activated (approval step).
* See what courses a user used to be enrolled in for when they re-enroll in
  the same course, or a different run of that course.
* Have different "modes" of enrolling in a course, representing things like
  honor certificate enrollment, auditing (no certs), etc.

This change adds an is_active flag and mode (with default being "honor").
The commit is only as large as it is because many parts of the codebase were
manipulating enrollments by adding and removing CourseEnrollment objects
directly. It was necessary to create classmethods on CourseEnrollment to
encapsulate this functionality and then port everything over to using them.

The migration to add columns has been tested on a prod replica, and seems to be
fine for running on a live system with single digit millions of rows of
enrollments.
2013-08-14 13:23:06 -04:00
Anton Stupak
b4df2c4d73 Add filter for playback rates. 2013-08-14 18:15:18 +03:00
Valera Rozuvan
b583a4e793 Optimizing code. Caching an element selector. 2013-08-14 11:56:13 +03:00
Valera Rozuvan
99ae63777e Removed unnecessary tabindex = 0 from <a /> - they get it by default. 2013-08-14 11:51:15 +03:00
Valera Rozuvan
3b326c3072 Fixing spelling typos in comments. 2013-08-14 11:49:27 +03:00
Valera Rozuvan
efac70e6b3 Adding documentation to the event handlers for volume and speed control. 2013-08-14 10:51:45 +03:00
Valera Rozuvan
da3e21ceee Fixed tabbing backwards.
Now you can tab through all of the controls in Video forwards, and then tab backwards.
2013-08-14 10:51:45 +03:00
Valera Rozuvan
0a5d261fc4 For YouTube videos tabbing from Speeds to Volume closes Speeds dialog.
An old TODO item was done. It turns out a simple case of calling
the method to bind handlers after the Spees dialog was re-rendered.
2013-08-14 10:51:45 +03:00
Carlos Andrés Rocha
a2225aad01 Merge pull request #655 from rocha/cleanup-xmodule-test-imports
Cleanup some xmodule tests imports and data directory location
2013-08-13 14:48:26 -07:00
Joe Blaylock
d6530fa633 Anonymized ID mapping fixups
Fixups to Nate's anonymized id mapper, repairing pep8 and pylint errors,
and rebasing on recent master.
2013-08-13 11:39:50 -07:00
Nate Hardison
e4994b15cd Add mgmt cmd to generate anonymized ID mapping
So that instructors have easy access to the mapping from anonymized
IDs (a simple MD5 hash of the user ID that's used when integrating
with third-party services like Qualtrics) to user IDs, we have a
simple Django management command to generate a CSV mapping. To run,
use the following:

rake django-admin[anonymized_id_mapping,<system>,<env>,<course_id>]

And, of course, substitute the appropriate values for <system>, <env>,
and <course_id>. (E.g., lms, dev, and MITx/6.002x/Circuits)
2013-08-13 11:10:05 -07:00
John Jarvis
d0a64f2c2a adding django-admin commands to dump grades to a csv file 2013-08-13 13:29:48 -04:00
chrisndodge
cd838e2652 Merge pull request #644 from edx/fix/cdodge/remove-unused-import-code
remove unused code from xml_import.py
2013-08-13 09:57:40 -07:00
Adam
8951ab7a66 Merge pull request #650 from edx/fix/adam/i18n-templates
Fix/adam/i18n templates
2013-08-13 08:39:46 -07:00
Adam Palay
5d4edc61a7 add settings.PLATFORM_NAME to password_reset_confirm context 2013-08-13 11:30:51 -04:00
Christina Roberts
f88de3920a Merge pull request #627 from edx/christina/restful-url
Change locators to a restful interface.
2013-08-13 07:34:22 -07:00
Carlos Andrés Rocha
82ae9e775d Cleanup some xmodule tests imports and data directory location 2013-08-12 20:58:36 -04:00
Carlos Andrés Rocha
8a527d16a6 Fix error when there is an invalid YouTube property in a video module 2013-08-12 19:29:14 -04:00
Adam Palay
f9ab433e26 add settings.PLATFORM_NAME to password_reset_confirm context 2013-08-12 17:58:31 -04:00
Julian Arni
7fc6057700 Merge branch 'master' into jkarni/fix/descriptorsystemruntime
Conflicts:
	cms/djangoapps/contentstore/views/preview.py
2013-08-12 15:04:49 -04:00
Julian Arni
91b23c406a Merge branch 'master' into jkarni/fix/descriptorsystemruntime 2013-08-12 15:00:26 -04:00
David Baumgold
6a3f0c141d Merge pull request #564 from edx/db/xblock-student-view
XBlock integration for Studio: student view
2013-08-12 11:55:40 -07:00
cahrens
98a47857b3 Allow version ID to appear after course ID.
cleanup
2013-08-12 14:49:27 -04:00
Lyla Fischer
e817fb4ca1 Merge pull request #637 from edx/vaxxxa/videoalpha_to_video
Migration videoalpha module to one main video module
2013-08-12 10:56:12 -07:00
Carlos Andrés Rocha
c727d43ce6 Merge pull request #617 from edx/rocha/change-console-stream-to-stderr
Change console logging stream from stdout to stderr
2013-08-12 10:55:29 -07:00
Chris Dodge
05e1ffb190 remove unused code from xml_import.py 2013-08-12 12:49:15 -04:00
Peter Baratta
bfccfba9d4 Merge pull request #512 from edx/peterb/formula-preview
Calc module changes: previewing and <formulaequationinput>

To see individual commits, see tag peterb/formula-preview/presquash
2013-08-12 09:24:29 -07:00
Peter Baratta
735e3b01a2 Create a new response type for Numerical/Formula
Named `FormulaEquationInput` (name up for debate)

- Based off ChemEqnIn
- Add FormulaEquationInput in inputtypes.py
- Add a call to a skeleton method for a preview

javascript:

- Queue up some MathJax
- Put some ordering on the AJAX requests: add a parameter when the request was started, when it returns check that it isn't outdated before displaying the preview
- Tests

Note: we moved the `jsinput` tests and DISABLED them, because they were causing the tests to fail.
2013-08-12 11:48:45 -04:00
Peter Baratta
a1162cbb34 Change calc module
- Create a method called `parse_algebra`. It takes a string of math and returns with a `pyparsing.ParseResults` object representing it.
- `evaluator` takes this tree and applies the old "parse actions" to it to get the same number as it used to.
- Change calc's API: `evaluator` to use `case_sensitive` rather than `cs`
- Add most of the capability for latex rendering
2013-08-12 11:40:20 -04:00
Miles Steele
6cf8643da5 Merge pull request #545 from edx/feature/msteele/fix-sql-index
Fix mysql indexing validity in migrations
2013-08-12 06:29:43 -07:00
Peter Fogg
e20acee4c4 Working on Videoalpha test fix.
Fixed all common and LMS tests.

The tests were failing because XMLDescriptor adds in some attributes
to _model_data, such as `xml_attributes`, that aren't necessary. The
solution is to handle all XML parsing in VideoDescriptor. There's
still one test failing in CMS, which has to do with metadata being
saved. I'm still working out how to update it in such a way that it
doesn't fail, but still tests something meaningful.
2013-08-12 14:32:15 +03:00
Anton Stupak
a6f6a50792 Disable js unit tests. 2013-08-12 14:32:14 +03:00
Vasyl Nakvasiuk
b33b5c7bd4 Python: videoalpha -> video. 2013-08-12 14:31:48 +03:00
Anton Stupak
dad9f26a99 Make VideoAlpha out of Alpha. 2013-08-12 14:31:48 +03:00
Anton Stupak
e381adbc3e Make js unit tests out of Alpha. 2013-08-12 14:31:48 +03:00
Anton Stupak
8ba94bb2a5 Remove js unit tests. 2013-08-12 14:31:47 +03:00
Vasyl Nakvasiuk
28b0ba5e10 Migrate video tests to videoalpha tests, remove video tests. 2013-08-12 14:31:47 +03:00
Chris Dodge
20b957518c resolve last code violation 2013-08-09 20:53:17 -04:00
Chris Dodge
f170d85547 fix wrapping, but mainly want to kick off another build due to Jenkins problem 2013-08-09 20:46:14 -04:00