Matthew Mongeau
4ff80287f7
Remove TextbookDescriptor from setup.
2012-08-16 11:52:10 -04:00
Matthew Mongeau
945632362b
Get rid of TextbookModule and TextbookDescriptor.
2012-08-16 11:49:03 -04:00
Matthew Mongeau
4a7b163ce3
Keep textbooks out of displayable items.
2012-08-16 10:31:18 -04:00
Matthew Mongeau
34010a38a8
Fix textbook module.
2012-08-16 10:31:17 -04:00
Matthew Mongeau
ae09598d9a
Display textbooks in course navigation, handle in urls and views.
2012-08-16 10:31:17 -04:00
Calen Pennington
884f33c932
Merge pull request #423 from MITx/feature/ichuang/fix-capa-answers-static-urls
...
capa problem answers may have static urls - needs replace_urls
2012-08-16 07:15:14 -07:00
Calen Pennington
e60f2e3d3d
Merge pull request #422 from MITx/kimth/sjsu
...
Don't display 'None points' on problem rendering
2012-08-16 07:14:28 -07:00
thomasxiii
1a8e5485eb
Merge pull request #416 from MITx/feature/kfiedler/askbot
...
Fix all of askbots style
2012-08-16 07:02:39 -07:00
ichuang
033211a5d1
doc update - LMS migrate reload
2012-08-15 22:03:00 -04:00
ichuang
f39e589625
do replace_urls within capa_module get_answer (eg for img in <solution>s)
2012-08-15 21:57:33 -04:00
kimth
3519ea6b2f
Don't display 'None points' on problem rendering
2012-08-15 17:14:27 -04:00
Calen Pennington
be1b063805
Merge pull request #417 from MITx/kimth/sjsu
...
Kimth/sjsu
2012-08-15 12:56:28 -07: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
David Ormsbee
f535f44e62
Fix typo that caused two classes to not get loaded
2012-08-15 14:32:36 -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
e524f3bf6c
Point at the new urls for the sandbox queue server LB
2012-08-15 14:12:32 -04:00
Calen Pennington
573c58d02b
Fix broken docstring
2012-08-15 13:59:25 -04:00
Kyle Fiedler
6d7225bebb
Added some final touches to askbot
2012-08-15 13:51:10 -04:00
Kyle Fiedler
ff1f090737
Added more fixes for askbot also fixed some of the extra padding
2012-08-15 13:51:10 -04:00
Kyle Fiedler
0804ff7a75
Added styles for single question and profile view
2012-08-15 13:51:10 -04:00
Kyle Fiedler
bbe9432508
Lots of askbot fixes
2012-08-15 13:51:10 -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
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
Victor Shnayder
a2057f9ea4
fix docstring
2012-08-15 11:47:01 -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
Victor Shnayder
9a14af4ba1
address comment on #412
2012-08-15 10:27:07 -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
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
kimth
75eee443ff
Xqueue callback acquires lock on StudentModule to avoid race condition
2012-08-14 18:13:53 -04:00
