David Ormsbee
39a773616b
Merge pull request #630 from MITx/jarv/update-email
...
Jarv/update email
2012-09-06 08:10:32 -07:00
John Jarvis
517e6ddeda
Contact email address updates
2012-09-06 09:26:52 -04:00
Victor Shnayder
c354a120d8
Track accordion state:
...
- on first visit to courseware, go straight to first section of first chapter
- after, clicking on courseware tab sends you most recent chapter, with a link to the most recent section
(not to section because that might be confusing, and you might want to do something else (e.g. do homework instead of watch videos)
- Moved course errors into instructor tab.
2012-09-05 16:15:53 -04:00
Calen Pennington
4088ac5428
Isolate manual git reload behind a feature flag
2012-09-05 15:16:40 -04:00
David Ormsbee
5e9fce5cae
Merge branch 'master' into feature/halogenandtoast/calculator
2012-09-05 13:58:12 -04:00
Victor Shnayder
f04cd838e5
Integrate csv export of answer distributions with Ike's sweet dashboard
2012-09-05 13:40:29 -04:00
Calen Pennington
54e8819fb1
Merge pull request #615 from MITx/feature/ichuang/instructor-dashboard-upgrade
...
Upgrade to instructor dashboard
2012-09-05 08:03:55 -07:00
Victor Shnayder
f926925ca6
Add a hide_progress_tab course policy flag
...
- for internal cs50 until we have grade integration set up (only really needed for external version)
2012-09-03 14:12:43 -04:00
ichuang
91dcef7fd0
add gitreload to instructor dashboard
2012-09-02 22:41:27 -04:00
David Ormsbee
5194dc3177
Add support for discussion_link attribute in course policy files as a kludge to support CS50's external forums
2012-09-02 22:22:01 -04:00
ichuang
2efe481237
move instructor dashboard into its own lms djangoapp; add new
...
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
2012-09-02 19:05:34 -04:00
David Ormsbee
1a1c5edab4
Completely cosmetic fix to make the indentation clearer.
2012-09-02 16:56:17 -04:00
Ibrahim Awwal
1405cf97fd
Create a new template that inherits from course_navigation.html to avoid repeating the course navigation template and augment it with the new post button.
2012-09-01 21:17:23 -07:00
Matthew Mongeau
8d747e4423
Conditionally show calculator
2012-08-27 10:15:30 -04:00
Matthew Mongeau
80b31f46df
Wip
2012-08-27 09:43:37 -04:00
Rocky Duan
233f817f0b
include discussion js group in coursewar & removed unnecessary code
2012-08-23 01:51:51 -07:00
Arjun Singh
cd1bc95efe
adding the ability to override the sidebar name
2012-08-22 20:40:59 -07:00
Rocky Duan
05d28200ef
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-22 15:51:08 -07:00
kimth
0d689b3164
Quick workaround on syllabus_present that broke staging
2012-08-22 17:50:21 -04:00
Rocky Duan
908a5c5d59
Merge branch 'master' of github.com:MITx/mitx into merge
2012-08-22 14:11:44 -07:00
Rocky Duan
3b76fe16d8
make inline page working
2012-08-22 14:04:42 -07:00
Rocky Duan
951fb06341
Merge branch 'master' of github.com:MITx/mitx into merge
...
Conflicts:
lms/envs/dev.py
2012-08-22 14:04:34 -07:00
kimth
f46607710f
Merge master
2012-08-22 15:25:07 -04:00
kimth
960cf5792b
Dynamically disable syllabus per-course
2012-08-22 15:12:49 -04:00
Calen Pennington
2eb0de99eb
Merge pull request #494 from MITx/feature/arjun/course_specific_css
...
Feature/arjun/course specific css
2012-08-22 11:55:20 -07:00
Tom Giannattasio
fb1d9ca06c
Merge branch 'master' into feature/tomg/fall-design
2012-08-22 11:41:19 -04:00
Tom Giannattasio
7d903c4089
sidebar hover and firefox bug fixes
2012-08-22 11:40:59 -04:00
Arjun Singh
a9126aa276
Fixed syllabus to look good with new courseware styling
2012-08-22 05:25:48 -07:00
Arjun Singh
0b6bf77373
Adding a course-specific css class to body so that we can have course-targeted styles as a last resort
2012-08-22 05:00:39 -07:00
Rocky Duan
fd0eff46e7
Merge branch 'feature/rocky/discussion_api_key' into refactor
...
Conflicts:
lms/djangoapps/django_comment_client/tests.py
lms/lib/comment_client/utils.py
lms/templates/courseware/courseware.html
2012-08-21 17:14:25 -07:00
Tom Giannattasio
bd536f8aec
Merge branch 'master' into feature/tomg/fall-design
2012-08-21 18:13:40 -04:00
Tom Giannattasio
e762844c35
new sequence nav functionality - accommodates an infinite number of items
2012-08-21 18:12:59 -04:00
Arjun Singh
99703761b0
Merge master
2012-08-21 12:01:09 -07: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
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
Arjun Singh
1cfed46d06
Adding a syllabus page (accessible via course navigation)
2012-08-21 05:47:26 -07:00
Rocky Duan
d189a49ee5
continue working on backbone & got vote migrated and working
2012-08-20 17:32:36 -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
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
Victor Shnayder
868b076ea7
html escape errors
2012-08-20 17:55:59 -04:00
Bridger Maxwell
9bc5aec01a
Fixed up courseware-error view. Moved it to templates/courseware too.
2012-08-20 15:03:55 -04:00
Bridger Maxwell
0ac5ded095
Moved the course template pages to be templates/courseware/
2012-08-20 14:54:23 -04:00
