Rocky Duan
44f7b37bfb
refactored comment_client working
2012-08-12 12:56:55 -07:00
Rocky Duan
b7d3361894
Merge branch 'mergedtom' into refactor
...
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
2012-08-11 17:43:16 -07:00
Rocky Duan
de8c828fb3
changed comment_client module to be imported as cc
2012-08-11 17:42:08 -07:00
ichuang
da64c8f0a1
add xqa interface to staff_problem_info, make staff_debug a modal
...
window, add xqa modal window, add xqa_key to course metadata
2012-08-11 20:12:37 -04:00
Rocky Duan
86b53bb248
uh
2012-08-10 17:53:22 -07:00
kimth
d41f709c92
Moved xqueue_callback URLs into the course
2012-08-10 18:51:35 -04:00
ichuang
411e77e19d
ModuleSystem should get its DEBUG set from settings.DEBUG in module_render
2012-08-10 15:25:42 -04:00
ichuang
2e4f21ee3b
replace_static_urls should only be run once (currently twice, eg if
...
html is in a veritical)
2012-08-10 15:25:41 -04:00
Victor Shnayder
6882b4b53d
responding to review comments on #383
2012-08-10 11:42:54 -04:00
Victor Shnayder
a6148856b2
make the tests work around the 404 bug
2012-08-10 11:42:54 -04:00
Victor Shnayder
c3814a81fd
In-progress auth tests
...
* need to actually return 404 codes to clients when DEBUG=False
* add option to make nose more verbose and drop to pdb on error
2012-08-10 11:42:54 -04:00
Victor Shnayder
8e364e6d45
ensure float when computing module score
2012-08-10 11:42:54 -04:00
Victor Shnayder
c9fd7b22a0
Add instructor dashboard
...
* dashboard links to gradebook and dummy grade summary page
2012-08-10 11:42:53 -04:00
Victor Shnayder
43d6948f02
Fix links to student profile pages from gradebook
2012-08-10 11:42:53 -04:00
Victor Shnayder
15a4db1774
Only show enrolled students in course gradebook
...
* also added todo about need for pagination
2012-08-10 11:42:53 -04:00
Victor Shnayder
2005492f7f
Remove noisy debug message
...
* also adds a comment to lms/urls.py
2012-08-10 11:41:05 -04:00
Calen Pennington
5f44b08f9c
Merge pull request #382 from MITx/feature/victor/check-access-control
...
Did a quick security scan through views.
2012-08-10 07:59:24 -07:00
Victor Shnayder
8740ba8837
Did a quick security scan through views.
...
* we appear to be fairly consistent in using is_staff and has_staff_access_to_course
* cleaned up some docstrings and little code things as I went
* fixed small bug in change_enrollment view (check for non-anon user)
2012-08-10 10:43:20 -04:00
David Ormsbee
0d824c6c02
Move modx_dispatch URL calls into the course
2012-08-10 02:02:44 -04:00
Victor Shnayder
1c3038ff3a
Make accordion remember state
...
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
2012-08-09 19:47:08 -04:00
Mike Chen
3ae1de5ed9
Merge branch 'master' of github.com:MITx/mitx into ccp0101/playground
2012-08-09 12:52:15 -04:00
Mike Chen
46a7c51df5
remove voting arrows if one cannot vote
2012-08-09 12:12:43 -04:00
Calen Pennington
f2c8d5b427
Merge pull request #364 from MITx/MITx/feature/bridger/fast_course_grading
...
Even Faster Course Grading
2012-08-09 07:49:19 -07:00
kimth
58a1248d32
New external grader format: JSON-serialized dict
2012-08-09 08:29:12 -04:00
Bridger Maxwell
e4329c312d
Fixed log of error. Xmodules don't have ids, so I log the location instead.
2012-08-08 16:03:28 -04:00
Bridger Maxwell
3930dabdc9
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
2012-08-08 16:00:22 -04:00
Calen Pennington
6abc2d733f
Merge pull request #370 from MITx/feature/bridger/django1.4
...
Feature/bridger/django1.4
2012-08-08 12:52:33 -07:00
Mike Chen
b06e31d2ed
fix Close Thread showing for students and empty bracket in search bar
2012-08-08 14:51:49 -04:00
Rocky Duan
65f849637f
Merge branch 'ccp0101/moderation' into lol
...
Conflicts:
lms/urls.py
2012-08-08 14:39:10 -04:00
Matthew Mongeau
0b03834f51
XML based table of contents for books.
2012-08-08 14:13:20 -04:00
Mike Chen
eaf8279451
Merge branch 'lol' of github.com:dementrock/mitx into ccp0101/moderation
...
Conflicts:
lms/urls.py
2012-08-08 12:04:41 -04:00
Mike Chen
2b803b024e
fix MITx master bug in courseware.
2012-08-08 12:02:50 -04:00
Bridger Maxwell
14a35b9605
Upgrading to django 1.4.
2012-08-08 11:57:15 -04:00
Mike Chen
5e6261ebb1
courseware still not working..
2012-08-08 11:30:11 -04:00
Mike Chen
8627a5f33e
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-08 11:20:13 -04:00
Rocky Duan
2e45b8c3c6
Merge branch 'ccp0101/moderation' into lol
2012-08-08 10:46:11 -04:00
Rocky Duan
b1e1cd57d8
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-08 10:45:04 -04:00
Rocky Duan
18fcdc4be2
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation
2012-08-08 10:44:24 -04:00
Mike Chen
b2a048e6fc
limit permissions of a role to courses and fix bugs
2012-08-08 10:42:29 -04:00
Bridger Maxwell
696804da13
Changes from pull request comments.
2012-08-08 10:28:40 -04:00
Rocky Duan
c2f27a5f8e
some starting refactor ideas
2012-08-08 10:03:49 -04:00
Rocky Duan
f1dabe1575
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into lol
2012-08-07 18:55:34 -04:00
Rocky Duan
690d97f28b
fixed merge bugs
2012-08-07 18:49:59 -04:00
Rocky Duan
2fb02f1a73
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
lms/urls.py
2012-08-07 16:58:14 -04:00
Rocky Duan
272c7b8b0c
Merge branch 'master' into merge
2012-08-07 16:49:54 -04:00
Rocky Duan
2685a3b637
trending tags
2012-08-07 16:41:01 -04:00
Bridger Maxwell
ec04b0cb13
Changed yield_module_descendents to be stack-based, so it plays nicer with the profiler.
2012-08-07 16:16:31 -04:00
Rocky Duan
7ba3bdfd61
show recently active posts user's following
2012-08-07 16:16:23 -04:00
Arjun Singh
b9f2d4bc13
Remove coffee libraries (use the system coffee); don't set the OS NODE_PATH but rather just read it in once and then modify the temporary environments used when executing node.
2012-08-07 15:52:39 -04:00
Bridger Maxwell
a9d67c3e8d
Added has_score attribute to xmodule, for problem-like xmodules.
2012-08-07 15:20:47 -04:00
