Carlos Andrés Rocha
3a4b626e62
Remove unused code from accounts login page
2012-12-20 14:19:06 -05:00
Chris Dodge
b40a8a3e9e
implement course clone and delete functionality from the command line
2012-12-20 13:55:15 -05:00
Brian Wilson
d5bd2313c1
fix migrations, removing one field and making another nullable. Update registration page to allow for editing only demographics.
2012-12-20 04:16:00 -05:00
Carlos Andrés Rocha
5d85fab283
Fix django auth login redirection
...
The django authentication decorator login_required, redirects to
settings.LOGIN_URL. If it is missing, it redirects to /accounts/login.
We did not have the setting enable, not a proper page where to
redirect. This cause users not logged in to see a 404 error when
accessing courseware directly, by using a link or a bookmark.
[#41499213 ]
2012-12-19 18:48:30 -05:00
Brian Wilson
ee99080687
add additional fields to testcenter user and update test center registration.
2012-12-19 16:53:13 -05:00
Diana Huang
fa97a6a528
Fix the font size
2012-12-19 16:04:47 -05:00
Diana Huang
ce9229fac6
Merge branch 'master' into feature/diana/rubric-input
2012-12-19 13:17:10 -05:00
Diana Huang
728103056d
Move rubric into a subset of problem in CSS.
2012-12-19 13:16:35 -05:00
Diana Huang
11d5eea2b9
Add in CSS updates and fixes to the template so that it will work.
2012-12-19 11:52:37 -05:00
Bridger Maxwell
f23bf85199
Added config to grader to hide averages of pset scores.
2012-12-19 11:44:32 -05:00
David Ormsbee
8373ee4bf6
Basic support for freeform advertised_start dates like 'Spring'
2012-12-19 04:01:37 -05:00
Brian Wilson
f472ac60f5
minor tweaks to test center registration
2012-12-19 00:21:49 -05:00
Brian Wilson
f912ffe8a2
add persistence of testcenter_user registration
2012-12-18 18:31:41 -05:00
Brian Wilson
bc40a7f127
make test-reg dialog non-modal, and pass course_id in URL. Add to course info.
2012-12-18 16:16:55 -05:00
Diana Huang
8a0dae01f0
Add in some sorting and validation of the options list
2012-12-18 14:32:10 -05:00
Diana Huang
dfe438dc73
Initial work on the rubric input type including the most basic parsing
...
without error handling
2012-12-18 13:02:17 -05:00
Brian Wilson
c7d379beb6
add first pass at wiring test registration dialog
2012-12-18 03:20:02 -05:00
David Ormsbee
0ddea6d0ae
Merge pull request #1114 from MITx/feature/alex/video-timeframe-mitx
...
Feature/alex/video timeframe mitx
2012-12-17 13:20:47 -08:00
Jay Zoldak
cc54c37359
Exclude settings.py files from coverage reports and configure titles for the reports.
2012-12-17 15:00:11 -05:00
chrisndodge
c407012f2d
Merge pull request #1168 from MITx/bug/dhm/dec12
...
Import default grading_policy was setting it to a unicode empty string
2012-12-17 10:17:23 -08:00
Calen Pennington
c546c36858
Merge pull request #1147 from MITx/fix/zoldak/cms-jasmine
...
Do not copy already compiled coffee to js files from xmodule video and a...
2012-12-17 09:39:43 -08:00
Don Mitchell
e2526a37d3
Import default grading_policy was setting it to a unicode empty string
...
rather than an empty dict and thus screwing up later updates.
2012-12-17 11:50:40 -05:00
Chris Dodge
d18f42224c
fix crash of custom tags when running against Mongo datastores. Mongo's 'system' does not have a course_id attribute defined, which makes it asymmetric to XmlFilesystem store
2012-12-17 10:41:54 -05:00
chrisndodge
ea38482946
Merge pull request #1156 from MITx/feature/christina/misc
...
Bug fix for Studio #55 .
2012-12-14 09:00:38 -08:00
cahrens
dd7ed956dd
Bug fix for Studio #55 .
2012-12-14 11:37:45 -05:00
chrisndodge
d965221ec7
Merge pull request #1135 from MITx/bug/btalbot/cms-tooltips
...
debugged tooltip latency/vanishing issue
2012-12-14 06:26:48 -08:00
Jay Zoldak
c485e441a9
Do not copy already compiled coffee to js files from xmodule video and also do not save them in git
2012-12-13 14:26:27 -05:00
Chris Dodge
10b417c85e
initial checkin of export
2012-12-13 11:53:52 -05:00
chrisndodge
6ab97b6fd9
Merge pull request #1125 from MITx/feature/dhm/cms-settings
...
Feature/dhm/cms settings
2012-12-13 06:52:49 -08:00
Brian Talbot
caf143514c
debugged tooltip latency/vanishing issue
2012-12-12 14:11:30 -05:00
Christina Roberts
c87eb08b1e
Bug fix for Lighthouse #22 .
...
html names are automatically converted to the symbols they describe.
2012-12-12 12:57:31 -05:00
Chris Dodge
95c6719447
initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from
2012-12-12 10:57:06 -05:00
Don Mitchell
a46c1f4883
Updated underscore (using _.invert())
...
The scss junk comes from trying to sync w/ several branches. I believe
it's right but mostly unnecessary (surprised it showed up).
Debugged the merge w/ cms-master
Fixed grace period to be absolute time difference not a date on the
client side.
2012-12-11 14:18:13 -05:00
Diana Huang
3b805fac1a
Merge pull request #1123 from MITx/bugfix/victor/open-ended-parsing
...
Fix for issues in open ended parsing
2012-12-11 10:24:53 -08:00
Vik Paruchuri
b4fffc798c
Fix for issues in open ended parsing
2012-12-11 13:14:34 -05:00
Chris Dodge
0e3a022086
fix broken tests from master -> CMS-master merge. Namely the change to unicode strings when reading files off disk. Also there was some work collisions on course_loads which removed Mongo testing. Make it so that explicitly test both XMLFilestores as well as Mongo
2012-12-11 11:21:08 -05:00
Don Mitchell
0a91a98dd0
Merge remote-tracking branch 'origin/feature/cale/cms-master' into
...
feature/dhm/cms-settings
Conflicts:
cms/djangoapps/contentstore/course_info_model.py
cms/djangoapps/contentstore/views.py
cms/static/js/models/course_info.js
cms/static/js/template_loader.js
cms/static/js/views/course_info_edit.js
cms/templates/base.html
cms/templates/course_info.html
cms/urls.py
2012-12-11 10:55:10 -05:00
Don Mitchell
39024a7fee
Grading mostly working
2012-12-10 16:32:33 -05:00
Christina Roberts
6acae5b440
Show error if organization name has invalid characters
2012-12-10 15:19:34 -05:00
Victor Shnayder
df578de11f
Merge pull request #1119 from MITx/diana/open-ended-response-styling
...
Updates to the styling of open ended problems
2012-12-10 11:36:04 -08:00
Vik Paruchuri
ab84042435
Fix raised error
2012-12-10 14:24:00 -05:00
Diana Huang
7279d11cf2
Add a reload button to open-ended input problems
2012-12-10 14:16:00 -05:00
Victor Shnayder
ed1f4bdd85
Check for none.
2012-12-10 14:10:19 -05:00
Diana Huang
3156c2b393
Add icon to the grading message
2012-12-10 12:29:46 -05:00
Christina Roberts
495b58241c
Remove 'name' property if it exists in an AssignmentFormatGrader. Don and I decided to do this instead of throwing an xlint warning and forcing authors to delete the name property.
2012-12-10 11:50:21 -05:00
Diana Huang
cc72870aac
Make oepn-ended responses and self-assessment answers use
...
the same CSS
2012-12-10 11:00:28 -05:00
chrisndodge
e1c452bc08
Merge pull request #1113 from MITx/feature/dhm/course-info
...
move the underscore tempaltes to /static/client-templates and update the...
2012-12-10 07:17:19 -08:00
Chris Dodge
79e48dde97
move the underscore tempaltes to /static/client-templates and update the references
2012-12-10 10:01:08 -05:00
chrisndodge
a4ed3a7ba9
Merge pull request #1088 from MITx/feature/dhm/course-info
...
Course info style and implementation
2012-12-10 05:59:59 -08:00
David Ormsbee
e3b4d78d87
IE7 compatibility: no trailing commas in arrays, including the third party json2.js lib because IE<8 has no JSON object.
2012-12-07 16:03:05 -05:00
