Tom Giannattasio
bb6d6d9ac8
edit page styles
2012-08-16 16:41:41 -04:00
Bridger Maxwell
034bd7308e
The django/mako template loader now caches mako templates by loading them from file.
2012-08-16 13:01:04 -04:00
Bridger Maxwell
c4b362ca71
Removed old path include for django-wiki.
2012-08-16 10:56:33 -04:00
Bridger Maxwell
337f109af7
Moved django-wiki submodule to be a pip install from git.
2012-08-16 10:54:34 -04:00
Bridger Maxwell
326a0f61c1
Updated django-wiki submodule.
2012-08-15 23:43:05 -04:00
Bridger Maxwell
d064d29cd8
Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki
2012-08-15 23:01:27 -04:00
Bridger Maxwell
8fb83ee33c
Added django-wiki as a submodule.
2012-08-15 23:01:06 -04:00
Bridger Maxwell
2b29c95266
Added template for inline preview.
2012-08-15 21:47:26 -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
48e9dc8031
Added bootstrap-modal for the wiki preview modals.
2012-08-15 20:07:05 -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
Tom Giannattasio
13c2bb588e
added styles for main article, sidebar and breadcrumb
2012-08-15 15:59:46 -04:00
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
Bridger Maxwell
099f499efa
Fixed access methods for wiki nav. Added tests.
2012-08-15 13:00:17 -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
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
Calen Pennington
12682827d2
Merge pull request #411 from MITx/kimth/xqueue_callback_blocking
...
Xqueue callback acquires lock on StudentModule to avoid race condition
2012-08-15 05:03:36 -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
Calen Pennington
49d3674601
Merge pull request #409 from MITx/feature/tomg/fall-design
...
started gradebook design; moved a few nav classes
2012-08-14 13:15:14 -07: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
9c0e41691c
Make XQueueInterface a new-style class
2012-08-14 15:57:07 -04: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
