Commit Graph

101 Commits

Author SHA1 Message Date
Greg Price
e6ecb6ecfe Improve performance of forum views
Avoid recomputing course module information for every thread, which
should dramatically improve the performance of high-percentile latency
queries.

JIRA: FOR-250
2013-10-28 13:04:52 -04:00
e0d
83a490c79d fixing bug noticed in production 2013-06-06 16:04:42 -04:00
Chris Dodge
fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py
2013-05-20 10:22:36 -04:00
Your Name
867d69ed12 update views.py to add docstrings and change exception name to address pylint errors 2013-05-16 18:13:59 -04:00
Jay Zoldak
71626f4ff6 Pep8 fixes of django_comment_client code 2013-05-16 15:57:34 -04:00
Jay Zoldak
ed5ad46192 Revert "Revert "fix merge conflict""
This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee
2013-05-16 10:29:33 -04:00
Kevin Chugh
c410da91de fix coffeescript error 2013-05-16 10:29:32 -04:00
Chris Dodge
a92910db20 update lms to reflect where comment models.py is now in common 2013-05-06 16:23:32 -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
Your Name
068e02efd5 make unflag all permissions match javascript 2013-04-22 17:51:48 -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
0e8ef28347 flagging almost done 2013-04-05 13:23:09 -04:00
Kevin Chugh
5534d8bdce fix mega merge conflicts 2013-03-29 07:33:52 -04:00
e0d
39d451d92a Merge pull request #1687 from MITx/hotfix/edz/pinning
Allow backwards compatibility for forums pinning UI.
2013-03-19 09:31:14 -07:00
Your Name
a761e2e829 make pinning backward compatible 2013-03-15 12:38:28 -04:00
Your Name
470e402723 patch for backward compatibility 2013-03-15 10:51:34 -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
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
Valera Rozuvan
8b0c30e69f Fixed small typo. 2013-03-07 17:48:40 +02:00
Calen Pennington
cec3475c9d Remove references to .definition and .metadata in modules 2013-03-06 18:07:56 -05:00
Your Name
a9804a3349 proper tab 2013-03-04 10:57:37 -05:00
Kevin Chugh
949c95ea00 better fix 2013-03-02 19:51:59 -05:00
Your Name
32e0c580f0 fix 2013-03-02 19:50:14 -05:00
Your Name
e1ef6a8323 clean up commments 2013-03-01 16:43:55 -05:00
Your Name
b7a6eadca4 new cohorts tested 2013-03-01 16:33:27 -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
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
Victor Shnayder
884a7a61b9 Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes"
This reverts commit 965e3b4c49, reversing
changes made to 1a7d2a06a8.

I accidentally merged this before it was ready.  This was silly, so now I'm undoing it.  We'll need to revert the revert later.
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
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Kevin Chugh
f7ba14ae5e move group logic to get_threads 2013-02-04 16:31:28 -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
3fa67c1425 allow moderators and students to select cohort on post creation 2013-01-31 17:05:15 -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
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
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
59b3dc61a2 lms producing grouped content 2013-01-23 16:25:26 -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
50db11a647 urls and views for comment flagging 2012-12-05 17:08:29 -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
57b70092e8 update front end to handle flagging 2012-11-20 13:39:33 -05:00
Arjun Singh
edf02dd90e Fix context links for the 123187th time 2012-09-14 04:07:04 -07:00