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
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
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
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
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
Tom Giannattasio
d673895eaa
added drag functionality
2012-08-14 16:09:32 -04:00
Tom Giannattasio
defa5b3159
basic gradebook template built; basic scroll functionality built
2012-08-14 16:09:32 -04:00
Tom Giannattasio
9871050f94
started gradebook
2012-08-14 16:09:32 -04: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
3c32aff123
disable asc sorting for now
2012-08-14 12:50:22 -07:00
Rocky Duan
0992be3749
make top sort by last_activity_at for now
2012-08-14 12:45:22 -07:00
Rocky Duan
49e840d62b
adjust new post button in forum view
2012-08-14 12:43:15 -07: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
eeeb677354
Fixed wiki urls bug. Fixed reverse for course wiki.
2012-08-14 11:39:49 -04:00
Bridger Maxwell
dd56fd0916
Added some comments for the mitxmako additions.
2012-08-14 09:13:42 -04:00
Bridger Maxwell
c8fc7bed3e
Small template change.
2012-08-14 08:39:19 -04:00
Rocky Duan
dd4f89638d
hide empty brackets when not filtering through tags
2012-08-13 16:38:18 -07:00
Rocky Duan
62bc1aaef7
make following and recent tags display actual things
2012-08-13 16:32:08 -07:00
Rocky Duan
2dde3b00d5
removed edit button in the bottom bar
2012-08-13 16:23:32 -07:00
Bridger Maxwell
66d1259d4b
Created copy of main.html that is django template. Using this for wiki instead of converting every view.
2012-08-13 19:07:41 -04:00
Rocky Duan
1742775262
added configuration parameter to turn on / off discussion service
2012-08-13 15:35:19 -07:00
ichuang
a111a44da0
when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately should still work
2012-08-13 18:09:14 -04:00
Bridger Maxwell
0a9ad1a5f9
Added settings template.
2012-08-13 16:42:57 -04:00
Calen Pennington
a7b88550c7
Merge pull request #401 from MITx/feature/kfiedler/courseware-style
...
Added tooltip styles, made all buttons the same, and other small changes...
2012-08-13 12:29:48 -07:00
Kyle Fiedler
731f1cd7a8
Added tooltip styles, made all buttons the same, and other small changes throughout the courseware
2012-08-13 15:05:43 -04:00
Bridger Maxwell
ff1a0ba274
Added wiki create and create_root. Fixed some mitxmako bugs.
2012-08-13 14:25:11 -04:00
Tom Giannattasio
ee0cbf66f9
added a cleaner arrow implementation
2012-08-13 10:19:06 -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
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
0aad62d6a8
Remove extra braces that were causing mako syntax errors
2012-08-13 00:48:35 -04:00
Rocky Duan
322828fbff
removed unnecessary template
2012-08-12 16:41:16 -07:00
Rocky Duan
44f7b37bfb
refactored comment_client working
2012-08-12 12:56:55 -07:00
ichuang
656a162aba
allow xqa server url to be set by MITX_FEATURES['USE_XQA_SERVER']
2012-08-12 12:43:08 -04:00
ichuang
453d623b43
use mitx content-qa central server for staff_problem_info
2012-08-11 23:42:39 -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
Rocky Duan
2d256dfe1d
attempt to fix sort
2012-08-11 16:35:34 -07:00
Rocky Duan
7030d1f1a2
fixed endorse&edit&delete
2012-08-11 14:38:37 -07:00
Rocky Duan
39590116f7
make some indentation
2012-08-10 18:51:12 -07:00
Rocky Duan
ab6cf914a0
Merge branch 'brittany' of github.com:dementrock/mitx into lol
...
Conflicts:
lms/templates/discussion/_thread.html
2012-08-10 17:59:19 -07:00
Brittany Cheng
f44358ab78
merge tom's styles
2012-08-10 17:52:07 -07:00
Bridger Maxwell
e462fad367
Converted wiki edit page and breadcrumbs.
2012-08-10 18:15:21 -04:00
ichuang
b159eb4825
add feature flag to disable login button (for systems which autologin)
2012-08-10 15:57:41 -04:00
Victor Shnayder
38a89e9f1a
Make courseware navigation work again.
...
* bodyclass block got accidentally deleted
2012-08-10 14:51:47 -04:00
