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

95 Commits

Author SHA1 Message Date
Calen Pennington
029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
 2013-03-15 09:46:47 -04:00
Kevin Chugh
8d766c4b51 fix conflict 2013-03-13 21:01:37 -04:00
Your Name
8280c55992 pinning .1 2013-03-12 17:40:26 -04:00
Calen Pennington
2113541632 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
 2013-03-12 07:23:28 -04:00
Chris Dodge
18ee1018e6 optimize forum page rendering as we don't pre-compute the link urls to inline discussions. We can use jump_to urls and then figure out the link path if/when end-user clicks on it. This saves a lot of unnecessary round trips to the DB as path computation is expensive, especially when it being done for every discussion module in a course in a loop. 2013-03-10 11:11:17 -04:00
Calen Pennington
4fd1b93692 Fix bad merge in discussion utils 2013-03-08 12:56:17 -05:00
Calen Pennington
cec3475c9d Remove references to .definition and .metadata in modules 2013-03-06 18:07:56 -05:00
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-04 16:33:40 -05:00
Your Name
ff68853990 Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-21 13:30:24 -05:00
Calen Pennington
793bbfd351 Set up dev environment for testing xml vs mongo vs split_mongo modulestores 2013-02-13 14:04:21 -05:00
Victor Shnayder
6d9a9ec46f Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge" 
This reverts commit e4819a1b55, reversing
changes made to b6ec41cae0.

Now that we're ready to test again, need to revert the revert to put the filtering UI back in.
 2013-02-08 15:00:25 -05:00
Calen Pennington
4f555f6480 Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model 
Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/module_info_model.py
	cms/djangoapps/contentstore/tests/factories.py
	cms/djangoapps/contentstore/tests/test_course_settings.py
	cms/djangoapps/contentstore/views.py
	cms/djangoapps/models/settings/course_details.py
	cms/djangoapps/models/settings/course_grading.py
	cms/templates/edit_subsection.html
	common/djangoapps/mitxmako/shortcuts.py
	common/djangoapps/static_replace.py
	common/djangoapps/util/converters.py
	common/djangoapps/xmodule_modifiers.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/abtest_module.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/discussion_module.py
	common/lib/xmodule/xmodule/error_module.py
	common/lib/xmodule/xmodule/html_module.py
	common/lib/xmodule/xmodule/js/src/video/display.coffee
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	common/lib/xmodule/xmodule/raw_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_export.py
	common/lib/xmodule/xmodule/tests/test_import.py
	common/lib/xmodule/xmodule/video_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/lib/xmodule/xmodule/xml_module.py
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/templates/staff_problem_info.html
	lms/templates/video.html
	rakefile
 2013-02-07 15:12:30 -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
Victor Shnayder
2af06ef1d4 Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 66889b8724, reversing
changes made to 0dd9c24e74.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
 2013-02-06 20:29:17 -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
Your Name
d5b70d7bfc inline cohorting working 2013-02-05 18:38:06 -05:00
Kevin Chugh
3009acbb10 showing group names 2013-02-04 14:50:53 -05:00
Kevin Chugh
fcbd4bd1cd produce and consume group_id from dropdowns 2013-02-02 05:46:11 -05:00
Jay Zoldak
1f049410ae Add tests for django comment client utils 2013-01-29 14:34:02 -05:00
Victor Shnayder
ac8c59126d Add note about non-unique topic id across course runs bug 2013-01-24 15:12:53 -05:00
Calen Pennington
507d2021cd Remove unused reference to StudentModuleCache 2013-01-23 14:47:06 -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
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
7977491ddf WIP: LMS Courseware appears to be working 2012-12-28 14:51:50 -05:00
Calen Pennington
7e224f5847 Convert a bunch more references from metadata to fields 2012-12-28 14:45:46 -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
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
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
117c0b6927 Mark threads as read once they are fetched; change viewed to read 2012-09-20 00:24:36 -07:00
Rocky Duan
f6efa99f6c unread count tracking 2012-09-19 06:15:48 -07:00
David Ormsbee
0b3ae9052a Make the default topic a dict so it doesn't error on courses that don't specify topics 2012-09-18 19:19:08 -04:00
Ibrahim Awwal
a444166d98 Add a followed threads entry to the topic dropdown in the discussion sidebar. 
Also fixed up some random bugs with content_info, and changed pagination code a little. Needs comments service update for the subscribed threads API call.
 2012-09-18 04:09:38 -07:00
Arjun Singh
b5351cc584 Support legacy anonymity 2012-09-14 21:59:09 -07:00
Arjun Singh
033ce7ef42 Discussioninfo needs to be multicourse-friendly.. 2012-09-14 18:34:37 -07:00
David Ormsbee
ce9fc9ceab Don't explode if a forum content piece is by a user that doesn't exist 2012-09-14 17:25:12 -04:00
Arjun Singh
f656da46ec bump inline count, fix tiny bug for server startup 2012-09-14 06:00:01 -07:00
Arjun Singh
edf02dd90e Fix context links for the 123187th time 2012-09-14 04:07:04 -07:00
Arjun Singh
fff7bcc5a7 Remove more tags; anonymity to peers 2012-09-14 02:50:08 -07:00
Arjun Singh
e4c7a5ea97 Fix courseware context links; filter out unstarted topics. 2012-09-13 19:41:07 -07:00
Matthew Mongeau
1a402f7fda Mark responses and comments as staff 2012-09-12 11:09:36 -04:00
Arjun Singh
a900998145 Fix anonymity leak; fix editing when rendering from main page. 2012-09-12 04:32:32 -07:00
Ibrahim Awwal
8b7940f413 Fixed context links after searching for real, and removed some more dead code. 2012-09-11 03:40:33 -07:00
Ibrahim Awwal
fd6e30abfc Don't try to retrieve roles for anonymous posts. 2012-09-11 01:33:59 -07:00