Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

1676 Commits

Author SHA1 Message Date
Rocky Duan
5309592f01 scaffold for recent active posts 2012-08-07 15:40:36 -04:00
Bridger Maxwell
735488fa51 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 2012-08-07 14:40:37 -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
Rocky Duan
547114a823 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-07 11:31:26 -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
Bridger Maxwell
3dffcaca1c Fixed capitalization in gradebook css. 2012-08-07 08:42:08 -04: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
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
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
Mike Chen
16e86fe5b0 show searched tag 2012-08-06 17:28:58 -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
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
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
e40c6b3812 Reset some styles for the textbook 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
Brittany Cheng
5e9dfabfda comment info 2012-08-06 14:33:37 -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
Mike Chen
3f1534eab7 added permission framework. 2012-08-06 12:58:20 -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
Bridger Maxwell
cbab4f1006 Fixed some imports on gradebook.html 2012-08-06 11:32:26 -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
ichuang
190f1f8f89 tracking_log template 2012-08-05 16:35:32 -04:00
Rocky Duan
20926e839b fixed ajax retrieved search bar in forum view 2012-08-05 14:57:35 -04:00
Rocky Duan
cacd58ca9f fixed sort bug 2012-08-04 19:50:50 -04:00