Brian Wilson
b5378b04b3
change timer to calculate relative duration in javascript
2013-02-12 12:25:11 -05:00
Ned Batchelder
aa2d0ecaf2
We no longer need override_settings, Django has a better one.
2013-02-11 17:06:35 -05:00
David Ormsbee
75ff2bd6cb
Merge pull request #1456 from MITx/fix/cdodge/dangling-discussion-modules
...
Fix/cdodge/dangling discussion modules
2013-02-11 11:40:00 -08:00
Brian Wilson
f51876da6a
cosmetic changes
2013-02-08 13:42:54 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Brian Wilson
80e4944314
minor cleanup
2013-02-07 16:12:02 -05:00
Brian Wilson
cc11dc2aa3
switch to using timelimit module for Pearson test
2013-02-07 15:57:43 -05:00
David Ormsbee
1c07fae501
Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump
...
add instructor dashboard feature to download profile & problem state
2013-02-07 08:19:52 -08:00
Chris Dodge
faf7c64ea5
add try/catch and fallback to returning a path to the root of the course
2013-02-07 10:32:13 -05:00
ichuang
bf17341fdb
add select_related("profile")
2013-02-06 23:16:44 -05:00
Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
2013-02-06 20:29:17 -05:00
Victor Shnayder
884a7a61b9
Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 965e3b4c491a7d2a06a8
2013-02-06 20:27:01 -05:00
Kevin Chugh
1dd0ef274d
addressed somme comments in pull request and instructor fixes and blank group fix
2013-02-06 18:26:41 -05:00
Kevin Chugh
55c205b9b4
merged master
2013-02-06 17:13:52 -05:00
Brian Wilson
bfc4527590
Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages.
2013-02-06 15:23:11 -05:00
Chris Dodge
114d800c6a
need to make path_to_location a dictionary since it needs to be keyed by the location
2013-02-06 15:17:47 -05:00
Chris Dodge
5a25d7fa6e
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-discussion-modules
...
Conflicts:
lms/djangoapps/django_comment_client/utils.py
2013-02-06 14:05:56 -05:00
Chris Dodge
6ed2737c36
make LMS forum subsystem more robust in case of orphaned discussion modules. Given our draft/non-draft duality, we don't currently have a means to always do proper housekeeping at this point in time. However, we have to stop the LMS Forums from blowing up when encoutering one of these.
2013-02-06 13:32:50 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Diana Huang
95d3957377
Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule
...
Patch peer grading tab to work
2013-02-06 06:07:18 -08:00
Kevin Chugh
c7a133470d
inline discussions working
2013-02-05 22:43:09 -05:00
David Ormsbee
a3a886bd0f
Revert "Add tests for django-comment-client models" (which actually had
...
a model change as well)
This reverts commit 053547453e
2013-02-05 18:51:16 -05:00
David Ormsbee
119b4206a4
Revert "Fix permissions bug and add test cases for django comment client permissions."
...
This reverts commit e745087455
2013-02-05 18:42:01 -05:00
Your Name
d5b70d7bfc
inline cohorting working
2013-02-05 18:38:06 -05:00
Brian Wilson
1b465d1beb
implement testcenter_login
2013-02-05 18:01:55 -05:00
Vik Paruchuri
0133c7c669
Patch peer grading tab to work
2013-02-05 16:32:40 -05:00
Diana Huang
120aa3cd3b
Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule
...
Feature/vik/peer grading xmodule
2013-02-05 12:55:48 -08:00
Vik Paruchuri
ce87e6f221
Skip two tests
2013-02-05 14:57:59 -05:00
Vik Paruchuri
8027cc7024
Fix some issues with tests
2013-02-05 14:35:44 -05:00
Vik Paruchuri
134f2f7af7
Fix tests, bugfix for problem url error
2013-02-05 14:21:08 -05:00
Vik Paruchuri
e13de7543f
Test fixes, err response fixes, address review comments
2013-02-05 14:12:11 -05:00
Vik Paruchuri
34dc6e6320
Fix some issues with peer grading service
2013-02-05 13:37:55 -05:00
David Ormsbee
74c112e5cc
Merge pull request #1373 from MITx/feature/zoldak/django-comment-client-tests
...
Add unit tests for django comment client
2013-02-05 10:37:18 -08:00
Vik Paruchuri
7984c4dfcb
Move over grading service to xmodule
2013-02-05 13:10:56 -05:00
Calen Pennington
4d8165b2b6
Remove bad import of replace_urls
2013-02-05 11:06:46 -05:00
Calen Pennington
401f564e6a
Fix data directory passed to replace_static_urls
2013-02-05 11:06:46 -05:00
Calen Pennington
04879a83d3
Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible
2013-02-05 11:06:45 -05:00
Calen Pennington
b05ead864f
Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic""
...
This reverts commit c4f56620df
2013-02-05 11:06:45 -05:00
Vik Paruchuri
e8a690df5e
Update peer grading tests
2013-02-05 10:46:00 -05:00
Your Name
837f54c055
inline cohorting almost done
2013-02-04 20:10:08 -05:00
Vik Paruchuri
443c3eda4f
Tests for peer grading service may be fixed.
2013-02-04 18:37:28 -05:00
Vik Paruchuri
18814196f0
Make things slightly robust
2013-02-04 18:31:32 -05:00
Vik Paruchuri
725f0c632c
Remove get statements, fix module_render
2013-02-04 18:27:25 -05:00
Vik Paruchuri
bf97a6a9a9
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule
...
Conflicts:
lms/djangoapps/open_ended_grading/peer_grading_service.py
2013-02-04 17:55:55 -05:00
Vik Paruchuri
eb049bda9e
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging
2013-02-04 17:18:59 -05:00
Vik Paruchuri
7f96fbb3d1
Address review comments
2013-02-04 17:15:07 -05:00
Vik Paruchuri
c4c674367f
Remove unneccesary imports
2013-02-04 16:54:36 -05:00
Your Name
a8a9975914
Merge branch 'feature/kevin/groups_ui_changes' of github.com:MITx/mitx into feature/kevin/groups_ui_changes
2013-02-04 16:40:22 -05:00
Kevin Chugh
f7ba14ae5e
move group logic to get_threads
2013-02-04 16:31:28 -05:00
Brian Wilson
f8b7d5fad6
have timer redirect when it expires
2013-02-04 15:13:14 -05:00
