Victor Shnayder
f2197227c1
add out-of-date message to check_course
2012-08-20 09:26:16 -04:00
Victor Shnayder
c6c95c63ac
Keep each course's descriptors separate
...
* apply policy per-course, even if multiple courses share course and org fields
* keep descriptors separate in xml store, so that if two such courses
change the same module in different ways, it works. Such edits will need to
merged on CMS import...
* add get_instance(course_id, location) method to replace get_item(location).
Update all the call sites
* tests, including a 2nd toy course with same course and org.
2012-08-20 09:26:16 -04:00
Tom Giannattasio
3b02e6a1ee
started new nav styles
2012-08-20 09:02:18 -04:00
Rocky Duan
ff41338cad
refactor attempt
2012-08-19 21:58:36 -07:00
ichuang
660c35f63e
additional changes to make inline textinput work properly
2012-08-20 00:19:28 -04:00
Rocky Duan
d5c2b04c5c
modified mustache template working
2012-08-19 20:43:46 -07:00
ichuang
b23bfc75bc
additional minor change: allow "inline" attrib on textline
2012-08-19 23:18:06 -04:00
David Ormsbee
c7d2e252e2
Fix errors that were preventing collectstatic from running
2012-08-19 22:31:05 -04:00
Bridger Maxwell
3cb677f0e6
Changed default title and content of course wiki page.
2012-08-19 21:19:08 -04:00
David Ormsbee
9fceae7a71
Merge branch 'master' into feature/bk_forum_int
2012-08-19 21:14:17 -04:00
David Ormsbee
6a05a812c3
Merge pull request #460 from MITx/kimth/multiple-fileupload
...
Kimth/multiple fileupload
2012-08-19 18:08:40 -07:00
kimth
891797a3bb
Submission of files through requests.POST depletes the file pointer. Need to rewind for replay
2012-08-19 20:38:10 -04:00
kimth
2f63a9b403
Limit number of files that can be uploaded at once
2012-08-19 20:12:01 -04:00
Bridger Maxwell
adbe71b5df
Got simplewiki just cleaned up enough to work again, so I could view a page for reference.
2012-08-19 19:57:19 -04:00
Rocky Duan
96b9a37048
work around compatibility issue
2012-08-19 16:42:56 -07:00
Bridger Maxwell
cdfeeb0cf1
Hid wiki search bar, because it isn't implemented yet.
2012-08-19 19:41:49 -04:00
Bridger Maxwell
03288193bb
Wiki create button now creates article in class wiki (never in a child of a class wiki).
2012-08-19 19:40:42 -04:00
Rocky Duan
12d51334f8
mustache template
2012-08-19 16:03:42 -07:00
Bridger Maxwell
38a9631659
Updated to use django-wiki with significantly less sql queries.
2012-08-19 17:37:58 -04:00
David Ormsbee
a729e16e88
Merge pull request #459 from MITx/feature/bridger/new_wiki
...
Fix broken dependency updates for wiki
2012-08-19 13:05:59 -07:00
David Ormsbee
e79d56376a
Use -e in django-wiki requirement
2012-08-19 16:03:35 -04:00
Bridger Maxwell
24c0b5145d
Updated django-wiki and plugin imports.
2012-08-19 14:41:49 -04:00
Rocky Duan
64e6160548
slight behavior change
2012-08-19 10:44:05 -07:00
Rocky Duan
d17981a9c4
shouldn't commit env config
2012-08-19 10:43:50 -07:00
Rocky Duan
991bb01af4
shouldn't commit env config
2012-08-19 10:42:45 -07:00
Rocky Duan
6164c87074
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-19 10:08:00 -07:00
Rocky Duan
80ab2d27a0
fixed comment retrieval
2012-08-19 10:07:31 -07:00
David Ormsbee
6c3b28b526
Merge pull request #452 from MITx/feature/bridger/new_wiki
...
Feature/bridger/new wiki
2012-08-19 09:46:15 -07:00
David Ormsbee
9c4b1d7067
Merge pull request #456 from MITx/kimth/multiple-fileupload
...
Kimth/multiple fileupload
2012-08-19 09:24:27 -07:00
kimth
20adaa81ba
Use list comprehension
2012-08-19 12:22:14 -04:00
kimth
9b94bb17e4
Default param is None rather than []
2012-08-19 12:19:10 -04:00
kimth
e2bca44ca3
Simplify is_list_of_files
2012-08-19 12:09:38 -04:00
kimth
52d243208e
Adjust tests to reflect list of file objects, not just file
2012-08-19 11:14:32 -04:00
kimth
f5e60412ee
Send multiple files to xqueue
2012-08-19 11:02:03 -04:00
kimth
b2599f075f
Send multiple files to xqueue
2012-08-19 11:00:51 -04:00
kimth
d2cb645834
Multiple file submissions
2012-08-19 09:26:03 -04:00
kimth
d920e718d0
AJAX permits multiple file upload
2012-08-19 08:26:12 -04:00
kimth
588444c46b
Filesubmission template allows multiple file selection
2012-08-19 07:54:10 -04:00
Rocky Duan
b4ec109dac
major refactor of templates
2012-08-19 00:59:43 -07:00
Rocky Duan
e49226e9e1
some refactor
2012-08-19 00:16:04 -07:00
Rocky Duan
1c1d449a82
minor refactoring
2012-08-18 19:16:49 -07:00
Rocky Duan
0dd5428e24
refactored code to render ajax content
2012-08-18 17:54:43 -07:00
Rocky Duan
238adb1a03
Merge branch 'master' into profile
...
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
lms/templates/course_navigation.html
2012-08-18 17:04:37 -07:00
Rocky Duan
028bd23c1c
Merge branch 'master' of github.com:MITx/mitx into profile
...
Conflicts:
lms/djangoapps/courseware/module_render.py
lms/djangoapps/courseware/views.py
lms/templates/course_navigation.html
2012-08-18 16:57:00 -07:00
Rocky Duan
0d2f787c32
cache setting
2012-08-18 16:41:49 -07:00
ichuang
9aeec6904a
Merge pull request #455 from MITx/kimth/circuitsim-link-fix
...
Remove outdated hardcoded url from circuit simulator
2012-08-18 13:56:07 -07:00
Bridger Maxwell
1e08164db5
Added MathJax to wiki pages.
2012-08-18 13:12:04 -04:00
Bridger Maxwell
0598a471c1
Wiki menu no longer shows edit for users who can't edit. Changed template to mako for convenience.
2012-08-18 12:22:50 -04:00
kimth
78b3ca050e
More info in comment
2012-08-18 10:08:49 -04:00
kimth
25d3890595
Remove outdated hardcoded url from circuit simulator
2012-08-18 09:51:27 -04:00
