Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,833 Commits 1 Branch 0 Tags
ecdf774e75dbb0f0fe84494de18dfdf946c14552
Commit Graph

66833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
8c301e04ae Merge pull request #614 from MITx/feature/arjun/fix_customresponse_msg 
Clean up customresponse messages + points
 2012-09-05 08:20:54 -07:00
ichuang
34ea1e0b95 fix FORCE_UNIVERSITY_DOMAIN check in student.views 2012-09-05 11:19:02 -04:00
Tom Giannattasio
a2cdd012b3 arrow key navigation on topic drop for filtered items 2012-09-05 11:18:25 -04:00
Calen Pennington
a0608df706 Merge pull request #621 from MITx/feature/victor/fewer-xml-warnings 
Remove lots of loud warnings about duplicate url names for things which ...
 2012-09-05 08:17:02 -07:00
Calen Pennington
2f3f9e5ce9 Merge pull request #624 from MITx/rocha/master 
Cleanup of 'About Course' page link to its Courseware
 2012-09-05 08:15:33 -07:00
Calen Pennington
54e8819fb1 Merge pull request #615 from MITx/feature/ichuang/instructor-dashboard-upgrade 
Upgrade to instructor dashboard
 2012-09-05 08:03:55 -07:00
Tom Giannattasio
6e0ddf14c5 prevent scrolling when topic menu is dropped 2012-09-05 10:42:37 -04:00
Tom Giannattasio
32b07d5648 fixed grey button on drop 2012-09-05 10:30:04 -04:00
Tom Giannattasio
098e7022cf simpler sidebar width setting 2012-09-05 10:23:25 -04:00
Carlos Andrés Rocha
2d42c91b9d Cleanup of 'About Course' page link to its Courseware 2012-09-05 10:22:36 -04:00
Tom Giannattasio
925caac649 mark styling added 2012-09-05 10:19:24 -04:00
Tom Giannattasio
c4495e4d8f fixed drop filter bug 2012-09-05 10:06:42 -04:00
Calen Pennington
4d2983cb99 Merge pull request #587 from MITx/feature/victor/forum-anon-user-500 
Add some rudimentary error checking to forum views
 2012-09-05 06:21:46 -07:00
kimth
46389550f7 Merge pull request #623 from MITx/feature/dave/courseware_button_fix 
Quick fix for prod issue -- making view courseware link from course abou...
 2012-09-05 05:21:27 -07:00
David Ormsbee
44722e86e1 Quick fix for prod issue -- making view courseware link from course about page always work. 2012-09-05 08:20:06 -04:00
Ibrahim Awwal
4b7e5b7c2c Fix typo. 2012-09-05 02:44:11 -07:00
Ibrahim Awwal
742f4c03ef Expanding and collapsing threads on inline forums works, but it could use a little styling. Also fixed responding to threads which I may have broken in the commit prior to this one. 2012-09-05 02:41:16 -07:00
Ibrahim Awwal
5c64945e0a Make appended_id for WMD editor a little less hacky by getting it from data-id of the 'reply-body' element instead of from _id of the wrapper. 2012-09-05 00:04:00 -07:00
Ibrahim Awwal
39185ce191 Fix WMD editor reply boxes on embedded discussions, although I think the way it's implemented is something of a hack. 2012-09-04 23:49:56 -07:00
Rocky Duan
ebf47996a1 fixed commenting to new responses 2012-09-04 20:23:29 -07:00
Rocky Duan
4f62245031 fixed null text error 2012-09-04 20:16:37 -07:00
Rocky Duan
0c6f05f45c oops previous commit breaks comments (now fixed) 2012-09-04 20:13:55 -07:00
Rocky Duan
5e58480bc7 clear response pane after posting 2012-09-04 20:06:01 -07:00
ichuang
d56d235fc9 minor change to create_user command, don't fail on kerberos lookup failure 2012-09-04 23:02:51 -04:00
Rocky Duan
9f3a95a30e make delete work for responses 2012-09-04 19:53:16 -07:00
Rocky Duan
e6721941e0 only bind delete events to threads but not responses 2012-09-04 19:41:25 -07:00
Rocky Duan
2143835659 Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 
Conflicts:
	lms/static/coffee/src/discussion/views/discussion_thread_view.coffee
	lms/static/coffee/src/discussion/views/thread_list_item_view.coffee
 2012-09-04 19:41:03 -07:00
Rocky Duan
1bbb411136 delete threads 2012-09-04 19:13:53 -07:00
David Ormsbee
319e6260d0 Upped the number of threads per discussion page to 8, per Tony's request. 2012-09-04 21:11:34 -04:00
David Ormsbee
f26dae1a9f Merge pull request #622 from MITx/rocha/master 
[#35491529] Small corrections to OpenID provider login page
 2012-09-04 17:58:11 -07:00
Carlos Andrés Rocha
0f1db7969d [#35491529] Small corrections to OpenID provider login page 2012-09-04 20:53:51 -04:00
ichuang
566b9694c4 revert inadvertent change to course.html 2012-09-04 19:47:37 -04:00
ichuang
5c90ec19d9 clarify that /gitreload is behind ENABLE_LMS_MIGRATION in docs 2012-09-04 19:08:28 -04:00
ichuang
98eb764525 cleaned up instructor dashboard CSV unit test code, per https://github.com/MITx/mitx/pull/615 2012-09-04 18:56:49 -04:00
ichuang
0c3d054253 fix: university domain should not be determined by HTTP_HOST for dev or behind proxy 2012-09-04 18:36:26 -04:00
ichuang
4cbdf90d5e cleaned up access.py - now has _has_instructor_access_to_loation 2012-09-04 18:26:22 -04:00
Matthew Mongeau
1caef344c3 Fix sidebar alignment 2012-09-04 17:46:57 -04:00
Tom Giannattasio
a51ae8cfbb Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 17:27:51 -04:00
Tom Giannattasio
3b07fd366e added keyboard nav to dropdown; doesn't work yet when filtered 2012-09-04 17:27:41 -04:00
Matthew Mongeau
d8e3108a25 Sidebar positioning and height. 2012-09-04 17:25:57 -04:00
Victor Shnayder
c23b31c6ee Remove lots of loud warnings about duplicate url names for things which don't store state, and have the same hash. 
- should make 6.002 discussion tags happier
 2012-09-04 16:20:39 -04:00
Matthew Mongeau
9da7a337a8 Sorting should keep trace of comment and like updates. 2012-09-04 15:27:55 -04:00
Matthew Mongeau
2380e7fff4 Change default text to All. 2012-09-04 14:35:46 -04:00
Matthew Mongeau
0129be36c9 Get highlighting working. 2012-09-04 14:27:01 -04:00
Tom Giannattasio
ffab52be36 fixed typo on profile page and reworded button text 2012-09-04 14:11:24 -04:00
Tom Giannattasio
4778002b68 fixed merge conflict 2012-09-04 14:05:48 -04:00
Tom Giannattasio
4a3f85b417 styled closed post notice 2012-09-04 14:05:09 -04:00
Arjun Singh
fb88df4508 Merge underscore template 2012-09-04 10:45:50 -07:00
Tom Giannattasio
0a1361842c Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions 2012-09-04 13:40:39 -04:00
Tom Giannattasio
398e79dc8c simple blank slate view 2012-09-04 13:40:21 -04:00