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

83 Commits

Author SHA1 Message Date
Diana Huang
c6f63140a2 Hide the API key during logging. 2013-05-07 16:38:38 -04:00
Diana Huang
2df3fe9344 Revert "fix merge conflict" 
This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.
 2013-04-26 12:40:35 -04:00
Diana Huang
5560a4add4 Revert "Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs" 
This reverts commit 57427f9ac5, reversing
changes made to 37621c26cd.
 2013-04-26 12:40:02 -04:00
Your Name
67f57a7145 use new API verbs 2013-04-23 13:28:23 -04:00
Your Name
7994e1b344 pep8 fixes 2013-04-22 12:53:30 -04:00
Kevin Chugh
93978da87c fixes cleanup 2013-04-09 14:57:43 -04:00
Kevin Chugh
24095679a6 add back comment response flagging 2013-04-05 19:04:18 -04:00
Kevin Chugh
de7c511328 flagging working again 2013-04-05 16:39:22 -04:00
Kevin Chugh
0e8ef28347 flagging almost done 2013-04-05 13:23:09 -04:00
Kevin Chugh
daa0cd22d5 filter implemented for flagged 2013-04-01 23:16:22 -04:00
Kevin Chugh
5534d8bdce fix mega merge conflicts 2013-03-29 07:33:52 -04:00
Calen Pennington
6b64b4214f Make relative imports explicitly relative 2013-03-15 11:23:22 -04:00
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
Your Name
7450128064 update coffeescript 2013-03-13 12:52:07 -04:00
Kevin Chugh
07534a7231 fix thread/thread id issue 2013-03-13 09:02:57 -04:00
Your Name
8280c55992 pinning .1 2013-03-12 17:40:26 -04: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
Ned Batchelder
7c8a90229e Use 'is None' and 'is not None' 2013-03-04 10:57:25 -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
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
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Kevin Chugh
3009acbb10 showing group names 2013-02-04 14:50:53 -05:00
Kevin Chugh
59b3dc61a2 lms producing grouped content 2013-01-23 16:25:26 -05:00
Calen Pennington
01411ae66e WIP: Trying to get tests working 2012-12-28 14:48:47 -05:00
Kevin Chugh
258b1fe9a5 thread responses create fixed 2012-12-06 22:12:17 -05:00
Kevin Chugh
deb3888a84 thread response flagging 2012-12-06 14:13:54 -05:00
Kevin Chugh
70b0b5beb8 update models 2012-12-06 10:43:51 -05:00
Kevin Chugh
4139f702ff debugging thread 2012-12-06 10:30:06 -05:00
Kevin Chugh
50db11a647 urls and views for comment flagging 2012-12-05 17:08:29 -05:00
Your Name
033ed6ce92 flagging done except returning abuse flaggers 2012-12-02 15:05:03 -05:00
Kevin Chugh
4dee832f35 convert flagging to one flag 2012-12-02 13:04:27 -05:00
Your Name
4b017e711d updated models and vies f for flagging 2012-11-20 17:00:16 -05:00
Your Name
fb6a07c812 allow flagging for abuse and spoilers 2012-11-16 18:39:54 -05: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
6132b9b207 Alter some css; don't send the user if there is no user when retrieivng a thread 2012-09-20 02:11:27 -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
Arjun Singh
c83a27ec02 Merge with lms pre-update fix 2012-09-19 06:17:19 -07:00
Rocky Duan
f6efa99f6c unread count tracking 2012-09-19 06:15:48 -07:00
Arjun Singh
eab1737e83 Prepare lms for upcoming discussion service changes. 2012-09-19 05:57:30 -07: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
8f63ec4d44 merge 2012-09-14 02:56:34 -07:00
Arjun Singh
fff7bcc5a7 Remove more tags; anonymity to peers 2012-09-14 02:50:08 -07:00
Ibrahim Awwal
910be64aa2 Make pagination respect any filters or searches or sort keys. Searches and filters will 
query the comment service to get their results rather than filtering threads that have
already been loaded.
 2012-09-14 02:13:53 -07:00
Arjun Singh
a83b9322ae Allow for course subscriptions 2012-09-13 16:03:19 -07:00
Arjun Singh
8bad4c8dbc Allow for course subscriptions 2012-09-13 16:00:48 -07:00
Arjun Singh
7ad9b39b98 Merge master 2012-09-10 15:33:59 -07:00
Arjun Singh
36b3524552 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-06 18:22:15 -10:00
Matthew Mongeau
366e9c674b Code for displaying endorsed checkmark. 2012-09-06 17:46:04 -04:00