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
Tom Giannattasio
a58a047582
moved global nav class
2012-08-14 16:12:36 -04:00
Tom Giannattasio
5aefda8d51
modified zebra stripes
2012-08-14 16:09:32 -04:00
Tom Giannattasio
dd92f51f02
added fluid widths
2012-08-14 16:09:32 -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
Calen Pennington
3ec0876618
Merge pull request #410 from MITx/feature/cale/queue_config
...
Feature/cale/queue config
2012-08-14 12:57:18 -07:00
Calen Pennington
d7fc2d6654
Merge pull request #408 from MITx/feature/fix_askbot_urls
...
Fix askbot URLs in the theme
2012-08-14 12:54:17 -07:00
David Ormsbee
3c9f099026
Modify server group dev config to enable separate concurrent Askbot instances.
2012-08-14 14:31:39 -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
David Ormsbee
e85db61407
Fix simple navigation and JS includes on askbot
2012-08-14 12:21:20 -04:00
David Ormsbee
9687dc8397
Add social images to Askbot theme
2012-08-14 12:20:58 -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
43745dacca
Add queue interface for test purposes
2012-08-14 11:59:46 -04:00
Calen Pennington
09fc932a20
Add default XQUEUE_INTERFACE to the dev environment
2012-08-14 11:59:46 -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
David Ormsbee
137d4856cc
We're loading static assets from the askbot theme directory in the lms proj now.
2012-08-14 11:54:02 -04:00
Calen Pennington
cfe712cb2a
Merge pull request #407 from MITx/kimth/generic-coderesponse
...
Kimth/generic coderesponse
2012-08-14 08:48:50 -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
a2841af834
Added views for automatic course article creation.
2012-08-14 08:39:41 -04:00
Bridger Maxwell
c8fc7bed3e
Small template change.
2012-08-14 08:39:19 -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
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
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
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
Bridger Maxwell
ff1a0ba274
Added wiki create and create_root. Fixed some mitxmako bugs.
2012-08-13 14:25:11 -04:00
Victor Shnayder
706fd99cab
Address comments on #394
2012-08-13 14:21:19 -04:00
Tom Giannattasio
6a50da3d16
Merge branch 'master' into feature/tomg/fall-design
2012-08-13 10:26:28 -04:00
