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

6956 Commits

Author SHA1 Message Date
Victor Shnayder
d1eec9bcf4 add a salt. using user.id since that's handy. 2012-11-19 11:34:31 -05:00
Valera Rozuvan
9d46ad51be Merge branch 'feature/alex/crystallography-update-mitx' of github.com:MITx/mitx into feature/alex/crystallography-update-mitx 2012-11-19 18:20:17 +02:00
Valera Rozuvan
ae37b621a8 Update to crystallography html. 2012-11-19 18:19:36 +02:00
Александр
d70b74c701 added miller indexes grading for crystallography problems 2012-11-19 18:18:08 +02:00
Don Mitchell
8c8be3e82a Cleaned up imports 2012-11-19 10:38:58 -05:00
Don Mitchell
88cc5a080b Everything tested and ready for Tom to fix 2012-11-19 10:38:58 -05:00
David Ormsbee
336caa0feb Batch together alter statements to minimize how long we lock the auth_users table 2012-11-19 10:30:22 -05:00
Victor Shnayder
956b704786 add migration to remove askbot columns 2012-11-19 10:19:31 -05:00
Calen Pennington
8525b898d7 Add migration to make columns added by askbot nullable, in preparation for eventually deleting them 2012-11-19 09:48:51 -05:00
ichuang
f84f08fae4 xml_importer bugfix - when importing without policy override use course_location 2012-11-17 21:38:15 -05:00
Victor Shnayder
71b585bb61 move unique_id_for_user into student/models.py 2012-11-17 16:33:00 -05:00
Victor Shnayder
003dc7ef51 Get rid of check for non-existent CERTIFICATES_ENABLED flag... 2012-11-17 16:19:52 -05:00
Victor Shnayder
3a44f043d2 Add tests, make them pass. 2012-11-17 15:58:49 -05:00
Victor Shnayder
5bc0b4864a moving cert link and survey logic into views, adding tests. In-progress. 2012-11-17 15:24:38 -05:00
Calen Pennington
650f537763 Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests 
Make jasmine testing quieter
 2012-11-16 13:35:45 -08:00
Calen Pennington
3b2b8ad4fa Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests 
Capa Problem jasmine tests running independently
 2012-11-16 13:35:19 -08:00
Calen Pennington
719277876f Merge pull request #1051 from MITx/fix/cdodge/code-mirror-crash-on-style-blocks 
remove 'mode' property when creating a new CodeMirror control. This appe...
 2012-11-16 12:52:33 -08:00
Jay Zoldak
8d0abcb974 Merge branch 'feature/cale/cms-master' into feature/jzoldak/common-jasmine-tests 2012-11-16 15:10:19 -05:00
Jay Zoldak
ea4c0ed86a Refactor fixtures for capa problems. 2012-11-16 14:59:46 -05:00
Jay Zoldak
a10a3209aa Fix all but 4 broken tests. 2012-11-16 14:47:09 -05:00
Jay Zoldak
6ae0add931 Fix the new problem create statements in the describe blocks for the capa display spec. 2012-11-16 13:26:16 -05:00
Jay Zoldak
718ce4db28 Get Problem constructor working again, and copy the helper file from lms. 2012-11-16 13:02:38 -05:00
Don Mitchell
842bbe92d1 Everything tested and ready for Tom to fix 2012-11-16 12:53:49 -05:00
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
 2012-11-16 09:03:15 -05:00
Chris Dodge
975d75c116 When importing a course, we need to set the 'display_name' on the static tab module from the course module's policy. This isn't ideal, but the static tab definition on disk does not encapsulate the tab's display name on the LMS - we have to take it from the course 2012-11-15 21:45:20 -05:00
Chris Dodge
2a35132b2a When importing a course, we need to set the 'display_name' on the static tab module from the course module's policy. This isn't ideal, but the static tab definition on disk does not encapsulate the tab's display name on the LMS - we have to take it from the course 2012-11-15 21:44:20 -05:00
Chris Dodge
9ae8558382 put htmlmixed.js and css.js includes in CMS base.html so that we can support html mode in CodeMirror 2012-11-15 20:35:45 -05:00
Jay Zoldak
bf6a147c85 Modify rake file to read in spec and src files correctly and also add in the lms helper file for stubRequests, etc. 2012-11-15 15:43:39 -05:00
Chris Dodge
0be0889d9c in order to support CodeMirror mode of 'text/html' we also have to include 'htmlmixed.js' as well as 'css.js' from the CodeMirror distro 2012-11-15 15:21:40 -05:00
David Ormsbee
eff3a7c3c7 Batch together alter statements to minimize how long we lock the auth_users table 2012-11-15 14:55:21 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal 
Conflicts:
	lms/envs/aws.py
 2012-11-15 14:24:55 -05:00
Chris Dodge
39c33b42b2 remove 'mode' property when creating a new CodeMirror control. This appears to completely crash if the user puts in a <style ...> tag in the input. This was causing imported static tabs to not be editable 2012-11-15 13:56:42 -05:00
Calen Pennington
93cc17cf3b Starting to generate jasmine tests for common/lib 2012-11-14 15:03:55 -05:00
David Ormsbee
b6ce46ca52 Merge pull request #1040 from MITx/feature/victor/add-test-problems 
Add test files to full test course
 2012-11-14 10:02:06 -08:00
David Ormsbee
1ab7019607 Merge pull request #1044 from MITx/feature/brian/press-updates 
Feature/brian/press updates
 2012-11-14 10:01:16 -08:00
Chris Dodge
b779a421d7 check for the existence of static and static/subs directories 2012-11-14 12:37:17 -05:00
Brian Wilson
515d2f4b1e add press mentions for October, update missing logos, and add sorting. 2012-11-14 11:55:08 -05:00
Calen Pennington
630c2fa21e Make jasmine testing quieter 2012-11-13 10:55:17 -05:00
Victor Shnayder
23fa860f2a Add test files to full test course 
- I added them when playing with input types, but never merged them in
 2012-11-13 10:47:42 -05:00
Chris Dodge
1e598ad1f5 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint 2012-11-13 10:34:31 -05:00
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
 2012-11-13 10:22:42 -05:00
Victor Shnayder
3f95116ac1 only ask for hints if assessed as wrong 2012-11-12 16:23:58 -05:00
Victor Shnayder
6e5a6f9753 make textboxes read-only when that makes sense. 
- also make reset hide the original output
 2012-11-12 16:23:29 -05:00
Vik Paruchuri
39210fa95f Move point where input box is disabled 2012-11-12 14:20:44 -05:00
Vik Paruchuri
d5702fc712 Add in ability to define score points 2012-11-12 14:19:04 -05:00
Vik Paruchuri
ba8781ddf4 Modify to store scores instead of correct/incorrect, remove student ability to edit response 2012-11-12 14:07:06 -05:00
Victor Shnayder
0ad2154b86 merge in origin/master 2012-11-12 13:10:21 -05:00
Victor Shnayder
68fb5c9799 bugfixes re: button state 2012-11-12 13:03:12 -05:00
Victor Shnayder
4922ab33c0 hook up reset button 2012-11-12 12:43:55 -05:00
Victor Shnayder
0ec7043e05 mostly working version of self-assessment 
TODO:
* better css
* green checkmark
* reset button
* tests
 2012-11-12 12:14:12 -05:00