Commit Graph

138 Commits

Author SHA1 Message Date
Rocky Duan
fe74f9bc85 reconstruct after editing 2012-08-24 02:17:58 -07:00
Rocky Duan
80195176e9 use escape html everywhere and only send discussion data relavent 2012-08-24 01:45:55 -07:00
Rocky Duan
3761b02ce8 hide reply button after closing thread 2012-08-23 15:12:22 -07:00
Arjun Singh
ed6317f37c getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service 2012-08-23 10:03:36 -07:00
Arjun Singh
a075cc79fd remove stray import 2012-08-23 06:50:16 -07:00
Arjun Singh
7f3a4889b8 make discussions work for new users 2012-08-23 06:48:37 -07:00
Arjun Singh
d1a8cd3f65 Limiting depth of comments 2012-08-23 04:50:03 -07:00
Rocky Duan
e4890a8bff fixed pluralize 2012-08-23 02:52:51 -07:00
Rocky Duan
5d90366917 fixed file uploading 2012-08-23 02:50:26 -07:00
Rocky Duan
0b00e3b099 make similar posts url working 2012-08-23 02:17:17 -07:00
Rocky Duan
007de179e1 add user profile page back 2012-08-22 23:44:50 -07:00
David Ormsbee
e3cdad0d2b change url regexp to handle discussions in coursenames with dashes 2012-08-23 01:17:49 -04:00
Rocky Duan
0e21ed030c removed new post button & added recent threads to single thread page 2012-08-22 19:22:35 -07:00
Rocky Duan
43ef4f6482 fixed recent threads & tags links 2012-08-22 19:09:58 -07:00
Rocky Duan
3b76fe16d8 make inline page working 2012-08-22 14:04:42 -07:00
Rocky Duan
9b26a20989 fixed search highlighting 2012-08-22 12:04:32 -07:00
Rocky Duan
37c78524a8 migrated threads reloading related stuff 2012-08-22 11:07:02 -07:00
Rocky Duan
a90af0c471 render permalink in backend 2012-08-21 23:26:06 -07:00
Rocky Duan
11e3276e80 update comment count based on operations 2012-08-21 17:43:20 -07:00
Rocky Duan
fd0eff46e7 Merge branch 'feature/rocky/discussion_api_key' into refactor
Conflicts:
	lms/djangoapps/django_comment_client/tests.py
	lms/lib/comment_client/utils.py
	lms/templates/courseware/courseware.html
2012-08-21 17:14:25 -07:00
Rocky Duan
fe091b7bc1 Merge branch 'master' of github.com:MITx/mitx into feature/rocky/discussion_api_key 2012-08-21 15:45:24 -07:00
Rocky Duan
fdf92d68f6 more refactoring; enabled partial re-rendering for votes, endorse, and closed 2012-08-21 15:26:50 -07:00
Rocky Duan
cf28dbea60 Merge branch 'feature/bk_forum_int' 2012-08-21 12:56:56 -07:00
David Ormsbee
3f0fba71d9 Remove non-functioning News tab. Enable Instructor tab from Discussion page 2012-08-21 14:29:30 -04:00
David Ormsbee
08e892ce9e Add command to seed forum permissions to existing users 2012-08-21 13:22:32 -04:00
David Ormsbee
1c84f8e2dd Remove student removal (we shouldn't ever delete users) 2012-08-21 13:00:06 -04:00
David Ormsbee
b0894c3973 Fix tests for other courses - create default discussion roles on demand if they don't exist 2012-08-21 12:38:39 -04:00
David Ormsbee
6d371640d4 Removed signal removal in django_comment_client test (we're no longer doing user replication) 2012-08-21 12:04:24 -04:00
Rocky Duan
07f818da5a got reply working under backbone framework 2012-08-21 02:12:21 -07:00
Rocky Duan
9dedd532c4 some progress 2012-08-20 23:43:47 -07:00
Rocky Duan
9ac26715a6 Merge branch 'feature/bk_forum_int' into refactor
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	lms/templates/discussion/index.html
	requirements.txt
2012-08-20 22:42:32 -07:00
Rocky Duan
bca6699b58 updated seed_permissions_and_roles to accept course_id as a parameter 2012-08-20 22:37:26 -07:00
Rocky Duan
a905ac9e1d updated backbone & single thread retrieval now working 2012-08-20 22:03:46 -07:00
Rocky Duan
d189a49ee5 continue working on backbone & got vote migrated and working 2012-08-20 17:32:36 -07:00
Rocky Duan
0b3e9909a4 Merge branch 'master' into refactor
Conflicts:
	lms/djangoapps/django_comment_client/tests.py
	lms/static/coffee/src/discussion/content.coffee
	requirements.txt
2012-08-20 15:35:31 -07:00
Rocky Duan
dc599c469f fixed test 2012-08-20 15:26:07 -07:00
Rocky Duan
f82c2e00d1 simplified mustache helper loading 2012-08-20 15:24:19 -07:00
Rocky Duan
af17ba7a79 removed dependency on datehelper 2012-08-20 12:57:23 -07:00
Rocky Duan
71df263ff9 disable all course db related signals 2012-08-20 11:57:58 -07:00
Rocky Duan
1f50da8814 fixed discussion permission test 2012-08-20 11:41:36 -07:00
Rocky Duan
ff41338cad refactor attempt 2012-08-19 21:58:36 -07:00
Rocky Duan
d5c2b04c5c modified mustache template working 2012-08-19 20:43:46 -07:00
Rocky Duan
96b9a37048 work around compatibility issue 2012-08-19 16:42:56 -07:00
Rocky Duan
12d51334f8 mustache template 2012-08-19 16:03:42 -07:00
Rocky Duan
b4ec109dac major refactor of templates 2012-08-19 00:59:43 -07:00
Rocky Duan
e49226e9e1 some refactor 2012-08-19 00:16:04 -07:00
Rocky Duan
1c1d449a82 minor refactoring 2012-08-18 19:16:49 -07:00
Rocky Duan
0dd5428e24 refactored code to render ajax content 2012-08-18 17:54:43 -07:00
Rocky Duan
238adb1a03 Merge branch 'master' into profile
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/course_navigation.html
2012-08-18 17:04:37 -07:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
2012-08-18 16:57:00 -07:00