Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,363 Commits 1 Branch 0 Tags
e8f067de8f2be4c7864ad1bdf4e0794de175e0dc
Commit Graph

448 Commits

Author SHA1 Message Date
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
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
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
Your Name
837f54c055 inline cohorting almost done 2013-02-04 20:10:08 -05:00
ichuang
630607d345 fix forum management commands (assign_default_role moved); add reload_forum_users 2013-02-05 00:24:43 +00:00
Kevin Chugh
f7ba14ae5e move group logic to get_threads 2013-02-04 16:31:28 -05:00
Kevin Chugh
3009acbb10 showing group names 2013-02-04 14:50:53 -05:00
Kevin Chugh
69225f6435 cohort ID showing, have to translate to display text 2013-02-04 08:33:33 -05:00
Kevin Chugh
fcbd4bd1cd produce and consume group_id from dropdowns 2013-02-02 05:46:11 -05:00
Your Name
8fd32ed502 update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names 2013-02-01 13:01:54 -05:00
Your Name
f2f7459656 remove more prints 2013-01-31 17:24:08 -05:00
Your Name
c25cd33214 remove print 2013-01-31 17:22:54 -05:00
Your Name
3fa67c1425 allow moderators and students to select cohort on post creation 2013-01-31 17:05:15 -05:00
Your Name
1fc26de945 merge master 2013-01-30 15:19:43 -05:00
Your Name
5bfd2c33b0 send cohort to post view context 2013-01-29 17:34:52 -05:00
Your Name
3404011f16 update front end to support selection and display of cohort ids 2013-01-29 17:23:08 -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
Calen Pennington
507d2021cd Remove unused reference to StudentModuleCache 2013-01-23 14:47:06 -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