Commit Graph

1146 Commits

Author SHA1 Message Date
Brittany Cheng
d934142adf Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 16:16:32 -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
Brittany Cheng
e1a564108b Merge branch 'master' of github.com:dementrock/mitx into brittany 2012-08-07 15:41:29 -04:00
Rocky Duan
5309592f01 scaffold for recent active posts 2012-08-07 15:40:36 -04:00
Brittany Cheng
39dc6a63da cleanup css 2012-08-07 14:41:28 -04:00
Brittany Cheng
ed8595ad95 error styles 2012-08-07 14:31:04 -04:00
Brittany Cheng
7962813014 info styles 2012-08-07 13:53:57 -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
aeb2d73cba Merge branch 'discussion3' of github.com:dementrock/mitx 2012-08-07 12:05:52 -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
Brittany Cheng
391d173018 similar posts styles 2012-08-07 12:05:01 -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
0863e34619 display actual username 2012-08-07 11:40:58 -04:00
Brittany Cheng
5bec964606 Merge branch 'master' of github.com:dementrock/mitx into discussion3 2012-08-07 11:36:34 -04:00
Rocky Duan
6c2f53a495 to make it appear at least normal.. 2012-08-07 11:28:52 -04:00
Rocky Duan
25c05e702e Merge branch 'brittany' of github.com:dementrock/mitx 2012-08-07 11:23:19 -04:00
Rocky Duan
0c311b8f13 search for similar posts without any styling.. 2012-08-07 11:22:41 -04:00
Brittany Cheng
1fb0e352b4 blank slate 2012-08-07 11:10:24 -04:00
Brittany Cheng
87019c4bcb Merge branch 'master' of github.com:dementrock/mitx into discussion3 2012-08-07 10:07:30 -04:00
Rocky Duan
77900bd761 simple blank slate 2012-08-06 23:17:38 -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
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
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
Brittany Cheng
92ca7ff240 link styles 2012-08-06 18:42:00 -04:00
Brittany Cheng
981fc90afb new post styles 2012-08-06 17:59:10 -04:00
kimth
4e6808bb47 Merge master 2012-08-06 16:26:25 -04:00
Rocky Duan
39ae9343e8 merged brittany's branch & fixed stuff 2012-08-06 16:15:36 -04:00
kimth
41e7d72ea8 Xqueue interface is embedded in ModuleSystem 2012-08-06 16:13:35 -04:00
Rocky Duan
427a871456 Merge branch 'discussion2' of github.com:dementrock/mitx 2012-08-06 15:21:54 -04:00
Rocky Duan
1805ed8a7c search highlighting 2012-08-06 15:21:48 -04:00
Calen Pennington
24f85bf202 Merge pull request #340 from MITx/kimth/lms-coderesponse
Kimth/lms coderesponse
2012-08-06 12:17:15 -07:00
Brittany Cheng
24a69a7409 thread styles 2012-08-06 14:57:56 -04:00
Brittany Cheng
45cc349d40 comment info 2012-08-06 14:51:44 -04:00
ichuang
9805ed8962 cleanup syntax, split long if into two lines 2012-08-06 14:37:17 -04:00
Brittany Cheng
5e9dfabfda comment info 2012-08-06 14:33:37 -04:00
ichuang
8a1747770a redirect to course_about page if hit internal course page unregistered for 2012-08-06 14:30:53 -04:00
ichuang
b1ddff838c add comment about course start date logic 2012-08-06 14:23:55 -04:00
ichuang
6f894c816c use jquery for error msg in course_about 2012-08-06 14:19:45 -04:00
ichuang
871ed954be ACCESS_REQUIRE_STAFF_FOR_COURSE default False in lms.envs.dev 2012-08-06 14:16:11 -04:00
ichuang
3484f5382c isinstance instead of type 2012-08-06 14:10:00 -04:00
kimth
6c875206bc Simplify file submission front end 2012-08-06 12:44:19 -04:00
Brittany Cheng
307ebed8f6 reorganize css 2012-08-06 12:41:45 -04:00