Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
4,574 Commits 1 Branch 0 Tags
97f1e2f5e48cd8d8be4bc5a64bf950a5eed51163
Commit Graph

464 Commits

Author SHA1 Message Date
Rocky Duan
eef24a5ebe added administrator role 2012-08-14 15:58:04 -07:00
Rocky Duan
529c323771 fixed bug caused by missing course_id in retrieved comments 2012-08-14 15:57:02 -07:00
Rocky Duan
50e95de9ef a place to start for the user profiel & fixed some bugs 2012-08-14 15:04:36 -07:00
Rocky Duan
04387289fa fixed bugs caused by merging 2012-08-14 13:43:04 -07:00
Rocky Duan
eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-14 12:54:43 -07:00
Rocky Duan
38bdcabe53 reply now works again 2012-08-13 23:23:13 -07:00
Rocky Duan
6fa0298546 make retrieved single thread/comment after update integrated with permissions 2012-08-13 21:42:28 -07:00
kimth
1c2d034283 LMS-side MAX_FILESIZE set in settings.py 2012-08-13 21:17:47 -04:00
kimth
936f2c49f5 Server-side (LMS) checking of uploaded filesize 2012-08-13 21:00:29 -04:00
Victor Shnayder
8716f88155 add course enrollment windows 
* if the course metadata have enrollment_start and/or enrollment_end,
  only allow normal users to enroll post start and pre end.
* If DARK_LAUNCH is on, staff can enroll outside the window
 2012-08-13 15:03:46 -04:00
Victor Shnayder
706fd99cab Address comments on #394 2012-08-13 14:21:19 -04:00
Calen Pennington
801df37872 Merge remote-tracking branch 'origin/master' into arjun/javascript_response 
Conflicts:
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/module_render.py
 2012-08-13 10:13:21 -04:00
Calen Pennington
bd95c03d9b Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches 
Provide content QA (quality assessment) interface
 2012-08-13 06:55:05 -07:00
Calen Pennington
a3d7c4892d Merge pull request #397 from MITx/feature/server_split 
Model replication to course databases
 2012-08-13 06:39:03 -07:00
David Ormsbee
4ac7862975 Merge branch 'master' into feature/server_split 
Conflicts:
	lms/urls.py
 2012-08-13 09:21:02 -04:00
Calen Pennington
a984fbb65f Merge pull request #394 from MITx/feature/victor/hide-error-modules 
Hide errors from non-staff users
 2012-08-13 06:17:13 -07:00
Rocky Duan
12897ffff0 added title & tag for new post & fixed error handling; reply button in generated thread doesn't work 2012-08-12 22:54:02 -07:00
David Ormsbee
c6ed6fc066 Merge branch 'master' into feature/server_split 2012-08-13 00:36:31 -04:00
Rocky Duan
7b7164a101 fixed unicode bug 2012-08-12 17:12:16 -07:00
Victor Shnayder
3455f8f64d Hide errors from non-staff users 2012-08-12 18:03:12 -04:00
Victor Shnayder
d7f94a05b7 Add DARK_LAUNCH functionality 
* pass user to check_course
* if dark launch feature enabled, users with staff access to course
can see courseware before start date.  Students still can't.
* tests.
* Remaining: enrollment view has custom access control.  Need to check it.
 2012-08-12 16:23:31 -04:00
Victor Shnayder
622eebc473 Don't error on missing static files 
* Just log a warning and return a dummy url
* May want smarter checking later
  (e.g. would be nice to tell staff what files are missing.)
 2012-08-12 16:21:38 -04:00
Rocky Duan
44f7b37bfb refactored comment_client working 2012-08-12 12:56:55 -07:00
Rocky Duan
b7d3361894 Merge branch 'mergedtom' into refactor 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
 2012-08-11 17:43:16 -07:00
