Commit Graph

15929 Commits

Author SHA1 Message Date
Jay Zoldak
0654665b20 Enable XModule factories to work with the currently version of Factory Boy at PyPI (1.2.0) so that the code will work with 'pip install factory_boy' 2012-11-15 11:40:29 -05:00
John Jarvis
10c623d133 Django commands for certificates
* Removing the command to find unicode names since it was only used for
  testing
* ungenerated_certs will now by default run through all courses that
  have ended.  a course option can be used to run on one course
* gen_cert_report added which will summarize certificate states
  for all courses that have ended
2012-11-14 21:41:17 -05:00
Piotr Mitros
660481bee5 Better URL 2012-11-14 20:33:29 -05:00
Piotr Mitros
92ce825990 Analytics experiments 2012-11-14 18:55:20 -05:00
Jay Zoldak
edb9f8ce40 Merge branch 'feature/cale/cms-master' into feature/jzoldak/cms-unit-testing 2012-11-14 15:16:17 -05:00
Jay Zoldak
6f5b3fa1bb Create factory for Xmodule items 2012-11-14 15:12:09 -05:00
Calen Pennington
93cc17cf3b Starting to generate jasmine tests for common/lib 2012-11-14 15:03:55 -05:00
Jay Zoldak
58fef4a32a Create factory for courses 2012-11-14 14:52:24 -05:00
Brian Talbot
65869461f8 finalized layout and styling for course details and faculty settings 2012-11-14 14:50:48 -05:00
chrisndodge
a1a3b92517 Merge pull request #1046 from MITx/fix/cdodge/asset-embed
Change the Embed column in assest index page to just display the URL
2012-11-14 10:38:26 -08:00
Chris Dodge
5c3db6f502 Change the Embed column in assest index page to just display the URL 2012-11-14 13:35:54 -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
08d9cd7e79 clean up commented-out links on main page 2012-11-14 12:01:04 -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
Calen Pennington
5611fce3be Create the test_root/log directory on git checkout 2012-11-13 10:38:07 -05:00
Calen Pennington
3c90e2927a Create the test_root/log directory on git checkout 2012-11-13 10:35:54 -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
Calen Pennington
eb92ad1fd8 Merge pull request #1032 from MITx/feature/jzoldak/cms-unit-testing
Feature/jzoldak/cms unit testing
2012-11-13 07:08:52 -08:00
Jay Zoldak
a060b8de9c Use xmodule.templates instead of hard coding them in the test 2012-11-13 08:35:22 -05:00
Brian Wilson
f9f5850a55 update press page mentions through September, and home page pointers for early November. 2012-11-12 23:14:20 -05:00
Arjun Singh
5f97533caa add meta tag for google verification 2012-11-12 13:52:58 -08:00
Victor Shnayder
f54d424124 Merge pull request #1038 from MITx/vik/add_self_assessment
Vik/add self assessment
2012-11-12 13:35:29 -08:00
Victor Shnayder
3f95116ac1 only ask for hints if assessed as wrong 2012-11-12 16:23:58 -05:00
Victor Shnayder
92ab5af627 bigger error messages 2012-11-12 16:23:40 -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
b378af87be Merge pull request #1011 from MITx/vik/add_self_assessment
Vik/add self assessment
2012-11-12 10:21:48 -08:00
Victor Shnayder
6a313fd562 more css tweaks 2012-11-12 13:17:26 -05:00
Victor Shnayder
0ad2154b86 merge in origin/master 2012-11-12 13:10:21 -05:00
Victor Shnayder
2b55c5906d css tweaks 2012-11-12 13:09:16 -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
John Jarvis
1e956d448f Do not display the grade when student is not passing 2012-11-10 02:18:59 -05:00
John Jarvis
ca6cfe4247 http->https 2012-11-09 23:40:18 -05:00
jarv
50415acbff Merge pull request #1037 from MITx/fix/rocha/dashboard-without-certificates
Fix syntax on dashboard template
2012-11-09 18:42:39 -08:00
Carlos Andrés Rocha
5f5f56bbbd Fix syntax on dashboard template 2012-11-09 21:40:55 -05:00
jarv
e37a71b67b Merge pull request #1036 from MITx/fix/rocha/dashboard-without-certificates
Quickfix to render the dashboard when there is no certificate db tables
2012-11-09 18:01:16 -08:00
Carlos Andrés Rocha
8c2cbede9e Quickfix to render the dashboard when there is no certificate db tables 2012-11-09 20:58:02 -05:00
Carlos Andrés Rocha
39a5b6ebde Merge pull request #1035 from MITx/feature/jarv/cert-feature-flag
only check cert_status when certificates feature flag is enabled
2012-11-09 17:32:05 -08:00
John Jarvis
157c98a79d only check cert_status when certificates feature flag is enabled 2012-11-09 20:31:05 -05:00
jarv
6857dae0eb Merge pull request #1034 from MITx/feature/rocha/cert
Feature/rocha/cert
2012-11-09 15:54:12 -08:00
John Jarvis
fc32032bd1 Cleanup django-admin commands 2012-11-09 18:53:29 -05:00