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

385 Commits

Author SHA1 Message Date
Bridger Maxwell
337f109af7 Moved django-wiki submodule to be a pip install from git. 2012-08-16 10:54:34 -04:00
Bridger Maxwell
326a0f61c1 Updated django-wiki submodule. 2012-08-15 23:43:05 -04:00
Bridger Maxwell
8fb83ee33c Added django-wiki as a submodule. 2012-08-15 23:01:06 -04:00
Bridger Maxwell
262a49a6da Permissions on root article no longer allow students to edit it. 2012-08-15 21:47:08 -04:00
Bridger Maxwell
a163b486ac Fixed up course_nav to swizzle url reversing too. 2012-08-15 19:34:42 -04:00
Bridger Maxwell
e76be095e9 Middleware for changing redirects to stay in course wiki. 2012-08-15 18:54:22 -04:00
Bridger Maxwell
0d28d286e2 Added creation of Site() object on wiki load. 2012-08-15 18:54:01 -04:00
Bridger Maxwell
099f499efa Fixed access methods for wiki nav. Added tests. 2012-08-15 13:00:17 -04:00
Bridger Maxwell
4bc4e87a4e Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-15 11:15:21 -04:00
Bridger Maxwell
102dcc08e0 Added a test for the wiki course redirection. 2012-08-15 11:14:57 -04:00
Calen Pennington
4b2c4e71d2 Merge pull request #414 from MITx/kimth/xqueue_callback_blocking 
Rename acquire_lock to select_for_update, add docstring
 2012-08-15 07:44:50 -07:00
kimth
42ea4f3271 Rename acquire_lock to select_for_update, add docstring 2012-08-15 10:13:35 -04:00
Calen Pennington
b2df6d9456 Merge pull request #412 from MITx/feature/victor/start-dates 
LMS internal auth refactor and start dates
 2012-08-15 05:24:34 -07:00
Victor Shnayder
5d9fad5a52 Minor cleanups before pull request 2012-08-14 23:30:38 -04:00
Victor Shnayder
e4fb9ec63a Remove is_staff from ModuleSystem 
- now handling access control via get_module
 2012-08-14 23:30:37 -04:00
Victor Shnayder
b782e2ff5d Make start dates work for all modules 
* error modules now hidden via access control
* get_module() returns None if user doesn't have access
 2012-08-14 23:30:37 -04:00
Victor Shnayder
2df3a6ef11 Big access control refactor 
* All access control logic is now in access.py
* It exports a single method for general use: has_access(user, object, action)
 - possible actions depend on object type (e.g. 'see_exists', 'enroll', 'staff')
* Removed DARK_LAUNCH feature flag--it is now the default behavior
* Replaced check_course with three separate more focused functions that use has_access

Minor things:
* note on using pdb in testing
* moved time parsing helper into timeparse.py
* x_modules now have a .start attribute (None if not in metadata)
 2012-08-14 23:30:37 -04:00
Bridger Maxwell
9f770ef921 Visiting the wiki from a course you aren't in does a redirect to the regular wiki. 2012-08-14 19:16:45 -04:00
Bridger Maxwell
ceaa6a4ff2 You can now click around in the wiki without losing your course nav bar. 2012-08-14 18:44:23 -04:00
kimth
75eee443ff Xqueue callback acquires lock on StudentModule to avoid race condition 2012-08-14 18:13:53 -04:00
Bridger Maxwell
85f1899cb6 Wiki pages can now be viewed from the course URL and the course nav is shown. It doesn't follow the user yet. 2012-08-14 17:15:44 -04:00
Bridger Maxwell
1f43ae6d3e Renamed namespace to wiki_slug in course_module.py. 2012-08-14 13:49:53 -04:00
Calen Pennington
814f55aad0 Fix the name of HTTPBasicAuth 2012-08-14 12:45:34 -04:00
Calen Pennington
6e88777126 Import HttpBasicAuth from the right place 2012-08-14 12:34:25 -04:00
Calen Pennington
8ce12b10b2 Pass HttpBasicAuth object to requests, rather than a list, which it didn't understand 2012-08-14 12:32:52 -04:00
Calen Pennington
c4bed2c128 Add basic authentication support for requests made to the xqueue server 2012-08-14 11:59:47 -04:00
Calen Pennington
91b6bb649c Move queue interface url and auth into configuration, rather than hardcoding it 2012-08-14 11:59:46 -04:00
Bridger Maxwell
3dce1c2884 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-14 11:40:00 -04:00
Bridger Maxwell
a2841af834 Added views for automatic course article creation. 2012-08-14 08:39:41 -04: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
David Ormsbee
c6ed6fc066 Merge branch 'master' into feature/server_split 2012-08-13 00:36:31 -04: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
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
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