Ned Batchelder
aa2d0ecaf2
We no longer need override_settings, Django has a better one.
2013-02-11 17:06:35 -05: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
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
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
Jay Zoldak
1a398980d0
Add tests for diango-comment-client middleware
2013-01-29 14:47:05 -05:00
Jay Zoldak
053547453e
Add tests for django-comment-client models
2013-01-29 14:45:35 -05:00
Jay Zoldak
d81da9df4d
Add tests for django comment client mustache helpers
2013-01-29 14:44:37 -05:00
Jay Zoldak
593b038780
Add tests for django-comment-client helpers
2013-01-29 14:43:28 -05:00
Jay Zoldak
1f049410ae
Add tests for django comment client utils
2013-01-29 14:34:02 -05:00
Jay Zoldak
e745087455
Fix permissions bug and add test cases for django comment client permissions.
2013-01-29 14:30:15 -05:00
Victor Shnayder
39a9c47512
make links look like links
2013-01-29 11:33:26 -05:00
Victor Shnayder
6847779f22
Merge remote-tracking branch 'origin/master' into feature/victor/cohorts
...
Conflicts:
common/djangoapps/student/models.py
2013-01-26 12:37:26 -05:00
Victor Shnayder
00dd3ad9f8
Fix some of the test bugs. Still more to fix.
2013-01-25 15:40:13 -05:00
Victor Shnayder
66934ce220
Address Dave's comments on https://github.com/MITx/mitx/pull/1350
2013-01-25 13:33:19 -05:00
Kevin Chugh
07c1999a95
prep for staging
2013-01-24 21:43:36 -05:00
Victor Shnayder
771a55a631
turn forums on in test.py
...
- this may not be a good idea, but needed for testing cohorts for now...
2013-01-24 18:35:34 -05:00
Victor Shnayder
d17aedf3b4
the reverse isn't working for some reason... need to figure it out
2013-01-24 18:08:51 -05:00
Victor Shnayder
0b7e7b35dc
stub out django comment client test system
2013-01-24 17:33:40 -05:00
Chris Dodge
dfbe7dd4f9
fix merge problem. assign_default_role() ended up being defined twice as that code was added in both master and cms-master branches, but the merge didn't pick it up as a conflict
2013-01-24 15:54:02 -05:00
Victor Shnayder
9e84ae14d4
Started integration work with Kevin's cohort changes
...
- Create new cohorts.py file
- moved code there from models.py
- implemented necessary functions.
Next: testing :)
2013-01-24 15:14:33 -05:00
Victor Shnayder
ac8c59126d
Add note about non-unique topic id across course runs bug
2013-01-24 15:12:53 -05:00
Kevin Chugh
def2d8adf2
fix cohorts in create, and read, and update regular expressions to fix courses with periods not working in General commentable
2013-01-24 14:20:18 -05:00
Kevin Chugh
1bd9366e40
Merge remote-tracking branch 'origin/master' into feature/kevin/groups
2013-01-23 16:26:06 -05:00
Kevin Chugh
59b3dc61a2
lms producing grouped content
2013-01-23 16:25:26 -05:00
Chris Dodge
575ff02f8a
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-master-merge4
...
Conflicts:
jenkins/test.sh
2013-01-18 10:26:44 -05:00
Chris Dodge
c6276c8394
only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata
2013-01-17 23:58:07 -05:00
Chris Dodge
22695d80c7
Merge branch 'master' into feature/cdodge/cms-master-merge4
...
Conflicts:
common/djangoapps/student/models.py
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/xml_module.py
jenkins/test.sh
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/django_comment_client/models.py
requirements.txt
2013-01-17 09:15:37 -05:00
Calen Pennington
9853c6323f
Remove circular dependencies that connect student.models and django_comment_client
...
Includes removal of "from django_comment_client.models import Role" from common/djangoapps/student/models.py
Conflicts:
common/djangoapps/student/models.py
2013-01-10 23:32:48 -05:00
Chris Dodge
d4f30b378e
remove commented out line and add a new comment. also remove debugging trace output
2013-01-09 16:05:09 -05:00
Chris Dodge
e11706ef07
change over the 'get all discussion models' to use get_items() which is better supported in Mongo-backed stores
2013-01-09 15:53:22 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
Calen Pennington
96daea5c0a
Ignore discussion modules with missing keys when building the global discussion info
2012-12-12 09:40:31 -05:00
Brian Wilson
8d0eb7f1a1
Respond to feedback (esp. use of .format())
2012-11-26 15:43:18 -05:00
Brian Wilson
57cb8c1e21
Add unit tests
2012-11-20 15:56:18 -05:00
Brian Wilson
619ac10069
Merge remote-tracking branch 'origin/master' into feature/brian/dashboard-manage-mods
2012-11-20 15:46:49 -05:00
Brian Wilson
ee7a8494e6
finish basic implementation of forum admin on instructor dash
2012-11-19 14:59:34 -05:00
Arjun Singh
d9b553b378
Adding a better command for assigning roles.
2012-11-05 15:29:49 -08: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
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
Carlos Andrés Rocha
3e2cf18772
Add some extra console commands for handling user permissions
2012-10-23 16:11:07 -04:00
Arjun Singh
71201a73b2
styles and tiny bit of logic for community tas
2012-10-12 04:54:56 -07:00
Ibrahim Awwal
ad7e84ad0e
Fix forums in IE9; apparently it's just very strict about the charset being a valid identifier. utf8 is not a valid identifier, utf-8 is.
2012-09-22 23:01:34 -07:00
Arjun Singh
8fb6204073
Better fix for trailing slash
2012-09-21 05:42:51 -07:00
Ibrahim Awwal
939b927fbd
Merge branch 'master' into feature/ibrahim/followed-threads
...
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
2012-09-20 23:55:13 -07:00
Arjun Singh
55a9da933a
DRY things slightly
2012-09-20 02:15:51 -07:00
Arjun Singh
3567e23a9d
Unneeded imports
2012-09-20 02:13:35 -07:00
