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

185 Commits

Author SHA1 Message Date
Rocky Duan
348a7b6eb7 render time ago in front end 2012-08-20 12:04:25 -07:00
Rocky Duan
12d51334f8 mustache template 2012-08-19 16:03:42 -07:00
Rocky Duan
64e6160548 slight behavior change 2012-08-19 10:44:05 -07:00
Rocky Duan
991bb01af4 shouldn't commit env config 2012-08-19 10:42:45 -07:00
Rocky Duan
e49226e9e1 some refactor 2012-08-19 00:16:04 -07:00
Mike Chen
7c22a39aca Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance 
Conflicts:
	common/lib/xmodule/xmodule/discussion_module.py
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/discussion/_thread.html
	lms/urls.py
 2012-08-15 11:05:20 -04:00
Rocky Duan
00ff1b9419 can retrieve all comments 2012-08-15 01:08:42 -07:00
Rocky Duan
e5fe54ca5d display active threads with only relevant contents 2012-08-15 00:46:28 -07:00
Rocky Duan
9ef1a11c28 fixed merge bug 2012-08-14 18:12:35 -07:00
Rocky Duan
5009b78150 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/djangoapps/django_comment_client/permissions.py
	lms/static/coffee/src/discussion/content.coffee
	lms/static/coffee/src/discussion/utils.coffee
	lms/templates/discussion/_recent_active_posts.html
	lms/templates/discussion/_search_bar.html
	lms/templates/discussion/_thread.html
	lms/templates/discussion/_trending_tags.html
	lms/urls.py
 2012-08-14 17:32:30 -07:00
Rocky Duan
d0a339bec6 fixed similar posts suggestion 2012-08-14 17:13:27 -07:00
Rocky Duan
dd80cbc423 confirm before changing moderator status 2012-08-14 16:57:20 -07:00
Rocky Duan
700594263e Merge branch 'brittany' of github.com:dementrock/mitx into profile & 
small fix

Conflicts:
	lms/templates/discussion/user_profile.html
 2012-08-14 16:52:43 -07:00
Rocky Duan
457b7f468f toggle moderator status 2012-08-14 16:43:33 -07:00
Rocky Duan
50e95de9ef a place to start for the user profiel & fixed some bugs 2012-08-14 15:04:36 -07:00
Rocky Duan
eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-14 12:54:43 -07:00
Rocky Duan
3c32aff123 disable asc sorting for now 2012-08-14 12:50:22 -07:00
Rocky Duan
49e840d62b adjust new post button in forum view 2012-08-14 12:43:15 -07:00
Rocky Duan
60b2423c91 prompt window for deleting 2012-08-14 10:21:11 -07:00
Rocky Duan
38bdcabe53 reply now works again 2012-08-13 23:23:13 -07:00
Rocky Duan
19ba57858c fixed focus bug: mistakenly binded event twice 2012-08-13 22:55:08 -07:00
Rocky Duan
6fa0298546 make retrieved single thread/comment after update integrated with permissions 2012-08-13 21:42:28 -07:00
Rocky Duan
0fa0f2c8ae add cancel button for new post 2012-08-13 21:15:04 -07:00
Rocky Duan
12897ffff0 added title & tag for new post & fixed error handling; reply button in generated thread doesn't work 2012-08-12 22:54:02 -07:00
Rocky Duan
44f7b37bfb refactored comment_client working 2012-08-12 12:56:55 -07:00
Rocky Duan
7030d1f1a2 fixed endorse&edit&delete 2012-08-11 14:38:37 -07:00
Victor Shnayder
1c3038ff3a Make accordion remember state 
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
 2012-08-09 19:47:08 -04:00
Mike Chen
efad5632d8 set invisible instead of remove to preserve space of voting arrows when voting is disabled 2012-08-09 13:03:28 -04:00
Mike Chen
46a7c51df5 remove voting arrows if one cannot vote 2012-08-09 12:12:43 -04:00
Mike Chen
b449334462 generate permanent link for thread/comment on client side 2012-08-09 12:04:38 -04:00
Mike Chen
f4edc050d0 confirm before deleting comment/thread 2012-08-08 14:57:13 -04:00
Mike Chen
b06e31d2ed fix Close Thread showing for students and empty bracket in search bar 2012-08-08 14:51:49 -04:00
Mike Chen
8627a5f33e Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-08 11:20:13 -04:00
Rocky Duan
272c7b8b0c Merge branch 'master' into merge 2012-08-07 16:49:54 -04:00
Brittany Cheng
49840933c0 error handling 2012-08-07 13:48:43 -04:00
Rocky Duan
dbb467365b fixed error field for new post 2012-08-07 12:08:38 -04:00
Rocky Duan
a9b171c81f Merge branch 'discussion3' of github.com:dementrock/mitx 
Conflicts:
	lms/static/coffee/src/discussion/templates.coffee
 2012-08-07 12:05:46 -04:00
Rocky Duan
0560bb7eb7 add hide similar post button 2012-08-07 12:03:41 -04:00
Brittany Cheng
4b9358fb72 similar posts styles 2012-08-07 11:55:31 -04:00
Rocky Duan
547114a823 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-07 11:31:26 -04:00
Rocky Duan
6c2f53a495 to make it appear at least normal.. 2012-08-07 11:28:52 -04:00
Rocky Duan
0c311b8f13 search for similar posts without any styling.. 2012-08-07 11:22:41 -04:00
Rocky Duan
42cab65903 make behavior consistent with normal mathjax 2012-08-06 23:05:05 -04:00
Rocky Duan
26a80f2d9b fixed escape recovering bug 2012-08-06 23:00:38 -04:00
Rocky Duan
c2e2cd40a4 fixed display mode single character bug 2012-08-06 22:21:10 -04:00
Rocky Duan
d33ddec470 fixed multiple renderer bug 2012-08-06 22:20:56 -04:00
Rocky Duan
fe02d04f07 use raw title 2012-08-06 21:46:33 -04:00
Rocky Duan
bd4a386d93 highlighting while skipping code and mathjax (ugly and slow solution) 2012-08-06 21:43:43 -04:00
Mike Chen
dc29570189 Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-06 16:16:44 -04:00
Rocky Duan
39ae9343e8 merged brittany's branch & fixed stuff 2012-08-06 16:15:36 -04:00