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

16616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jay Zoldak
86c7e2c4db Merge pull request #648 from edx/zoldak/release-changelog 
Changelog updates
 2013-08-13 09:01:56 -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
c913aeb077 Merge pull request #649 from edx/fix/adam/preview-enroll 
remove 'preview' from urls in enrollment emails sent while previewing a ...
 2013-08-13 08:34:42 -07:00
Adam Palay
5a7b72667e replace html strings wtih tokens in templates 2013-08-13 11:19:58 -04:00
Peter Fogg
9ea2be5377 Merge pull request #643 from edx/peter-fogg/course-creation-validation 
Change course create form to asynchronous validation.
 2013-08-13 08:11:40 -07:00
Adam Palay
55ad55b9ca add PLATFORM_NAME and BUGS_EMAIL to cms/envs/common 2013-08-13 10:35:06 -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
271e9076f0 Merge pull request #632 from rocha/ignore-invalid-youtube-ids 
Fix error when there is an invalid YouTube property in a video module
 2013-08-13 06:21:44 -07:00
Peter Fogg
b3aa20db64 Correctly clear fields when cancelling course create. 2013-08-13 09:18:36 -04:00
Chris Dodge
64433db0bd add changelog entry 2013-08-12 21:38:53 -04:00
Chris Dodge
03449895f2 add studio changes 2013-08-12 21:34:26 -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
Adam Palay
18a979bb4d put wiki templates back into Django templating 2013-08-12 16:42:07 -04:00
Peter Fogg
c611470e97 Correct non-unique course validation; code cleanup; better error style. 2013-08-12 16:28:41 -04:00
Adam Palay
13d54c0dd7 fix password reset templates 2013-08-12 15:57:27 -04:00
Peter Baratta
57e1418274 Add an entry to the CHANGELOG for #512 2013-08-12 15:37:18 -04:00
Miles Steele
57d9ea3f65 add beta dash to changelog 2013-08-12 15:06:46 -04:00
jkarni
a7568fbf43 Merge pull request #567 from edx/jkarni/fix/descriptorsystemruntime 
Make descriptorsystem inherit from Runtime
 2013-08-12 12:06:42 -07: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
Chris Dodge
25abce865f add changelog information on two features being deployed 2013-08-12 15:02:55 -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
Adam Palay
431eb8f4e7 remove 'preview' from urls in enrollment emails sent while previewing a course 2013-08-12 14:28:15 -04:00
Adam
0db8ad28dc Merge pull request #640 from edx/adam/i18n-bug-fixes 
instructor dash fixes
 2013-08-12 11:16:22 -07:00
Will Daly
df38f80506 Merge pull request #638 from edx/will/coffee-too-many-files 
Coffee compile command now executes for just *.coffee items.
 2013-08-12 11:14:23 -07:00
chrisndodge
bb644bb6ae Merge pull request #645 from edx/fix/cdodge/add-tech-support-email-config 
Add new setting to cms project
 2013-08-12 11:10:53 -07:00
Chris Dodge
7fd5a00c2c import default TECH_SUPPORT_EMAIL setting from LMS 2013-08-12 14:07:03 -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
0231e64f36 also define TECH_SUPPORT_EMAIL in cms.envs.common config file 2013-08-12 13:41:05 -04:00
Miles Steele
e6d44f5ae7 Merge pull request #626 from edx/feature/msteele/instrdash 
Enable beta dashboard, add copy, add i18n
 2013-08-12 10:38:26 -07:00
Chris Dodge
0da2fb842f Add new setting to cms project 2013-08-12 13:29:15 -04:00
Miles Steele
43afb9a940 fix i18n 2013-08-12 13:21:46 -04:00
Chris Dodge
05e1ffb190 remove unused code from xml_import.py 2013-08-12 12:49:15 -04:00
Peter Fogg
8fa4b4dbd1 Change course create form to synchronous validation. 2013-08-12 12:41:41 -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
69fa1b069d Added user documentation 2013-08-12 11:49:04 -04: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
Adam Palay
b2b574ffb6 instructor dash fixes 2013-08-12 11:36:26 -04:00
Miles Steele
b1074ff1ac add i18n 2013-08-12 11:25:26 -04:00
Will Daly
d1e0005f30 Merge pull request #622 from edx/will/fix-js-tests-using-number-input 
Failing JavaScript tests in Firefox
 2013-08-12 08:12:12 -07:00
Carlos Andrés Rocha
4f4f0e9a23 Merge pull request #619 from edx/rocha/fix-help-on-manage-dot-py 
Fix manage.py to ouput the help of the django command if requested
 2013-08-12 07:32:40 -07: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
Will Daly
d947b0ecc8 Coffee compile command now executes for just *.coffee items. 
This resolves an error that would sometimes occur on Mac OS X:
"Error: EMFILE, too many open files"
 2013-08-12 09:26:22 -04:00