Calen Pennington
3b36fbf914
Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore
2012-08-16 12:49:42 -04:00
Calen Pennington
9118e585cc
Merge pull request #426 from MITx/feature/halogenandtoast/multiple_textbooks
...
Feature/halogenandtoast/multiple textbooks
2012-08-16 09:47:53 -07:00
Matthew Mongeau
ae3cb4ec7b
Nest textbooks under data
2012-08-16 12:06:37 -04:00
Calen Pennington
6bca6cdc28
Merge pull request #430 from MITx/feature/ichuang/fix-modulestore-etree-parser
...
Fix bug preventing comments from being in course.xml
2012-08-16 09:06:14 -07:00
Calen Pennington
919b3e2137
Merge pull request #429 from MITx/feature/victor/strip-metadata
...
Feature/victor/strip metadata
2012-08-16 08:52:23 -07:00
Matthew Mongeau
4ff80287f7
Remove TextbookDescriptor from setup.
2012-08-16 11:52:10 -04:00
ichuang
7553dac2f3
etree parser needs to be set on each call in modulestore load_course
2012-08-16 11:50:04 -04:00
Matthew Mongeau
945632362b
Get rid of TextbookModule and TextbookDescriptor.
2012-08-16 11:49:03 -04:00
Victor Shnayder
61478f4ba0
fix string format bug
2012-08-16 11:46:56 -04:00
Victor Shnayder
00d9ecd600
New policy organization:
...
* course roots live in roots/{url_name}.xml
- one is linked from course.xml
* policies live in policies/url_name.json
- loaded based on course url_name
* Updated to pass policy through into xml parsing, so it takes effect
before descriptor constructors are called.
* Update toy test course to new structure, fix up tests
2012-08-16 11:41:19 -04:00
Victor Shnayder
691744e359
Use .display_name instead of metadata['display_name']
...
* the former does a fallback if metadata['display_name'] isn't set.
2012-08-16 11:37:54 -04:00
Victor Shnayder
5e2f676153
backcompat warnings
2012-08-16 11:36:05 -04:00
Kyle Fiedler
ad7061e41f
Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav
2012-08-16 11:33:05 -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
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
ichuang
f39e589625
do replace_urls within capa_module get_answer (eg for img in <solution>s)
2012-08-15 21:57:33 -04:00
Victor Shnayder
f717b0421f
fix bug in backcompat section replacement
...
(s/sequence/sequential/)
2012-08-15 21:39:10 -04:00
Victor Shnayder
ce29b5aec2
Special case handling of course url_names in policy.json
2012-08-15 16:06:42 -04: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
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
Victor Shnayder
a2057f9ea4
fix docstring
2012-08-15 11:47:01 -04:00
Bridger Maxwell
4bc4e87a4e
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-15 11:15:21 -04:00
Victor Shnayder
9a14af4ba1
address comment on #412
2012-08-15 10:27:07 -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
Rocky Duan
449d665b00
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-14 17:48:08 -07:00
Rocky Duan
04387289fa
fixed bugs caused by merging
2012-08-14 13:43:04 -07:00
Calen Pennington
9c0e41691c
Make XQueueInterface a new-style class
2012-08-14 15:57:07 -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
Bridger Maxwell
1f43ae6d3e
Renamed namespace to wiki_slug in course_module.py.
2012-08-14 13:49:53 -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
Calen Pennington
c4bed2c128
Add basic authentication support for requests made to the xqueue server
2012-08-14 11:59:47 -04:00
Calen Pennington
f09aca917f
Fix name of XQueueInterface
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
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
dd56fd0916
Added some comments for the mitxmako additions.
2012-08-14 09:13:42 -04:00
kimth
895cf2c2ed
Front end file size limit matches server-end limit
2012-08-13 21:18:49 -04:00
Calen Pennington
2504880e57
Merge pull request #404 from MITx/feature/ichuang/consistent-customresponse
...
fix customresponse be consistent with "no answer entered" behavior
2012-08-13 17:55:24 -07:00
kimth
d19244c48b
Polling rerenders problem when individual queued items return
2012-08-13 20:41:16 -04:00
kimth
a4e283e975
File submission frontend checks for filesize
2012-08-13 20:20:19 -04:00
kimth
3db07bca5f
Frontend polling rate aware of queue length at time of submission
2012-08-13 19:42:08 -04:00
kimth
afd78febfb
Frontend queue polling doesn't render HTML until content changes
2012-08-13 19:07:44 -04:00
ichuang
1b06f51fd8
fix customresponse be consistent with "no answer entered" behavior
2012-08-13 17:41:24 -04:00
kimth
666c0bd56c
Merge branch 'master' into kimth/generic-coderesponse
2012-08-13 16:26:27 -04:00
kimth
99e7711aca
Generic CodeResponse XML (+ support for old ExternalResponse XML)
2012-08-13 15:48:33 -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
