Tom Giannattasio
8daea9c465
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-15 13:11:00 -04:00
Tom Giannattasio
abf26dced9
started styles
2012-08-15 13:10:47 -04:00
Calen Pennington
4463542159
Merge pull request #415 from MITx/feature/victor/start-dates
...
Feature/victor/start dates
2012-08-15 10:00:58 -07:00
Bridger Maxwell
099f499efa
Fixed access methods for wiki nav. Added tests.
2012-08-15 13:00:17 -04:00
Victor Shnayder
c4afddfd38
Fix staff access check in simplewiki
2012-08-15 12:56:01 -04:00
Victor Shnayder
7c6b9eba1c
Note that 'load' access does not check for enrollment
2012-08-15 12:55:13 -04:00
David Ormsbee
7d90617c5e
Merge with master
2012-08-15 12:21:59 -04:00
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
7386d66c0f
Add dev_int.py config for testing course listings by subdomain
2012-08-15 11:53:20 -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
00ff1b9419
can retrieve all comments
2012-08-15 01:08:42 -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
9ef1a11c28
fixed merge bug
2012-08-14 18:12:35 -07: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
b68a69cd7b
Merge branch 'brittany' of github.com:dementrock/mitx into merge
2012-08-14 17:37:29 -07:00
Rocky Duan
ea07d0697e
fixed openclose thread
2012-08-14 17:37:19 -07:00
Brittany Cheng
b9875b80e0
edit panel styles
2012-08-14 17:36:27 -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
Brittany Cheng
46f2407e39
style fixes
2012-08-14 17:29:58 -07:00
Brittany Cheng
f20659f525
style fixes
2012-08-14 17:23:40 -07:00
Rocky Duan
00775a05a7
Merge branch 'brittany' of github.com:dementrock/mitx into profile
2012-08-14 17:18:35 -07:00
Brittany Cheng
6d24972678
similar post and search highlight
2012-08-14 17:18:07 -07:00
Rocky Duan
a701e703fd
Merge branch 'brittany' of github.com:dementrock/mitx into profile
2012-08-14 17:16:48 -07:00
Brittany Cheng
623b82eeff
similar post and search highlight
2012-08-14 17:16:22 -07:00
Rocky Duan
d0a339bec6
fixed similar posts suggestion
2012-08-14 17:13:27 -07:00
Rocky Duan
dd80cbc423
confirm before changing moderator status
2012-08-14 16:57:20 -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
Rocky Duan
97f1e2f5e4
removed debug line
2012-08-14 16:39:22 -07:00
Brittany Cheng
f983867e6b
moderator styles
2012-08-14 16:28:45 -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
