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

19226 Commits

Author SHA1 Message Date
Александр
01b5992372 comment outputs 2012-11-22 18:53:35 +02:00
Александр
4b4b2c9927 added documentation, tests, and rounding to closes 0.05 value 2012-11-22 18:44:31 +02:00
Valera Rozuvan
3e8e576e28 Slight change in caption for lattice select. 2012-11-22 16:52:59 +02:00
Valera Rozuvan
37714d45ac Merge branch 'feature/alex/crystallography-update-mitx' of github.com:MITx/mitx into feature/alex/crystallography-update-mitx 2012-11-22 13:56:00 +02:00
Valera Rozuvan
19c463b739 Removed radio buttons for selecting the intersection type from crystallography template. 2012-11-22 13:55:50 +02:00
Александр
166ff823a7 removed hidden parameter to template, style='hidden' is set by default for input 2012-11-22 12:53:21 +02:00
Don Mitchell
f0c94a2c7e Beginning test of details tab. 2012-11-21 15:17:18 -05:00
Александр
111667defd UI delta and tests: 2012-11-21 19:02:40 +02:00
Александр
33159824a5 added test for lattices 2012-11-21 18:02:48 +02:00
Александр
d5dd725537 miller indices calculation 2012-11-21 17:53:51 +02:00
Valera Rozuvan
aaeffa5316 Updated template for crystallography so that it corresponds to the cnahges made in the JS part. 2012-11-21 16:52:17 +02:00
Don Mitchell
339949f934 Another checkpoint before pull/merge 2012-11-20 11:37:14 -05:00
Victor Shnayder
f8dc85b6f8 oops. used wrong variable name. 2012-11-20 10:28:47 -05:00
Victor Shnayder
5a03b53a2f cert bugfix: handle students who don't have a grade 2012-11-20 09:20:03 -05:00
Valera Rozuvan
a3db017580 Updated crystallography template to reflect changes made in the JS part. 2012-11-20 14:19:48 +02:00
Don Mitchell
241c9bb1ac Checkpoint to rebase 2012-11-19 16:02:30 -05:00
Don Mitchell
a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2012-11-19 16:00:27 -05:00
Chris Dodge
ec6b1a12e9 insert the xmodule.coffee dependency into HTMLSnippet().get_javascript(). This allows us a single point to define this dependency. 2012-11-19 15:46:57 -05:00
Carlos Andrés Rocha
8df425e5e8 Add backend for displaying news on the student dashboard 
[#39472239]
 2012-11-19 13:06:36 -05:00
Victor Shnayder
d723bb7103 simpify process_survey_link 2012-11-19 11:39:43 -05:00
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