Victor Shnayder
2c19d01441
Merge pull request #479 from MITx/feature/arjun/syllabus
...
Adding a syllabus page (accessible via course navigation)
2012-08-21 14:33:07 -07:00
Arjun Singh
02ecfb4730
Adding comments about removing the syllabus tab ASAP.
2012-08-21 13:25:29 -07:00
Arjun Singh
b86fbdbd10
Adding comments about removing the syllabus tab ASAP.
2012-08-21 13:23:00 -07:00
Calen Pennington
dca434ad34
Merge pull request #448 from MITx/feature/ichuang/add-gitreload-to-migrate
...
add gitreload to lms-migration code
2012-08-21 12:52:52 -07:00
Calen Pennington
99f94b0a6b
Merge pull request #472 from MITx/feature/victor/per-course-progress
...
Feature/victor/per course progress
2012-08-21 12:29:03 -07:00
Bridger Maxwell
9cc72c4965
Victor's fixes only apply to sqlite. Added a conditional and now they run on mysql.
2012-08-21 15:02:27 -04:00
Victor Shnayder
d13998a135
add docstring comment
2012-08-21 15:02:27 -04:00
Victor Shnayder
ec90200b81
fix migration to remove out of date index
...
* reorder index fields
2012-08-21 15:02:26 -04:00
Victor Shnayder
f44d794e63
Add course_id to StudentModule
...
* Update all uses.
2012-08-21 15:01:54 -04:00
Arjun Singh
99703761b0
Merge master
2012-08-21 12:01:09 -07:00
Victor Shnayder
b97a2af2a2
Show policy, grading policy, and top-level errors
...
* Save errors for courses that failed to load in modulestore
* global staff can see course errors on their dashboard
* put policy loading errors into the error trackers
* add has_access(user, 'global', 'staff'), which is equiv to user.is_staff for now
2012-08-21 15:00:21 -04:00
David Ormsbee
3f0fba71d9
Remove non-functioning News tab. Enable Instructor tab from Discussion page
2012-08-21 14:29:30 -04:00
David Ormsbee
08e892ce9e
Add command to seed forum permissions to existing users
2012-08-21 13:22:32 -04:00
David Ormsbee
1c84f8e2dd
Remove student removal (we shouldn't ever delete users)
2012-08-21 13:00:06 -04:00
David Ormsbee
b0894c3973
Fix tests for other courses - create default discussion roles on demand if they don't exist
2012-08-21 12:38:39 -04:00
David Ormsbee
b31722bcff
Merge branch 'master' into feature/bk_forum_int
2012-08-21 12:05:06 -04:00
David Ormsbee
6d371640d4
Removed signal removal in django_comment_client test (we're no longer doing user replication)
2012-08-21 12:04:24 -04:00
Arjun Singh
1cfed46d06
Adding a syllabus page (accessible via course navigation)
2012-08-21 05:47:26 -07:00
Bridger Maxwell
fa3734b6fc
Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki
...
Conflicts:
repo-requirements.txt
2012-08-21 08:24:29 -04:00
Rocky Duan
bca6699b58
updated seed_permissions_and_roles to accept course_id as a parameter
2012-08-20 22:37:26 -07:00
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
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
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
