Brian Talbot
6014a7a299
Merge remote-tracking branch 'origin/feature/cale/cms-master' into feature/btalbot/cms-settings
...
Conflicts:
cms/djangoapps/contentstore/views.py
2012-11-15 16:51:53 -05:00
Brian Talbot
4c220ea420
in progress discussion work
2012-11-15 16:45:16 -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
Brian Talbot
1a297674ce
added in fields for problems and discussions portions of CMS settings
2012-11-15 14:31:16 -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
David Ormsbee
dbe7346aae
Merge pull request #1050 from MITx/bridger/feature/progress_percent_fix
...
Fixed redunant rounding of final grade percent, which was causing floating point weirdness.
2012-11-15 10:29:24 -08:00
Bridger Maxwell
ba57e8a7a5
Fixed redunant rounding of final grade percent, which was causing floating point weirdness.
2012-11-15 13:24:19 -05:00
Chris Dodge
d21095367a
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint
2012-11-15 13:16:02 -05:00
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
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
