Chris Dodge
55c69a1e13
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
...
Conflicts:
lms/djangoapps/courseware/module_render.py
2012-11-06 14:20:59 -05:00
Calen Pennington
6212507b55
Merge pull request #1008 from MITx/ie8patch
...
merge to master
2012-11-06 06:18:01 -08:00
Arjun Singh
d9b553b378
Adding a better command for assigning roles.
2012-11-05 15:29:49 -08:00
Don Mitchell
7f4bb63dff
Final ie8 fixes hopefully. Now renders correctly for staff. Moved the
...
debug fns from per problem to part of courseware w/ context info passed
as parms. Known issues: ie8 complains that getlog is not defined if you
click on QA and does not show the debug info popup.
2012-11-05 13:55:09 -05:00
David Ormsbee
d1aa0a254e
Use one of our test courses when testing course permissions for the discussion client, because we now have course policy level overrides.
2012-11-02 17:21:00 -04:00
Calen Pennington
0bfa443520
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2012-11-02 11:09:19 -04:00
Chris Dodge
b788b9d659
add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.
2012-11-01 15:08:26 -04:00
David Ormsbee
8a453e99ca
Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view.
2012-11-01 04:37:16 -04:00
Chris Dodge
87dadd40c4
address some of Cale's feedback
2012-10-31 14:11:24 -04:00
Victor Shnayder
793354a0dc
remove (almost) all references to askbot.
2012-10-30 18:23:07 -04:00
Chris Dodge
34c442a1dc
removed unneeded trace log. Also don't need StudentModuleCache in 'about' section rendering
2012-10-30 16:04:51 -04:00
Chris Dodge
f0b4371c90
addressed Cale's feedback
2012-10-30 16:01:28 -04:00
Chris Dodge
ba9a03410b
remove unneeded debugging traces
2012-10-30 15:56:02 -04:00
Chris Dodge
ee1098c032
remove unused line
2012-10-30 15:37:40 -04:00
Chris Dodge
743f2b56dd
make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting
2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de
lots of tweeks to better support importing of existing courseware
2012-10-30 11:52:31 -04:00
Victor Shnayder
a155265409
minor whitespace + comment fixes
2012-10-29 23:44:38 -04:00
Chris Dodge
ba15735214
implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff
2012-10-25 14:27:26 -04:00
Chris Dodge
fec6c42adc
implement importing of course info sections as modules in the course
2012-10-24 20:55:04 -04:00
David Ormsbee
ab676d9d6d
Merge pull request #952 from MITx/vik/add_instrumentation
...
Vik/add instrumentation
2012-10-24 12:23:31 -07:00
Vik Paruchuri
dba04ab6d8
added docstrings
2012-10-24 15:14:06 -04:00
Vik Paruchuri
a75acffe01
made requested changes to statsd names, score bucket
2012-10-24 15:11:41 -04:00
Calen Pennington
2802302162
Make LMS access depend on which course run the access is occurring in, so that permissions can be based on the course run, rather than the whole course
2012-10-24 11:51:25 -04:00
Vik Paruchuri
952b3468cf
pep8 in views, remove instance state check
2012-10-23 19:07:06 -04:00
Vik Paruchuri
7dec1b3c3f
bugfix
2012-10-23 19:00:26 -04:00
Vik Paruchuri
57a78637f2
pep8 fixes and score bucketing
2012-10-23 18:58:11 -04:00
Vik Paruchuri
64b117a7c2
changed metric names, added into render page
2012-10-23 18:14:16 -04:00
Carlos Andrés Rocha
3e2cf18772
Add some extra console commands for handling user permissions
2012-10-23 16:11:07 -04:00
Calen Pennington
dab77e7d79
Switch to using staff group names that are only specified by org/course, rather than the full course_id
2012-10-23 13:40:50 -04:00
Calen Pennington
b52ed48221
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/xmodule/js/src/html/display.coffee
lms/envs/common.py
2012-10-23 13:38:11 -04:00
Carlos Andrés Rocha
3784c3ce18
Add fix for users with multiple licenses
2012-10-22 10:27:17 -04:00
Carlos Andrés Rocha
f890c1dccb
Use test database in licenses test instead of 6.002x
2012-10-19 17:55:55 -04:00
Carlos Andrés Rocha
e7c62b0fc6
Add migrations to license django application
2012-10-16 11:57:38 -04:00
Carlos Andrés Rocha
a8cedf8ab9
Update lms/djangoapps/licenses/views.py
...
Remove annoying print statements
2012-10-15 21:04:10 -03:00
Carlos Andrés Rocha
e9ec63e4b6
Add ajax endpoint to retrieve and assign course software licenses
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
3808ff85a8
Added django command to generate random serial numbers.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
9cf8c02dc6
Added import_serial_numbers command test.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
516c41f342
Added html view of serial numbers. Refactored code.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
b2de8199b7
Added licenses view helper functions.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
ed88708d71
Renamed models and commands for importing serial numbers.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
24d5c9162c
Created Django App with commands to import software license numbers per class.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
c5a148639d
Add announcement of UT joining edx and related changes
2012-10-15 06:57:50 -04:00
Chris Dodge
a47b2be8df
set position=0 when position=None. Discuss with Dave O.
2012-10-14 21:31:45 -04:00
Chris Dodge
4ac1a74117
when calling jump_to when location=<id-of-sequential> then Position is being computed as None. The redirect then yields a 404. Force Position to be 0 when Position=None
2012-10-14 21:29:00 -04:00
Carlos Andrés Rocha
f1120a1139
Removed unused import
2012-10-12 17:39:05 -04:00
Carlos Andrés Rocha
e8cd125701
Fix to read utf-8 enconded html files for custom course tabs
2012-10-12 17:36:19 -04:00
ichuang
fd5c7c622c
Merge pull request #862 from MITx/feature/victor/capa-ajax
...
Feature/victor/capa ajax
I'm happy with all the changes to inputtypes, modulo the minor comments.
I didn't read chemcalc.py closely, but the tests look good.
2012-10-12 13:51:10 -07:00
Victor Shnayder
19d3cb3870
Add a chemicalequationinput with live preview
...
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one. This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
2012-10-12 13:52:48 -04:00
Arjun Singh
71201a73b2
styles and tiny bit of logic for community tas
2012-10-12 04:54:56 -07:00
David Ormsbee
d0668043a5
Merge pull request #861 from MITx/feature/ichuang/dump_grades
...
add django management command for dumping grades to CSV file
2012-10-11 10:24:19 -07:00