Rocky Duan
de8c828fb3 changed comment_client module to be imported as cc 2012-08-11 17:42:08 -07:00
ichuang
da64c8f0a1 add xqa interface to staff_problem_info, make staff_debug a modal 
window, add xqa modal window, add xqa_key to course metadata
 2012-08-11 20:12:37 -04:00
Rocky Duan
86b53bb248 uh 2012-08-10 17:53:22 -07:00
kimth
d41f709c92 Moved xqueue_callback URLs into the course 2012-08-10 18:51:35 -04:00
ichuang
411e77e19d ModuleSystem should get its DEBUG set from settings.DEBUG in module_render 2012-08-10 15:25:42 -04:00
ichuang
2e4f21ee3b replace_static_urls should only be run once (currently twice, eg if 
html is in a veritical)
 2012-08-10 15:25:41 -04:00
Victor Shnayder
6882b4b53d responding to review comments on #383 2012-08-10 11:42:54 -04:00
Victor Shnayder
a6148856b2 make the tests work around the 404 bug 2012-08-10 11:42:54 -04:00
Victor Shnayder
c3814a81fd In-progress auth tests 
* need to actually return 404 codes to clients when DEBUG=False
* add option to make nose more verbose and drop to pdb on error
 2012-08-10 11:42:54 -04:00
Victor Shnayder
8e364e6d45 ensure float when computing module score 2012-08-10 11:42:54 -04:00
Victor Shnayder
c9fd7b22a0 Add instructor dashboard 
* dashboard links to gradebook and dummy grade summary page
 2012-08-10 11:42:53 -04:00
Victor Shnayder
43d6948f02 Fix links to student profile pages from gradebook 2012-08-10 11:42:53 -04:00
Victor Shnayder
15a4db1774 Only show enrolled students in course gradebook 
* also added todo about need for pagination
 2012-08-10 11:42:53 -04:00
Victor Shnayder
2005492f7f Remove noisy debug message 
* also adds a comment to lms/urls.py
 2012-08-10 11:41:05 -04:00
Calen Pennington
5f44b08f9c Merge pull request #382 from MITx/feature/victor/check-access-control 
Did a quick security scan through views.
 2012-08-10 07:59:24 -07:00
Victor Shnayder
8740ba8837 Did a quick security scan through views. 
* we appear to be fairly consistent in using is_staff and has_staff_access_to_course
* cleaned up some docstrings and little code things as I went
* fixed small bug in change_enrollment view (check for non-anon user)
 2012-08-10 10:43:20 -04:00
David Ormsbee
0d824c6c02 Move modx_dispatch URL calls into the course 2012-08-10 02:02:44 -04:00
Victor Shnayder
1c3038ff3a Make accordion remember state 
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
 2012-08-09 19:47:08 -04:00
Calen Pennington
f2c8d5b427 Merge pull request #364 from MITx/MITx/feature/bridger/fast_course_grading 
Even Faster Course Grading
 2012-08-09 07:49:19 -07:00
kimth
58a1248d32 New external grader format: JSON-serialized dict 2012-08-09 08:29:12 -04:00
Bridger Maxwell
e4329c312d Fixed log of error. Xmodules don't have ids, so I log the location instead. 2012-08-08 16:03:28 -04:00
Bridger Maxwell
3930dabdc9 Merge remote-tracking branch 'origin/master' into MITx/feature/bridger/fast_course_grading 2012-08-08 16:00:22 -04:00
Calen Pennington
6abc2d733f Merge pull request #370 from MITx/feature/bridger/django1.4 
Feature/bridger/django1.4
 2012-08-08 12:52:33 -07:00
Rocky Duan
65f849637f Merge branch 'ccp0101/moderation' into lol 
Conflicts:
	lms/urls.py
 2012-08-08 14:39:10 -04:00
Matthew Mongeau
0b03834f51 XML based table of contents for books. 2012-08-08 14:13:20 -04:00
Mike Chen
2b803b024e fix MITx master bug in courseware. 2012-08-08 12:02:50 -04:00