Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,515 Commits 1 Branch 0 Tags
54e8819fb1d37d7bdcaa34a2acbc6e13dcedec3b
Commit Graph

5515 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
ichuang
d56d235fc9 minor change to create_user command, don't fail on kerberos lookup failure 2012-09-04 23:02:51 -04: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
ichuang
d643057052 count all types of modules, not just childless ones 2012-09-04 11:21:18 -04:00
ichuang
4f8161df84 address two comments in https://github.com/MITx/mitx/pull/615 2012-09-04 11:10:22 -04:00
David Ormsbee
41b5e5b81f Merge pull request #619 from MITx/feature/arjun/generalize_show 
Make show answer work for choiceresponse + javascriptinputs
 2012-09-04 07:49:02 -07:00
ichuang
258274f2a7 add string to model class unicode 2012-09-04 10:25:28 -04:00
Arjun Singh
93ed042786 Make show answer work for choicegroups + javascriptinputs 2012-09-03 19:37:48 -07:00
ichuang
520d5620d0 more general catch for gunicorn sync error 2012-09-03 20:37:33 -04:00
ichuang
dbeca659bd suppress gunicorn error which is being caught by errortracker. The 
gunicorn error is of this form:

Traceback (most recent call last):
  File "/home/ike/mitx_all/python/local/lib/python2.7/site-packages/gunicorn/workers/sync.py", line 33, in run
    client, addr = self.socket.accept()
  File "/usr/lib/python2.7/socket.py", line 202, in accept
    sock, addr = self._sock.accept()
error: [Errno 11] Resource temporarily unavailable
 2012-09-03 20:32:07 -04:00
ichuang
a973c1c21e use module.descriptor.start for start date in xmodule_modifiers 2012-09-03 16:49:55 -04:00
ichuang
02d58a7ca2 display course load error messages on modulestore reload by instructor 2012-09-03 16:49:34 -04:00
David Ormsbee
999343d641 Merge pull request #618 from MITx/feature/victor/hide-progress-tab 
Feature/victor/hide progress tab
 2012-09-03 11:40:35 -07:00
Victor Shnayder
f926925ca6 Add a hide_progress_tab course policy flag 
- for internal cs50 until we have grade integration set up (only really needed for external version)
 2012-09-03 14:12:43 -04:00
Victor Shnayder
79109a6244 Apply attr_map translation to metadata loaded from policy file as well as from xml. 2012-09-03 13:51:20 -04:00
David Ormsbee
bce4e0f1bc Merge pull request #595 from MITx/feature/ibrahim/discussion_sort_preferences 
Feature/ibrahim/discussion sort preferences
 2012-09-03 10:25:04 -07:00
ichuang
b0397ab0b5 fix to be compatible with jenkins test 2012-09-03 12:43:48 -04:00
ichuang
4e2ddd578a unit tests for instructor dashboard (grades CSV download) 2012-09-03 12:32:41 -04:00
kimth
c26126d8d6 Merge pull request #617 from MITx/feature/kfiedler/detailed-answer 
Added styles for detailed solution
 2012-09-03 08:14:03 -07:00
David Ormsbee
df85ac5762 Merge pull request #616 from MITx/feature/dave/external_forum 
Add support for external forum link. Reviewed by Victor.
 2012-09-03 07:54:38 -07:00
David Ormsbee
ea78559ad3 Changed FIXME -> TODO in response to comments 2012-09-03 10:47:15 -04:00
Kyle Fiedler
e50f622915 Added styles for detailed solution 2012-09-03 10:40:38 -04:00
David Ormsbee
7f121a3b7c Merge pull request #611 from MITx/kimth/mark-graded 
Tweaks to the LMS from 6.002x preparation
 2012-09-03 07:38:50 -07:00
David Ormsbee
f0ef50ef7c Merge pull request #613 from MITx/feature/ichuang/add-gitreload-docs 
add docs for gitreload
 2012-09-03 07:33:59 -07:00
ichuang
9b056b284d add tracking logging of instructor dashboard actions 2012-09-02 23:17:45 -04:00
ichuang
91dcef7fd0 add gitreload to instructor dashboard 2012-09-02 22:41:27 -04:00
ichuang
4341ea7689 fix bug in modulestore reload: etree parser must be specified explicitly 2012-09-02 22:40:50 -04:00
David Ormsbee
5194dc3177 Add support for discussion_link attribute in course policy files as a kludge to support CS50's external forums 2012-09-02 22:22:01 -04:00
ichuang
9e8ec09b4d pep8 fixes 2012-09-02 20:15:57 -04:00
ichuang
0ddd8949ba re-add rakefile which was deleted by mistake 2012-09-02 19:17:19 -04:00
ichuang
4d5ca284b2 add fix to histogram (so 6.00x codemirror is not broken) 2012-09-02 19:10:47 -04:00
ichuang
2efe481237 move instructor dashboard into its own lms djangoapp; add new 
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
 2012-09-02 19:05:34 -04:00
ichuang
7664f910b1 add is_released 2012-09-02 19:04:55 -04:00
David Ormsbee
1a1c5edab4 Completely cosmetic fix to make the indentation clearer. 2012-09-02 16:56:17 -04:00
ichuang
9433e89710 add docs for gitreload 2012-09-01 10:16:38 -04:00
kimth
ea4019c0a0 Add comment to sequence/display.coffee 2012-09-01 09:01:19 -04:00
kimth
90bcb00e58 Allow ckt editor to be embedded in sequence 2012-09-01 08:56:16 -04:00
kimth
6f03ebb198 Add message for student in CustomResponse error 2012-09-01 08:26:54 -04:00
kimth
3de7c3a322 Merge branch 'master' into kimth/mark-graded 2012-09-01 08:05:29 -04:00
arjun810
3f07e5fdb1 Merge pull request #612 from MITx/feature/view_courseware_buttons 
Don't show View Courseware buttons if they don't have access to load it
 2012-08-31 18:57:37 -07:00