David Ormsbee
eb96497cff
Merge branch 'master' into feature/bk_forum_int
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
2012-08-20 18:57:46 -04:00
kimth
eaef8c70a7
Lowercase
2012-08-20 18:51:34 -04:00
kimth
7e7247d8bf
Don't tabulate hidden chapters and sections in the Progress view
2012-08-20 18:47:18 -04:00
ichuang
e3ecd22fa0
github IPs in lms.envs.common; made create_user, create_groups,
...
manage_course_groups management commands (in lms_migration)
2012-08-20 18:38:05 -04:00
Rocky Duan
0b3e9909a4
Merge branch 'master' into refactor
...
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/static/coffee/src/discussion/content.coffee
requirements.txt
2012-08-20 15:35:31 -07:00
Rocky Duan
8684ae29b2
Merge branch 'master' of github.com:MITx/mitx into refactor
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/courseware/courseware.html
requirements.txt
2012-08-20 15:31:51 -07:00
Rocky Duan
dc599c469f
fixed test
2012-08-20 15:26:07 -07:00
Rocky Duan
f82c2e00d1
simplified mustache helper loading
2012-08-20 15:24:19 -07:00
Bridger Maxwell
d31f0c9f06
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
...
Conflicts:
requirements.txt
2012-08-20 16:10:17 -04:00
Victor Shnayder
5f612c7819
Oops. Make modx_dispatch and xqueue callback work again.
...
- use get_instance, not get_item
- finish the id->location rename for modx_dispatch arg
2012-08-20 16:04:16 -04:00
Rocky Duan
af17ba7a79
removed dependency on datehelper
2012-08-20 12:57:23 -07:00
Calen Pennington
de4abe300b
Merge pull request #464 from MITx/kimth/textbook
...
Kimth/textbook
2012-08-20 12:38:14 -07:00
Calen Pennington
259e21364f
Merge pull request #461 from MITx/feature/victor/multi-run-policy
...
Keep each course's descriptors separate
2012-08-20 12:35:55 -07:00
Bridger Maxwell
9bc5aec01a
Fixed up courseware-error view. Moved it to templates/courseware too.
2012-08-20 15:03:55 -04:00
Rocky Duan
71df263ff9
disable all course db related signals
2012-08-20 11:57:58 -07:00
Bridger Maxwell
0ac5ded095
Moved the course template pages to be templates/courseware/
2012-08-20 14:54:23 -04:00
Rocky Duan
1f50da8814
fixed discussion permission test
2012-08-20 11:41:36 -07:00
Rocky Duan
b4039fe89d
Merge branch 'feature/bk_forum_int' of github.com:MITx/mitx into feature/bk_forum_int
...
Conflicts:
requirements.txt
2012-08-20 11:41:19 -07:00
Bridger Maxwell
70c7ee42ed
Fixed tests from profile->progress rename.
2012-08-20 14:08:42 -04:00
Bridger Maxwell
92a293f07e
Removed profile info from Profile page and renamed it to Progress.
2012-08-20 13:50:28 -04:00
kimth
c084745290
Textbook TOC from S3
2012-08-20 13:32:13 -04:00
Bridger Maxwell
6d30a98f0f
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-20 13:08:35 -04:00
kimth
987d7bcc29
book_url doesn't come from settings
2012-08-20 12:40:34 -04:00
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
Rocky Duan
ff41338cad
refactor attempt
2012-08-19 21:58:36 -07:00
Rocky Duan
d5c2b04c5c
modified mustache template working
2012-08-19 20:43:46 -07: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
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
Rocky Duan
12d51334f8
mustache template
2012-08-19 16:03:42 -07: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
Bridger Maxwell
24c0b5145d
Updated django-wiki and plugin imports.
2012-08-19 14:41:49 -04:00
Rocky Duan
6164c87074
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-19 10:08:00 -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
kimth
d2cb645834
Multiple file submissions
2012-08-19 09:26:03 -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
Bridger Maxwell
361e409d4e
Got the tests passing!
2012-08-18 00:02:09 -04:00
Bridger Maxwell
0fbfaf612f
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
2012-08-17 17:52:22 -04:00
Bridger Maxwell
93d15d15d0
Added markdown extensions from 6.002x
2012-08-17 17:32:44 -04:00
Bridger Maxwell
6b716c2883
Put in CodeMirror editor with inline circuits.
2012-08-17 14:32:29 -04:00
ichuang
39e2d64207
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/add-gitreload-to-migrate
2012-08-17 16:22:40 +00:00
