Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,302 Commits 1 Branch 0 Tags
5e433cda2e7b061a06500a0a3e4e1d4d7cfafcf1
Commit Graph

308 Commits

Author SHA1 Message Date
Kevin Chugh
8d766c4b51 fix conflict 2013-03-13 21:01:37 -04:00
Your Name
97eb7eb58b remove whitespace 2013-03-13 19:07:46 -04:00
Your Name
117be695cb candidate without inline 2013-03-13 18:40:10 -04:00
Your Name
a2f9e4d565 almost there 2013-03-13 15:29:57 -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
Kevin Chugh
a2be6dd420 first cut of UI 2013-03-12 10:31:05 -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
Will Daly
e1b99186ef Removed test_permissions.py 2013-03-06 10:20:02 -05:00
Will Daly
72411a175f Added jnater's unit tests, cleaned up broken tests, ran pep8fix 2013-03-06 09:41:26 -05:00
Carlos Andrés Rocha
9b1ae9f99c Merge pull request #1583 from MITx/fix/ned/clean-ups 
Fix/ned/clean ups
 2013-03-04 08:11:29 -08:00
Your Name
a9804a3349 proper tab 2013-03-04 10:57:37 -05:00
Ned Batchelder
97f1e04282 Fix some 2-space indents 2013-03-04 10:57:25 -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
Your Name
8a953241c1 first pass 2013-03-01 10:45:48 -05:00
Your Name
ff68853990 Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-21 13:30:24 -05:00
Ned Batchelder
aa2d0ecaf2 We no longer need override_settings, Django has a better one. 2013-02-11 17:06:35 -05:00
Your Name
21c06c741b inline mustache working 2013-02-08 14:28:48 -05:00
Kevin Chugh
c6bece8620 more updates 2013-02-08 09:11:41 -05:00
Your Name
7dd252178c cohort filter almost done 2013-02-07 18:14:46 -05:00
Your Name
3965f9129d cohort filter almost done 2013-02-07 18:13:53 -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
Kevin Chugh
d047d826c7 update coffeescript to hide cohort choice if first commmentable is not cohorted 2013-02-06 22:00:03 -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
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
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