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 |
|
Calen Pennington
|
24f85bf202
|
Merge pull request #340 from MITx/kimth/lms-coderesponse
Kimth/lms coderesponse
|
2012-08-06 12:17:15 -07:00 |
|
Mike Chen
|
af656fcf21
|
use permissions to check if one can edit or relp
|
2012-08-06 15:08:47 -04: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 |
|
Bridger Maxwell
|
fb7ff47b15
|
Accidentally commited local changes to envs.
|
2012-08-06 14:03:49 -04:00 |
|
Bridger Maxwell
|
ba42c0225d
|
Moved the generation of the 'grading context' to a lazy property in course descriptor.
|
2012-08-06 13:57:41 -04:00 |
|
Mike Chen
|
3f1534eab7
|
added permission framework.
|
2012-08-06 12:58:20 -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 |
|
Bridger Maxwell
|
2348f71cc6
|
Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading
Conflicts:
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/views.py
|
2012-08-06 11:48:42 -04:00 |
|
Brittany Cheng
|
27eaffe246
|
sort styles
|
2012-08-06 11:47:16 -04:00 |
|