Commit Graph

22621 Commits

Author SHA1 Message Date
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
Victor Shnayder
932a9be747 Make tests pass again
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
2012-08-07 11:06:47 -04:00
Tom Giannattasio
2135ed5015 added vote arrows 2012-08-07 10:16:08 -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
Brittany Cheng
87019c4bcb Merge branch 'master' of github.com:dementrock/mitx into discussion3 2012-08-07 10:07:30 -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
Bridger Maxwell
3dffcaca1c Fixed capitalization in gradebook css. 2012-08-07 08:42:08 -04:00
Bridger Maxwell
3a52e86a87 Fixed weighting of individual problems. Unmodified problems have weight None, not 1. 2012-08-07 08:00:06 -04:00
Arjun Singh
fb6dbb120e Fixing dependency system for javascriptresponses. In particular, adding a location for node-only packages (that are never sent to the client) in lms/lib/node_modules and adding lms/static/js, lms/static/coffee/* to the NODE_PATH, along with the course's data directory. 2012-08-07 03:28:35 -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
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
Rocky Duan
bd4a386d93 highlighting while skipping code and mathjax (ugly and slow solution) 2012-08-06 21:43:43 -04:00
Bridger Maxwell
69ba80bf63 Merge branch 'master' into MITx/feature/bridger/fast_course_grading 2012-08-06 18:51:59 -04:00
Bridger Maxwell
873f1431ec Put back dynamic grade cutoffs and final grade rounding (from stable-end-of-course) 2012-08-06 18:51:11 -04:00
Arjun Singh
2f84e0ca78 Merge master 2012-08-06 18:48:17 -04:00
Brittany Cheng
92ca7ff240 link styles 2012-08-06 18:42:00 -04:00
Mike Chen
d9ffca2a31 vote_for_comment typo 2012-08-06 18:41:37 -04:00
Mike Chen
6bc69ff97b added permanent link for comments 2012-08-06 18:38:04 -04:00
Tom Giannattasio
6cdd3a7ec2 started thread styles 2012-08-06 18:17:21 -04:00
Mike Chen
50228fc2d6 added permanent link for threads 2012-08-06 18:09:35 -04:00
Arjun Singh
869e638e07 Removing compiled js files in data directories before recompiling them; this causes compilation errors to fail loudly. 2012-08-06 18:08:07 -04:00
Brittany Cheng
981fc90afb new post styles 2012-08-06 17:59:10 -04:00
Mike Chen
16e86fe5b0 show searched tag 2012-08-06 17:28:58 -04:00
Tom Giannattasio
43a70d8994 a few main discussion page tweaks 2012-08-06 17:04:24 -04:00
Tom Giannattasio
0ec7e3d3cd added "top" sort type 2012-08-06 17:04:07 -04:00
Tom Giannattasio
fa7d1745dc removed extraneous elements (page title, search within) 2012-08-06 17:03:49 -04:00
Bridger Maxwell
4fedca5bf9 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
2012-08-06 16:49:05 -04:00
Bridger Maxwell
baa2b14405 Changed interface of StudentModuleCache. Other changes from code review. 2012-08-06 16:36:53 -04:00
kimth
4e6808bb47 Merge master 2012-08-06 16:26:25 -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
kimth
41e7d72ea8 Xqueue interface is embedded in ModuleSystem 2012-08-06 16:13:35 -04:00
Kyle Fiedler
e90103abdf Reset styles for profile page and some for the info page 2012-08-06 16:08:41 -04:00
Kyle Fiedler
ac960ab9df Add images for book and fix styles for wiki 2012-08-06 16:08:40 -04:00
Kyle Fiedler
a090d62339 Add styles for next last page in textbook 2012-08-06 16:08:40 -04:00
Kyle Fiedler
e40c6b3812 Reset some styles for the textbook 2012-08-06 16:08:40 -04:00
Kyle Fiedler
29b8577346 Fix styles in the handouts sidebar 2012-08-06 16:08:40 -04:00
Mike Chen
fca5ab9a08 added delete link 2012-08-06 16:01:41 -04:00
Mike Chen
7e8b1992f0 show endorsed checkmark based on permissions 2012-08-06 15:51:33 -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