kimth
909a368f4a
Merge branch 'master' into kimth/xqueue_callback_blocking
2012-08-16 11:27:56 -04:00
Calen Pennington
a3b144045c
Merge pull request #427 from MITx/feature/bridger/new_wiki
...
New wiki installed from pip
2012-08-16 08:01:39 -07:00
Bridger Maxwell
337f109af7
Moved django-wiki submodule to be a pip install from git.
2012-08-16 10:54:34 -04:00
Calen Pennington
3efea9cbb0
Merge pull request #425 from MITx/feature/bridger/new_wiki
...
Feature/bridger/new wiki
2012-08-16 07:31:56 -07:00
kimth
da9a4710ce
Merge branch 'master' into kimth/xqueue_callback_blocking
2012-08-16 09:38:25 -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
kimth
58932bb2f7
Drop import of re
2012-08-15 15:23:14 -04:00
kimth
3c1e67e339
Merge master
2012-08-15 15:19:08 -04:00
Calen Pennington
13b9e58f8f
Merge pull request #419 from MITx/feature/url_based_course_lists
...
URL based course lists
2012-08-15 12:07:02 -07:00
Calen Pennington
213e3cdc7c
Merge pull request #418 from MITx/feature/victor/strip-metadata
...
Feature/victor/strip metadata
2012-08-15 12:01:58 -07:00
kimth
02d970c31e
Map '/course/' urls to the course's root in the multicourse hierarchy
2012-08-15 14:45:12 -04:00
David Ormsbee
1c2b6e8088
Remove stuff that I should have deleted during the rebase
2012-08-15 14:39:56 -04:00
Victor Shnayder
a4d67bab33
Add support metadata in policy.json
...
* if there is a policy.json in the course dir, read it
* file format is a dict with keys {category}/{url_name}, and values metadata dictionaries
* apply the policy, overwriting keys that are in the xml
* then do metadata inheritance, inheriting any overwritten keys.
* also a management cmd to generate a policy.json from a course dir.
2012-08-15 14:36:06 -04:00
kimth
f1f80cb1f4
Drop HttpResponseRedirect import
2012-08-15 14:26:41 -04:00
kimth
0b4b8ecfdc
courseware.get_module passes down course_id triplet (org, course, run)
2012-08-15 14:20:35 -04:00
Calen Pennington
573c58d02b
Fix broken docstring
2012-08-15 13:59:25 -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
346d5b91a1
implement subdomain-based course displays
2012-08-15 11:53:20 -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
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
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
