David Ormsbee
7f8f702971
Fix silly error that was pulling the wrong info from COURSE_LISTINGS
2012-08-15 11:53:21 -04:00
David Ormsbee
d0f2641890
Account for the fact that sometimes we don't get HTTP_HOST (like for tests)
2012-08-15 11:53:21 -04:00
David Ormsbee
346d5b91a1
implement subdomain-based course displays
2012-08-15 11:53:20 -04:00
Mike Chen
b4621d0562
added QueryCountDebugMiddleware
2012-08-15 11:21:11 -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
Mike Chen
7c22a39aca
Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance
...
Conflicts:
common/lib/xmodule/xmodule/discussion_module.py
lms/djangoapps/django_comment_client/forum/views.py
lms/templates/discussion/_thread.html
lms/urls.py
2012-08-15 11:05:20 -04:00
kimth
9805b41655
row --> rows
2012-08-15 10:46:33 -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
Victor Shnayder
9425bbba60
Address other comment on #413
...
- don't call has_access directly from template, pass a staff_access variable instead
2012-08-15 10:28:08 -04:00
kimth
1b84e6e43c
Merge branch 'master' into kimth/sjsu
2012-08-15 10:15:57 -04:00
kimth
42ea4f3271
Rename acquire_lock to select_for_update, add docstring
2012-08-15 10:13:35 -04:00
kimth
808c70caf5
Quick workaround courses hierarchy
2012-08-15 09:39:13 -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
Rocky Duan
e5fe54ca5d
display active threads with only relevant contents
2012-08-15 00:46:28 -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
Rocky Duan
449d665b00
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-14 17:48:08 -07:00
Rocky Duan
308772500e
fixed permalink
2012-08-14 17:45:09 -07:00
Rocky Duan
ea07d0697e
fixed openclose thread
2012-08-14 17:37:19 -07:00
Rocky Duan
5009b78150
Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge
...
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
lms/djangoapps/django_comment_client/permissions.py
lms/static/coffee/src/discussion/content.coffee
lms/static/coffee/src/discussion/utils.coffee
lms/templates/discussion/_recent_active_posts.html
lms/templates/discussion/_search_bar.html
lms/templates/discussion/_thread.html
lms/templates/discussion/_trending_tags.html
lms/urls.py
2012-08-14 17:32:30 -07:00
Rocky Duan
700594263e
Merge branch 'brittany' of github.com:dementrock/mitx into profile &
...
small fix
Conflicts:
lms/templates/discussion/user_profile.html
2012-08-14 16:52:43 -07:00
Rocky Duan
457b7f468f
toggle moderator status
2012-08-14 16:43:33 -07: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
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
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
Rocky Duan
50e95de9ef
a place to start for the user profiel & fixed some bugs
2012-08-14 15:04:36 -07: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
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
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
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
