Commit Graph

1122 Commits

Author SHA1 Message Date
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
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
Brittany Cheng
8346804aaf reorganize css 2012-08-06 12:06:34 -04:00
Brittany Cheng
9ab745c331 reorganize css 2012-08-06 12:04:15 -04:00
Brittany Cheng
27eaffe246 sort styles 2012-08-06 11:47:16 -04:00
ichuang
7607444286 fix bug: course staff group based on dir_name, not course number 2012-08-05 23:26:31 -04:00
ichuang
0347eb498c add MITX_FEATURES flags to enable textbook and discussion,
and modify course_navigation correspondingly
2012-08-05 20:24:00 -04:00
Mike Chen
30f5bdb429 fixed the order of decorators 2012-08-05 17:38:47 -04:00
ichuang
190f1f8f89 tracking_log template 2012-08-05 16:35:32 -04:00
ichuang
c42960c172 add feature ENABLE_SQL_TRACKING_LOGS and url view /event_logs 2012-08-05 16:32:58 -04:00
Rocky Duan
1f5aa5e68b fixed new post editor position 2012-08-05 15:33:18 -04:00
Rocky Duan
28c1352c07 handleSearch not in use anymore 2012-08-05 15:31:44 -04:00
Rocky Duan
8bdefecb79 fixed search button 2012-08-05 15:22:26 -04:00
Rocky Duan
20926e839b fixed ajax retrieved search bar in forum view 2012-08-05 14:57:35 -04:00
ichuang
9db88b0b52 fix comment in dev.py 2012-08-04 21:13:43 -04:00
Rocky Duan
cacd58ca9f fixed sort bug 2012-08-04 19:50:50 -04:00
Rocky Duan
e22371b80d fixed some notification stuff 2012-08-04 19:41:24 -04:00
Rocky Duan
7c58fd27a1 Merge branch 'master' of github.com:MITx/mitx
Conflicts:
	lms/templates/profile.html
2012-08-04 18:07:27 -04:00
Rocky Duan
a1575799ba Merge branch 'discussion2' of github.com:dementrock/mitx 2012-08-04 18:04:07 -04:00
Rocky Duan
9308e39d4e bug fix 2012-08-04 18:03:59 -04:00
Rocky Duan
0af26ae8d6 check if mathjax exists before proceeding 2012-08-04 18:00:25 -04:00
Rocky Duan
0fd2ed99c6 client side function for user operations 2012-08-04 17:59:58 -04:00
ichuang
7fe75030cc fix staff edit link in module content display (goes to github) 2012-08-04 17:52:14 -04:00
Rocky Duan
7cd0914541 minor changes 2012-08-04 16:06:15 -04:00
ichuang
b8ae026c29 fail gracefully if course.xml missing metadata in course_staff_group_name 2012-08-04 11:16:47 -04:00
ichuang
d50af5765e make university profile pages also use get_courses_by_university 2012-08-04 11:03:54 -04:00