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

604 Commits

Author SHA1 Message Date
Rocky Duan
dd4f89638d hide empty brackets when not filtering through tags 2012-08-13 16:38:18 -07:00
Rocky Duan
62bc1aaef7 make following and recent tags display actual things 2012-08-13 16:32:08 -07:00
Rocky Duan
2dde3b00d5 removed edit button in the bottom bar 2012-08-13 16:23:32 -07:00
Rocky Duan
1742775262 added configuration parameter to turn on / off discussion service 2012-08-13 15:35:19 -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
322828fbff removed unnecessary template 2012-08-12 16:41:16 -07:00
Rocky Duan
44f7b37bfb refactored comment_client working 2012-08-12 12:56:55 -07:00
Rocky Duan
2d256dfe1d attempt to fix sort 2012-08-11 16:35:34 -07:00
Rocky Duan
7030d1f1a2 fixed endorse&edit&delete 2012-08-11 14:38:37 -07:00
Rocky Duan
39590116f7 make some indentation 2012-08-10 18:51:12 -07:00
Rocky Duan
ab6cf914a0 Merge branch 'brittany' of github.com:dementrock/mitx into lol 
Conflicts:
	lms/templates/discussion/_thread.html
 2012-08-10 17:59:19 -07:00
Brittany Cheng
f44358ab78 merge tom's styles 2012-08-10 17:52:07 -07:00
Tom Giannattasio
5c14a1ce65 added admin controls to main post and comments 2012-08-08 16:42:19 -04:00
Tom Giannattasio
9b9bb22cda tightened white space; fixed double margin in comments 2012-08-08 14:36:19 -04:00
Brittany Cheng
3ec658df56 merge tom's styles, warning: LOTS OF STUFF BROKE 2012-08-08 12:45:40 -04:00
Mike Chen
5e6261ebb1 courseware still not working.. 2012-08-08 11:30:11 -04:00
Mike Chen
8627a5f33e Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-08 11:20:13 -04:00
Tom Giannattasio
10ff6af3bb discussion sidebar additions; inline text editor example 2012-08-08 10:56:59 -04:00
Mike Chen
b2a048e6fc limit permissions of a role to courses and fix bugs 2012-08-08 10:42:29 -04:00
Mike Chen
e9c970e399 revert permanent link for comments 2012-08-07 18:45:26 -04:00
ichuang
9241841195 improve staff_problem_info jquery, so the histogram is also toggled 2012-08-07 18:36:04 -04:00
Brittany Cheng
67777ef5a2 left nav styles 2012-08-07 16:52:32 -04:00
Brittany Cheng
8df3ec3dae Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:42:45 -04:00
Rocky Duan
2685a3b637 trending tags 2012-08-07 16:41:01 -04:00
Brittany Cheng
a2f0e31d90 Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:21:24 -04:00
Brittany Cheng
9ae21a878a recent activity 2012-08-07 16:21:19 -04:00
Rocky Duan
fddee7defa Merge branch 'brittany' of github.com:dementrock/mitx 
Conflicts:
	lms/templates/discussion/_recent_active_posts.html
 2012-08-07 16:19:10 -04:00
Brittany Cheng
d934142adf Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:16:32 -04:00
Rocky Duan
7ba3bdfd61 show recently active posts user's following 2012-08-07 16:16:23 -04:00
Rocky Duan
6023aca559 scaffold for trending tags 2012-08-07 16:15:43 -04:00
Brittany Cheng
338a6788c8 recent activity 2012-08-07 16:11:24 -04:00
Rocky Duan
5309592f01 scaffold for recent active posts 2012-08-07 15:40:36 -04:00
Calen Pennington
a237322b70 Merge pull request #359 from MITx/ichuang/minor-fix-edit-link 
change edit link showhide to use <a> instead of <input> type submit
 2012-08-07 11:40:31 -07:00
ichuang
9d2b821c26 change edit link showhide to use <a> instead of <input> type submit 
(fixes issues with edit links in multipart problems and video)
 2012-08-07 14:34:28 -04:00
Tom Giannattasio
8c366e2d59 tweaking the text editor 2012-08-07 14:25:05 -04:00
thomasxiii
258b9eb530 Merge pull request #349 from MITx/feature/kfiedler/courseware-style 
A bunch of various fixes and de-styling
 2012-08-07 10:20:10 -07: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
Tom Giannattasio
d5302a0bd0 thread updates: follow/unfollow, grid tweaks 2012-08-07 12:00:17 -04:00
Kyle Fiedler
dd6ec19e80 Make the modal window work in the courseware 2012-08-07 11:59:49 -04:00
Rocky Duan
0863e34619 display actual username 2012-08-07 11:40:58 -04:00
Tom Giannattasio
00a72cf86a updated thread styles: voting, actions, comments, sort 2012-08-07 11:27:13 -04:00
Brittany Cheng
1fb0e352b4 blank slate 2012-08-07 11:10:24 -04:00
ichuang
462d75936a Merge pull request #357 from MITx/hotfix-registration 
fix typo in registration button jquery
 2012-08-07 07:11:53 -07:00
ichuang
4b2091b173 fix typo in registration button jquery 2012-08-07 10:09:55 -04:00
Calen Pennington
c5fa6bac89 Merge pull request #353 from MITx/ichuang/showhide-staff-debug 
make the staff debug information appear in a show/hide span
 2012-08-07 05:43:14 -07:00
Rocky Duan
77900bd761 simple blank slate 2012-08-06 23:17:38 -04:00
Rocky Duan
0ae68e7324 Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-06 22:38:31 -04:00
Rocky Duan
5679b0da5d sort by activity 2012-08-06 22:25:15 -04:00
ichuang
fa8bf7f371 make the staff debug information appear in a show/hide span 2012-08-06 21:54:29 -04:00
Rocky Duan
fe02d04f07 use raw title 2012-08-06 21:46:33 -04:00